diff --git a/doc/functions.xml b/doc/functions.xml
index 3850e58c0168..70326936a570 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -8,252 +8,295 @@
The nixpkgs repository has several utility functions to manipulate Nix expressions.
-
- pkgs.overridePackages
+
+ Overriding
- This function inside the nixpkgs expression (pkgs)
- can be used to override the set of packages itself.
-
-
- Warning: this function is expensive and must not be used from within
- the nixpkgs repository.
-
-
- Example usage:
-
- let
- pkgs = import <nixpkgs> {};
- newpkgs = pkgs.overridePackages (self: super: {
- foo = super.foo.override { ... };
- };
-in ...
+ Sometimes one wants to override parts of
+ nixpkgs, e.g. derivation attributes, the results of
+ derivations or even the whole package set.
-
- The resulting newpkgs will have the new foo
- expression, and all other expressions depending on foo will also
- use the new foo expression.
-
+
+ pkgs.overridePackages
-
- The behavior of this function is similar to config.packageOverrides.
-
-
-
- The self parameter refers to the final package set with the
- applied overrides. Using this parameter may lead to infinite recursion if not
- used consciously.
-
-
-
- The super parameter refers to the old package set.
- It's equivalent to pkgs in the above example.
-
-
-
- Note that in previous versions of nixpkgs, this method replaced any changes from config.packageOverrides,
- along with that from previous calls if this function was called repeatedly.
- Now those previous changes will be preserved so this function can be "chained" meaningfully.
- To recover the old behavior, make sure config.packageOverrides is unset,
- and call this only once off a "freshly" imported nixpkgs:
-
- let
- pkgs = import <nixpkgs> { config: {}; };
- newpkgs = pkgs.overridePackages ...;
-in ...
-
-
-
-
-
- <pkg>.override
-
-
- The function override is usually available for all the
- derivations in the nixpkgs expression (pkgs).
-
-
- It is used to override the arguments passed to a function.
-
-
- Example usages:
-
- pkgs.foo.override { arg1 = val1; arg2 = val2; ... }
- pkgs.overridePackages (self: super: {
- foo = super.foo.override { barSupport = true ; };
-})
- mypkg = pkgs.callPackage ./mypkg.nix {
- mydep = pkgs.mydep.override { ... };
-})
-
-
-
- In the first example, pkgs.foo is the result of a function call
- with some default arguments, usually a derivation.
- Using pkgs.foo.override will call the same function with
- the given new arguments.
-
-
-
-
-
- <pkg>.overrideAttrs
-
-
- The function overrideAttrs allows overriding the
- attribute set passed to a stdenv.mkDerivation call,
- producing a new derivation based on the original one.
- This function is available on all derivations produced by the
- stdenv.mkDerivation function, which is most packages
- in the nixpkgs expression pkgs.
-
-
-
- Example usage:
-
- helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
- separateDebugInfo = true;
-});
-
-
-
- In the above example, the separateDebugInfo attribute is
- overriden to be true, thus building debug info for
- helloWithDebug, while all other attributes will be
- retained from the original hello package.
-
-
-
- The argument oldAttrs is conventionally used to refer to
- the attr set originally passed to stdenv.mkDerivation.
-
-
-
- Note that separateDebugInfo is processed only by the
- stdenv.mkDerivation function, not the generated, raw
- Nix derivation. Thus, using overrideDerivation will
- not work in this case, as it overrides only the attributes of the final
- derivation. It is for this reason that overrideAttrs
- should be preferred in (almost) all cases to
- overrideDerivation, i.e. to allow using
- sdenv.mkDerivation to process input arguments, as well
- as the fact that it is easier to use (you can use the same attribute
- names you see in your Nix code, instead of the ones generated (e.g.
- buildInputs vs nativeBuildInputs,
- and involves less typing.
+ This function inside the nixpkgs expression (pkgs)
+ can be used to override the set of packages itself.
-
-
-
-
-
-
- <pkg>.overrideDerivation
-
-
- You should prefer overrideAttrs in almost all
- cases, see its documentation for the reasons why.
- overrideDerivation is not deprecated and will continue
- to work, but is less nice to use and does not have as many abilities as
- overrideAttrs.
-
-
-
-
- Do not use this function in Nixpkgs as it evaluates a Derivation
- before modifying it, which breaks package abstraction and removes
- error-checking of function arguments. In addition, this
- evaluation-per-function application incurs a performance penalty,
- which can become a problem if many overrides are used.
- It is only intended for ad-hoc customisation, such as in
- ~/.nixpkgs/config.nix.
-
-
-
-
- The function overrideDerivation creates a new derivation
- based on an existing one by overriding the original's attributes with
- the attribute set produced by the specified function.
- This function is available on all
- derivations defined using the makeOverridable function.
- Most standard derivation-producing functions, such as
- stdenv.mkDerivation, are defined using this
- function, which means most packages in the nixpkgs expression,
- pkgs, have this function.
-
-
-
- Example usage:
-
- mySed = pkgs.gnused.overrideDerivation (oldAttrs: {
- name = "sed-4.2.2-pre";
- src = fetchurl {
- url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2;
- sha256 = "11nq06d131y4wmf3drm0yk502d2xc6n5qy82cg88rb9nqd2lj41k";
- };
- patches = [];
-});
-
-
-
- In the above example, the name, src,
- and patches of the derivation will be overridden, while
- all other attributes will be retained from the original derivation.
-
-
-
- The argument oldAttrs is used to refer to the attribute set of
- the original derivation.
-
-
-
- A package's attributes are evaluated *before* being modified by
- the overrideDerivation function.
- For example, the name attribute reference
- in url = "mirror://gnu/hello/${name}.tar.gz";
- is filled-in *before* the overrideDerivation function
- modifies the attribute set. This means that overriding the
- name attribute, in this example, *will not* change the
- value of the url attribute. Instead, we need to override
- both the name *and* url attributes.
+ Warning: this function is expensive and must not be used from within
+ the nixpkgs repository.
-
+
+ Example usage:
+
+ let
+ pkgs = import <nixpkgs> {};
+ newpkgs = pkgs.overridePackages (self: super: {
+ foo = super.foo.override { ... };
+ };
+ in ...
+
+
+
+ The resulting newpkgs will have the new foo
+ expression, and all other expressions depending on foo will also
+ use the new foo expression.
+
+
+
+ The behavior of this function is similar to config.packageOverrides.
+
+
+
+ The self parameter refers to the final package set with the
+ applied overrides. Using this parameter may lead to infinite recursion if not
+ used consciously.
+
+
+
+ The super parameter refers to the old package set.
+ It's equivalent to pkgs in the above example.
+
+
+
+ Note that in previous versions of nixpkgs, this method replaced any changes from config.packageOverrides,
+ along with that from previous calls if this function was called repeatedly.
+ Now those previous changes will be preserved so this function can be "chained" meaningfully.
+ To recover the old behavior, make sure config.packageOverrides is unset,
+ and call this only once off a "freshly" imported nixpkgs:
+
+ let
+ pkgs = import <nixpkgs> { config: {}; };
+ newpkgs = pkgs.overridePackages ...;
+ in ...
+
+
+
+
+
+ <pkg>.override
+
+
+ The function override is usually available for all the
+ derivations in the nixpkgs expression (pkgs).
+
+
+ It is used to override the arguments passed to a function.
+
+
+ Example usages:
+
+ pkgs.foo.override { arg1 = val1; arg2 = val2; ... }
+ pkgs.overridePackages (self: super: {
+ foo = super.foo.override { barSupport = true ; };
+ })
+ mypkg = pkgs.callPackage ./mypkg.nix {
+ mydep = pkgs.mydep.override { ... };
+ })
+
+
+
+ In the first example, pkgs.foo is the result of a function call
+ with some default arguments, usually a derivation.
+ Using pkgs.foo.override will call the same function with
+ the given new arguments.
+
+
+
+
+
+ <pkg>.overrideAttrs
+
+
+ The function overrideAttrs allows overriding the
+ attribute set passed to a stdenv.mkDerivation call,
+ producing a new derivation based on the original one.
+ This function is available on all derivations produced by the
+ stdenv.mkDerivation function, which is most packages
+ in the nixpkgs expression pkgs.
+
+
+
+ Example usage:
+
+ helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
+ separateDebugInfo = true;
+ });
+
+
+
+ In the above example, the separateDebugInfo attribute is
+ overriden to be true, thus building debug info for
+ helloWithDebug, while all other attributes will be
+ retained from the original hello package.
+
+
+
+ The argument oldAttrs is conventionally used to refer to
+ the attr set originally passed to stdenv.mkDerivation.
+
+
+
+
+ Note that separateDebugInfo is processed only by the
+ stdenv.mkDerivation function, not the generated, raw
+ Nix derivation. Thus, using overrideDerivation will
+ not work in this case, as it overrides only the attributes of the final
+ derivation. It is for this reason that overrideAttrs
+ should be preferred in (almost) all cases to
+ overrideDerivation, i.e. to allow using
+ sdenv.mkDerivation to process input arguments, as well
+ as the fact that it is easier to use (you can use the same attribute
+ names you see in your Nix code, instead of the ones generated (e.g.
+ buildInputs vs nativeBuildInputs,
+ and involves less typing.
+
+
+
+
+
+
+
+ <pkg>.overrideDerivation
+
+
+ You should prefer overrideAttrs in almost all
+ cases, see its documentation for the reasons why.
+ overrideDerivation is not deprecated and will continue
+ to work, but is less nice to use and does not have as many abilities as
+ overrideAttrs.
+
+
+
+
+ Do not use this function in Nixpkgs as it evaluates a Derivation
+ before modifying it, which breaks package abstraction and removes
+ error-checking of function arguments. In addition, this
+ evaluation-per-function application incurs a performance penalty,
+ which can become a problem if many overrides are used.
+ It is only intended for ad-hoc customisation, such as in
+ ~/.nixpkgs/config.nix.
+
+
+
+
+ The function overrideDerivation creates a new derivation
+ based on an existing one by overriding the original's attributes with
+ the attribute set produced by the specified function.
+ This function is available on all
+ derivations defined using the makeOverridable function.
+ Most standard derivation-producing functions, such as
+ stdenv.mkDerivation, are defined using this
+ function, which means most packages in the nixpkgs expression,
+ pkgs, have this function.
+
+
+
+ Example usage:
+
+ mySed = pkgs.gnused.overrideDerivation (oldAttrs: {
+ name = "sed-4.2.2-pre";
+ src = fetchurl {
+ url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2;
+ sha256 = "11nq06d131y4wmf3drm0yk502d2xc6n5qy82cg88rb9nqd2lj41k";
+ };
+ patches = [];
+ });
+
+
+
+ In the above example, the name, src,
+ and patches of the derivation will be overridden, while
+ all other attributes will be retained from the original derivation.
+
+
+
+ The argument oldAttrs is used to refer to the attribute set of
+ the original derivation.
+
+
+
+
+ A package's attributes are evaluated *before* being modified by
+ the overrideDerivation function.
+ For example, the name attribute reference
+ in url = "mirror://gnu/hello/${name}.tar.gz";
+ is filled-in *before* the overrideDerivation function
+ modifies the attribute set. This means that overriding the
+ name attribute, in this example, *will not* change the
+ value of the url attribute. Instead, we need to override
+ both the name *and* url attributes.
+
+
+
+
+
+
+ lib.makeOverridable
+
+
+ The function lib.makeOverridable is used to make the result
+ of a function easily customizable. This utility only makes sense for functions
+ that accept an argument set and return an attribute set.
+
+
+
+ Example usage:
+
+ f = { a, b }: { result = a+b; }
+ c = lib.makeOverridable f { a = 1; b = 2; }
+
+
+
+
+ The variable c is the value of the f function
+ applied with some default arguments. Hence the value of c.result
+ is 3, in this example.
+
+
+
+ The variable c however also has some additional functions, like
+ c.override which can be used to
+ override the default arguments. In this example the value of
+ (c.override { a = 4; }).result is 6.
+
+
+
-
- lib.makeOverridable
+
+ Generators
- The function lib.makeOverridable is used to make the result
- of a function easily customizable. This utility only makes sense for functions
- that accept an argument set and return an attribute set.
+ Generators are functions that create file formats from nix
+ data structures, e. g. for configuration files.
+ There are generators available for: INI,
+ JSON and YAML
- Example usage:
-
- f = { a, b }: { result = a+b; }
-c = lib.makeOverridable f { a = 1; b = 2; }
-
+ All generators follow a similar call interface: generatorName
+ configFunctions data, where configFunctions is a
+ set of user-defined functions that format variable parts of the content.
+ They each have common defaults, so often they do not need to be set
+ manually. An example is mkSectionName ? (name: libStr.escape [ "[" "]"
+ ] name) from the INI generator. It gets the name
+ of a section and returns a sanitized name. The default
+ mkSectionName escapes [ and
+ ] with a backslash.
-
- The variable c is the value of the f function
- applied with some default arguments. Hence the value of c.result
- is 3, in this example.
-
+ Nix store paths can be converted to strings by enclosing a
+ derivation attribute like so: "${drv}".
- The variable c however also has some additional functions, like
- c.override which can be used to
- override the default arguments. In this example the value of
- (c.override { a = 4; }).result is 6.
+ Detailed documentation for each generator can be found in
+ lib/generators.nix.
@@ -370,37 +413,37 @@ c = lib.makeOverridable f { a = 1; b = 2; }
- pkgs.dockerTools
+pkgs.dockerTools
-
+
pkgs.dockerTools is a set of functions for creating and
manipulating Docker images according to the
- Docker Image Specification v1.0.0
+ Docker Image Specification v1.0.0
. Docker itself is not used to perform any of the operations done by these
functions.
-
+
-
+
- The dockerTools API is unstable and may be subject to
- backwards-incompatible changes in the future.
+ The dockerTools API is unstable and may be subject to
+ backwards-incompatible changes in the future.
-
+
-
+
buildImage
- This function is analogous to the docker build command,
- in that can used to build a Docker-compatible repository tarball containing
- a single image with one or multiple layers. As such, the result
- is suitable for being loaded in Docker with docker load.
+ This function is analogous to the docker build command,
+ in that can used to build a Docker-compatible repository tarball containing
+ a single image with one or multiple layers. As such, the result
+ is suitable for being loaded in Docker with docker load.
- The parameters of buildImage with relative example values are
- described below:
+ The parameters of buildImage with relative example values are
+ described below:
Docker build
@@ -408,11 +451,11 @@ c = lib.makeOverridable f { a = 1; b = 2; }
buildImage {
name = "redis";
tag = "latest";
-
+
fromImage = someBaseImage;
fromImageName = null;
fromImageTag = "latest";
-
+
contents = pkgs.redis;
runAsRoot = ''
#!${stdenv.shell}
@@ -431,131 +474,131 @@ c = lib.makeOverridable f { a = 1; b = 2; }
The above example will build a Docker image redis/latest
- from the given base image. Loading and running this image in Docker results in
- redis-server being started automatically.
+ from the given base image. Loading and running this image in Docker results in
+ redis-server being started automatically.
-
+
- name specifies the name of the resulting image.
- This is the only required argument for buildImage.
+ name specifies the name of the resulting image.
+ This is the only required argument for buildImage.
-
+
-
+
- tag specifies the tag of the resulting image.
- By default it's latest.
+ tag specifies the tag of the resulting image.
+ By default it's latest.
-
+
-
+
- fromImage is the repository tarball containing the base image.
- It must be a valid Docker image, such as exported by docker save.
- By default it's null, which can be seen as equivalent
- to FROM scratch of a Dockerfile.
+ fromImage is the repository tarball containing the base image.
+ It must be a valid Docker image, such as exported by docker save.
+ By default it's null, which can be seen as equivalent
+ to FROM scratch of a Dockerfile.
-
-
-
-
- fromImageName can be used to further specify
- the base image within the repository, in case it contains multiple images.
- By default it's null, in which case
- buildImage will peek the first image available
- in the repository.
-
-
+
-
+
- fromImageTag can be used to further specify the tag
- of the base image within the repository, in case an image contains multiple tags.
- By default it's null, in which case
- buildImage will peek the first tag available for the base image.
+ fromImageName can be used to further specify
+ the base image within the repository, in case it contains multiple images.
+ By default it's null, in which case
+ buildImage will peek the first image available
+ in the repository.
-
+
-
+
- contents is a derivation that will be copied in the new
- layer of the resulting image. This can be similarly seen as
- ADD contents/ / in a Dockerfile.
- By default it's null.
+ fromImageTag can be used to further specify the tag
+ of the base image within the repository, in case an image contains multiple tags.
+ By default it's null, in which case
+ buildImage will peek the first tag available for the base image.
-
+
-
+
- runAsRoot is a bash script that will run as root
- in an environment that overlays the existing layers of the base image with
- the new resulting layer, including the previously copied
- contents derivation.
- This can be similarly seen as
- RUN ... in a Dockerfile.
-
-
+ contents is a derivation that will be copied in the new
+ layer of the resulting image. This can be similarly seen as
+ ADD contents/ / in a Dockerfile.
+ By default it's null.
+
+
+
+
+
+ runAsRoot is a bash script that will run as root
+ in an environment that overlays the existing layers of the base image with
+ the new resulting layer, including the previously copied
+ contents derivation.
+ This can be similarly seen as
+ RUN ... in a Dockerfile.
+
+
- Using this parameter requires the kvm
- device to be available.
+ Using this parameter requires the kvm
+ device to be available.
-
+
-
+
-
+
- config is used to specify the configuration of the
- containers that will be started off the built image in Docker.
- The available options are listed in the
-
+ config is used to specify the configuration of the
+ containers that will be started off the built image in Docker.
+ The available options are listed in the
+
Docker Image Specification v1.0.0
- .
+ .
-
+
- After the new layer has been created, its closure
- (to which contents, config and
- runAsRoot contribute) will be copied in the layer itself.
- Only new dependencies that are not already in the existing layers will be copied.
+ After the new layer has been created, its closure
+ (to which contents, config and
+ runAsRoot contribute) will be copied in the layer itself.
+ Only new dependencies that are not already in the existing layers will be copied.
- At the end of the process, only one new single layer will be produced and
- added to the resulting image.
+ At the end of the process, only one new single layer will be produced and
+ added to the resulting image.
- The resulting repository will only list the single image
- image/tag. In the case of
- it would be redis/latest.
+ The resulting repository will only list the single image
+ image/tag. In the case of
+ it would be redis/latest.
- It is possible to inspect the arguments with which an image was built
- using its buildArgs attribute.
+ It is possible to inspect the arguments with which an image was built
+ using its buildArgs attribute.
-
+
-
+
pullImage
- This function is analogous to the docker pull command,
- in that can be used to fetch a Docker image from a Docker registry.
- Currently only registry v1 is supported.
- By default Docker Hub
- is used to pull images.
+ This function is analogous to the docker pull command,
+ in that can be used to fetch a Docker image from a Docker registry.
+ Currently only registry v1 is supported.
+ By default Docker Hub
+ is used to pull images.
- Its parameters are described in the example below:
+ Its parameters are described in the example below:
Docker pull
@@ -573,73 +616,73 @@ c = lib.makeOverridable f { a = 1; b = 2; }
-
+
- imageName specifies the name of the image to be downloaded,
- which can also include the registry namespace (e.g. library/debian).
- This argument is required.
+ imageName specifies the name of the image to be downloaded,
+ which can also include the registry namespace (e.g. library/debian).
+ This argument is required.
-
-
-
-
- imageTag specifies the tag of the image to be downloaded.
- By default it's latest.
-
-
+
-
+
- imageId, if specified this exact image will be fetched, instead
- of imageName/imageTag. However, the resulting repository
- will still be named imageName/imageTag.
- By default it's null.
+ imageTag specifies the tag of the image to be downloaded.
+ By default it's latest.
-
+
-
+
- sha256 is the checksum of the whole fetched image.
- This argument is required.
+ imageId, if specified this exact image will be fetched, instead
+ of imageName/imageTag. However, the resulting repository
+ will still be named imageName/imageTag.
+ By default it's null.
+
+
+
+
+
+ sha256 is the checksum of the whole fetched image.
+ This argument is required.
- The checksum is computed on the unpacked directory, not on the final tarball.
+ The checksum is computed on the unpacked directory, not on the final tarball.
-
+
-
+
- In the above example the default values are shown for the variables
- indexUrl and registryVersion.
- Hence by default the Docker.io registry is used to pull the images.
+ In the above example the default values are shown for the variables
+ indexUrl and registryVersion.
+ Hence by default the Docker.io registry is used to pull the images.
-
+
-
-
-
-
+
+
exportImage
- This function is analogous to the docker export command,
- in that can used to flatten a Docker image that contains multiple layers.
- It is in fact the result of the merge of all the layers of the image.
- As such, the result is suitable for being imported in Docker
- with docker import.
+ This function is analogous to the docker export command,
+ in that can used to flatten a Docker image that contains multiple layers.
+ It is in fact the result of the merge of all the layers of the image.
+ As such, the result is suitable for being imported in Docker
+ with docker import.
-
+
Using this function requires the kvm
device to be available.
-
+
- The parameters of exportImage are the following:
+ The parameters of exportImage are the following:
Docker export
@@ -648,35 +691,35 @@ c = lib.makeOverridable f { a = 1; b = 2; }
fromImage = someLayeredImage;
fromImageName = null;
fromImageTag = null;
-
+
name = someLayeredImage.name;
}
- The parameters relative to the base image have the same synopsis as
- described in , except that
- fromImage is the only required argument in this case.
+ The parameters relative to the base image have the same synopsis as
+ described in , except that
+ fromImage is the only required argument in this case.
- The name argument is the name of the derivation output,
- which defaults to fromImage.name.
+ The name argument is the name of the derivation output,
+ which defaults to fromImage.name.
-
+
-
+
shadowSetup
- This constant string is a helper for setting up the base files for managing
- users and groups, only if such files don't exist already.
- It is suitable for being used in a
- runAsRoot script for cases like
- in the example below:
+ This constant string is a helper for setting up the base files for managing
+ users and groups, only if such files don't exist already.
+ It is suitable for being used in a
+ runAsRoot script for cases like
+ in the example below:
-
+
Shadow base files
buildImage {
@@ -695,13 +738,13 @@ c = lib.makeOverridable f { a = 1; b = 2; }
- Creating base files like /etc/passwd or
- /etc/login.defs are necessary for shadow-utils to
- manipulate users and groups.
+ Creating base files like /etc/passwd or
+ /etc/login.defs are necessary for shadow-utils to
+ manipulate users and groups.
-
-
-
+
+
+
diff --git a/doc/manual.xml b/doc/manual.xml
index 32e94e8e59c5..6ad66d486525 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -20,6 +20,7 @@
+
diff --git a/nixos/doc/manual/development/reviewing-contributions.xml b/doc/reviewing-contributions.xml
similarity index 100%
rename from nixos/doc/manual/development/reviewing-contributions.xml
rename to doc/reviewing-contributions.xml
diff --git a/lib/default.nix b/lib/default.nix
index cb9a9b0bd4d0..c0d7899b882a 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -27,6 +27,7 @@ let
# misc
debug = import ./debug.nix;
+ generators = import ./generators.nix;
misc = import ./deprecated.nix;
# domain-specific
@@ -39,7 +40,7 @@ in
customisation maintainers meta sources
modules options types
licenses platforms systems
- debug misc
+ debug generators misc
sandbox fetchers;
}
# !!! don't include everything at top-level; perhaps only the most
diff --git a/lib/generators.nix b/lib/generators.nix
new file mode 100644
index 000000000000..27d4142e8d9a
--- /dev/null
+++ b/lib/generators.nix
@@ -0,0 +1,72 @@
+/* Functions that generate widespread file
+ * formats from nix data structures.
+ *
+ * They all follow a similar interface:
+ * generator { config-attrs } data
+ *
+ * Tests can be found in ./tests.nix
+ * Documentation in the manual, #sec-generators
+ */
+with import ./trivial.nix;
+let
+ libStr = import ./strings.nix;
+ libAttr = import ./attrsets.nix;
+
+ flipMapAttrs = flip libAttr.mapAttrs;
+in
+
+rec {
+
+ /* Generates an INI-style config file from an
+ * attrset of sections to an attrset of key-value pairs.
+ *
+ * generators.toINI {} {
+ * foo = { hi = "${pkgs.hello}"; ciao = "bar"; };
+ * baz = { "also, integers" = 42; };
+ * }
+ *
+ *> [baz]
+ *> also, integers=42
+ *>
+ *> [foo]
+ *> ciao=bar
+ *> hi=/nix/store/y93qql1p5ggfnaqjjqhxcw0vqw95rlz0-hello-2.10
+ *
+ * The mk* configuration attributes can generically change
+ * the way sections and key-value strings are generated.
+ *
+ * For more examples see the test cases in ./tests.nix.
+ */
+ toINI = {
+ # apply transformations (e.g. escapes) to section names
+ mkSectionName ? (name: libStr.escape [ "[" "]" ] name),
+ # format a setting line from key and value
+ mkKeyValue ? (k: v: "${libStr.escape ["="] k}=${toString v}")
+ }: attrsOfAttrs:
+ let
+ # map function to string for each key val
+ mapAttrsToStringsSep = sep: mapFn: attrs:
+ libStr.concatStringsSep sep
+ (libAttr.mapAttrsToList mapFn attrs);
+ mkLine = k: v: mkKeyValue k v + "\n";
+ mkSection = sectName: sectValues: ''
+ [${mkSectionName sectName}]
+ '' + libStr.concatStrings (libAttr.mapAttrsToList mkLine sectValues);
+ in
+ # map input to ini sections
+ mapAttrsToStringsSep "\n" mkSection attrsOfAttrs;
+
+
+ /* Generates JSON from an arbitrary (non-function) value.
+ * For more information see the documentation of the builtin.
+ */
+ toJSON = {}: builtins.toJSON;
+
+
+ /* YAML has been a strict superset of JSON since 1.2, so we
+ * use toJSON. Before it only had a few differences referring
+ * to implicit typing rules, so it should work with older
+ * parsers as well.
+ */
+ toYAML = {}@args: toJSON args;
+}
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 2ad631cb19aa..b908a261b1fa 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -48,6 +48,7 @@
aske = "Kirill Boltaev ";
asppsa = "Alastair Pharo ";
astsmtl = "Alexander Tsamutali ";
+ asymmetric = "Lorenzo Manacorda ";
aszlig = "aszlig ";
auntie = "Jonathan Glines ";
avnik = "Alexander V. Nikolaev ";
@@ -88,6 +89,7 @@
chris-martin = "Chris Martin ";
chrisjefferson = "Christopher Jefferson ";
christopherpoole = "Christopher Mark Poole ";
+ ckampka = "Christian Kampka ";
cko = "Christine Koppelt ";
cleverca22 = "Michael Bishop ";
cmcdragonkai = "Roger Qiu ";
@@ -129,6 +131,7 @@
doublec = "Chris Double ";
drets = "Dmytro Rets ";
drewkett = "Andrew Burkett ";
+ dtzWill = "Will Dietz ";
ebzzry = "Rommel Martinez ";
ederoyd46 = "Matthew Brown ";
eduarrrd = "Eduard Bachmakov ";
@@ -288,6 +291,7 @@
mlieberman85 = "Michael Lieberman ";
modulistic = "Pablo Costa ";
mog = "Matthew O'Gorman ";
+ montag451 = "montag451 ";
moosingin3space = "Nathan Moos ";
moretea = "Maarten Hoogendoorn ";
mornfall = "Petr Ročkai ";
@@ -333,6 +337,7 @@
palo = "Ingolf Wanger ";
pashev = "Igor Pashev ";
pawelpacana = "Paweł Pacana ";
+ periklis = "theopompos@gmail.com";
pesterhazy = "Paulus Esterhazy ";
peterhoeg = "Peter Hoeg ";
peti = "Peter Simons ";
diff --git a/lib/modules.nix b/lib/modules.nix
index e66d6a6926cb..256d49ba27d8 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -375,10 +375,13 @@ rec {
if def._type or "" == "merge" then
concatMap dischargeProperties def.contents
else if def._type or "" == "if" then
- if def.condition then
- dischargeProperties def.content
+ if isBool def.condition then
+ if def.condition then
+ dischargeProperties def.content
+ else
+ [ ]
else
- [ ]
+ throw "‘mkIf’ called with a non-Boolean condition"
else
[ def ];
diff --git a/lib/sources.nix b/lib/sources.nix
index 156afaae5c98..f41abe1e1eae 100644
--- a/lib/sources.nix
+++ b/lib/sources.nix
@@ -12,19 +12,19 @@ rec {
# Bring in a path as a source, filtering out all Subversion and CVS
# directories, as well as backup files (*~).
- cleanSource =
- let filter = name: type: let baseName = baseNameOf (toString name); in ! (
- # Filter out Subversion and CVS directories.
- (type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) ||
- # Filter out backup files.
- lib.hasSuffix "~" baseName ||
- # Filter out generates files.
- lib.hasSuffix ".o" baseName ||
- lib.hasSuffix ".so" baseName ||
- # Filter out nix-build result symlinks
- (type == "symlink" && lib.hasPrefix "result" baseName)
- );
- in src: builtins.filterSource filter src;
+ cleanSourceFilter = name: type: let baseName = baseNameOf (toString name); in ! (
+ # Filter out Subversion and CVS directories.
+ (type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) ||
+ # Filter out backup files.
+ lib.hasSuffix "~" baseName ||
+ # Filter out generates files.
+ lib.hasSuffix ".o" baseName ||
+ lib.hasSuffix ".so" baseName ||
+ # Filter out nix-build result symlinks
+ (type == "symlink" && lib.hasPrefix "result" baseName)
+ );
+
+ cleanSource = builtins.filterSource cleanSourceFilter;
# Get all files ending with the specified suffices from the given
diff --git a/lib/tests.nix b/lib/tests.nix
index c3b8839fda95..d59814987ed6 100644
--- a/lib/tests.nix
+++ b/lib/tests.nix
@@ -130,4 +130,78 @@ runTests {
expected = false;
};
+
+ /* Generator tests */
+ # these tests assume attributes are converted to lists
+ # in alphabetical order
+
+ testToINIEmpty = {
+ expr = generators.toINI {} {};
+ expected = "";
+ };
+
+ testToINIEmptySection = {
+ expr = generators.toINI {} { foo = {}; bar = {}; };
+ expected = ''
+ [bar]
+
+ [foo]
+ '';
+ };
+
+ testToINIDefaultEscapes = {
+ expr = generators.toINI {} {
+ "no [ and ] allowed unescaped" = {
+ "and also no = in keys" = 42;
+ };
+ };
+ expected = ''
+ [no \[ and \] allowed unescaped]
+ and also no \= in keys=42
+ '';
+ };
+
+ testToINIDefaultFull = {
+ expr = generators.toINI {} {
+ "section 1" = {
+ attribute1 = 5;
+ x = "Me-se JarJar Binx";
+ };
+ "foo[]" = {
+ "he\\h=he" = "this is okay";
+ };
+ };
+ expected = ''
+ [foo\[\]]
+ he\h\=he=this is okay
+
+ [section 1]
+ attribute1=5
+ x=Me-se JarJar Binx
+ '';
+ };
+
+ /* right now only invocation check */
+ testToJSONSimple =
+ let val = {
+ foobar = [ "baz" 1 2 3 ];
+ };
+ in {
+ expr = generators.toJSON {} val;
+ # trival implementation
+ expected = builtins.toJSON val;
+ };
+
+ /* right now only invocation check */
+ testToYAMLSimple =
+ let val = {
+ list = [ { one = 1; } { two = 2; } ];
+ all = 42;
+ };
+ in {
+ expr = generators.toYAML {} val;
+ # trival implementation
+ expected = builtins.toJSON val;
+ };
+
}
diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml
index 1b1576d3babe..d89d262eff4e 100644
--- a/nixos/doc/manual/administration/container-networking.xml
+++ b/nixos/doc/manual/administration/container-networking.xml
@@ -47,4 +47,12 @@ where eth0 should be replaced with the desired
external interface. Note that ve-+ is a wildcard
that matches all container interfaces.
+If you are using Network Manager, you need to explicitly prevent
+it from managing container interfaces:
+
+
+networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
+
+
+
diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml
index b0364b346577..47343d93cde9 100644
--- a/nixos/doc/manual/development/development.xml
+++ b/nixos/doc/manual/development/development.xml
@@ -18,7 +18,6 @@ NixOS.
-
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 743f3dce2302..a133630e1464 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -68,6 +68,15 @@ following incompatible changes:
that may be in /etc.
+
+
+
+ Parsoid service now uses YAML configuration format.
+ service.parsoid.interwikis is now called
+ service.parsoid.wikis and is a list of either API URLs
+ or attribute sets as specified in parsoid's documentation.
+
+
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 8b7db7b30a64..0750a1b18c99 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p qemu awscli ec2_ami_tools jq
+#! nix-shell -i bash -p qemu ec2_ami_tools jq ec2_api_tools awscli
# To start with do: nix-shell -p awscli --run "aws configure"
@@ -19,7 +19,7 @@ rm -f ec2-amis.nix
types="hvm pv"
stores="ebs s3"
-regions="eu-west-1 eu-central-1 us-east-1 us-west-1 us-west-2 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1"
+regions="eu-west-1 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1"
for type in $types; do
link=$stateDir/$type
@@ -61,7 +61,7 @@ for type in $types; do
ami=$(aws ec2 copy-image \
--region "$region" \
--source-region "$prevRegion" --source-image-id "$prevAmi" \
- --name "$name" --description "$description" | json -q .ImageId)
+ --name "$name" --description "$description" | jq -r '.ImageId')
if [ "$ami" = null ]; then break; fi
else
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 770c3a03f9d8..52ad1e714fb9 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -301,9 +301,7 @@ in
};
style = mkOption {
- type = types.str // {
- check = flip elem ["none" "slight" "medium" "full"];
- };
+ type = types.enum ["none" "slight" "medium" "full"];
default = "full";
description = ''
TrueType hinting style, one of none,
@@ -329,9 +327,7 @@ in
default = "rgb";
type = types.enum ["rgb" "bgr" "vrgb" "vbgr" "none"];
description = ''
- Subpixel order, one of none,
- rgb, bgr,
- vrgb, or vbgr.
+ Subpixel order.
'';
};
@@ -339,9 +335,7 @@ in
default = "default";
type = types.enum ["none" "default" "light" "legacy"];
description = ''
- FreeType LCD filter, one of none,
- default, light, or
- legacy.
+ FreeType LCD filter.
'';
};
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index e341931aacce..d7fd38ebed9a 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -44,6 +44,7 @@ in
consolePackages = mkOption {
type = types.listOf types.package;
default = with pkgs.kbdKeymaps; [ dvp neo ];
+ defaultText = ''with pkgs.kbdKeymaps; [ dvp neo ]'';
description = ''
List of additional packages that provide console fonts, keymaps and
other resources.
diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix
index 69db518ab21c..3ce97ad31c22 100644
--- a/nixos/modules/hardware/video/bumblebee.nix
+++ b/nixos/modules/hardware/video/bumblebee.nix
@@ -13,6 +13,8 @@ let
useDisplayDevice = cfg.connectDisplay;
};
+ useBbswitch = cfg.pmMethod == "bbswitch";
+
primus = pkgs.primus.override {
inherit useNvidia;
};
@@ -22,58 +24,69 @@ in
{
options = {
- hardware.bumblebee.enable = mkOption {
- default = false;
- type = types.bool;
- description = ''
- Enable the bumblebee daemon to manage Optimus hybrid video cards.
- This should power off secondary GPU until its use is requested
- by running an application with optirun.
+ hardware.bumblebee = {
- Only nvidia driver is supported so far.
- '';
- };
- hardware.bumblebee.group = mkOption {
- default = "wheel";
- example = "video";
- type = types.str;
- description = ''Group for bumblebee socket'';
- };
+ enable = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Enable the bumblebee daemon to manage Optimus hybrid video cards.
+ This should power off secondary GPU until its use is requested
+ by running an application with optirun.
+ '';
+ };
- hardware.bumblebee.connectDisplay = mkOption {
- default = false;
- type = types.bool;
- description = ''
- Set to true if you intend to connect your discrete card to a
- monitor. This option will set up your Nvidia card for EDID
- discovery and to turn on the monitor signal.
+ group = mkOption {
+ default = "wheel";
+ example = "video";
+ type = types.str;
+ description = ''Group for bumblebee socket'';
+ };
- Only nvidia driver is supported so far.
- '';
- };
+ connectDisplay = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Set to true if you intend to connect your discrete card to a
+ monitor. This option will set up your Nvidia card for EDID
+ discovery and to turn on the monitor signal.
+
+ Only nvidia driver is supported so far.
+ '';
+ };
+
+ driver = mkOption {
+ default = "nvidia";
+ type = types.enum [ "nvidia" "nouveau" ];
+ description = ''
+ Set driver used by bumblebeed. Supported are nouveau and nvidia.
+ '';
+ };
+
+ pmMethod = mkOption {
+ default = "auto";
+ type = types.enum [ "auto" "bbswitch" "nouveau" "switcheroo" "none" ];
+ description = ''
+ Set preferred power management method for unused card.
+ '';
+ };
- hardware.bumblebee.driver = mkOption {
- default = "nvidia";
- type = types.enum [ "nvidia" "nouveau" ];
- description = ''
- Set driver used by bumblebeed. Supported are nouveau and nvidia.
- '';
};
};
- config = mkIf config.hardware.bumblebee.enable {
- boot.blacklistedKernelModules = [ "nouveau" "nvidia" ];
- boot.kernelModules = [ "bbswitch" ];
- boot.extraModulePackages = [ kernel.bbswitch ] ++ optional useNvidia kernel.nvidia_x11;
+ config = mkIf cfg.enable {
+ boot.blacklistedKernelModules = [ "nvidia-drm" "nvidia" "nouveau" ];
+ boot.kernelModules = optional useBbswitch [ "bbswitch" ];
+ boot.extraModulePackages = optional useBbswitch kernel.bbswitch ++ optional useNvidia kernel.nvidia_x11;
environment.systemPackages = [ bumblebee primus ];
systemd.services.bumblebeed = {
description = "Bumblebee Hybrid Graphics Switcher";
- wantedBy = [ "display-manager.service" ];
- path = [ kernel.bbswitch bumblebee ];
+ wantedBy = [ "multi-user.target" ];
+ before = [ "display-manager.service" ];
serviceConfig = {
- ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${cfg.group} --driver ${cfg.driver}";
+ ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${cfg.group} --driver ${cfg.driver} --pm-method ${cfg.pmMethod}";
};
};
};
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
index b5ee57d9e22e..c44dff3bb60d 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
@@ -1,20 +1,41 @@
# This module defines a NixOS installation CD that contains X11 and
-# KDE 4.
+# KDE 5.
{ config, lib, pkgs, ... }:
with lib;
{
- imports = [ ./installation-cd-base.nix ../../profiles/graphical.nix ];
+ imports = [ ./installation-cd-base.nix ];
- # Provide wicd for easy wireless configuration.
- #networking.wicd.enable = true;
+ services.xserver = {
+ enable = true;
+
+ # Automatically login as root.
+ displayManager.slim = {
+ enable = true;
+ defaultUser = "root";
+ autoLogin = true;
+ };
+
+ desktopManager.kde5 = {
+ enable = true;
+ enableQt4Support = false;
+ };
+
+ # Enable touchpad support for many laptops.
+ synaptics.enable = true;
+ };
environment.systemPackages =
- [ # Include gparted for partitioning disks.
+ [ pkgs.glxinfo
+
+ # Include gparted for partitioning disks.
pkgs.gparted
+ # Firefox for reading the manual.
+ pkgs.firefox
+
# Include some editors.
pkgs.vim
pkgs.bvi # binary editor
@@ -32,80 +53,21 @@ with lib;
# Don't start the X server by default.
services.xserver.autorun = mkForce false;
- # Auto-login as root.
- services.xserver.displayManager.kdm.extraConfig =
- ''
- [X-*-Core]
- AllowRootLogin=true
- AutoLoginEnable=true
- AutoLoginUser=root
- AutoLoginPass=""
- '';
-
- # Custom kde-workspace adding some icons on the desktop
-
system.activationScripts.installerDesktop = let
- openManual = pkgs.writeScript "nixos-manual.sh" ''
- #!${pkgs.stdenv.shell}
- cd ${config.system.build.manual.manual}/share/doc/nixos/
- konqueror ./index.html
- '';
-
desktopFile = pkgs.writeText "nixos-manual.desktop" ''
[Desktop Entry]
Version=1.0
Type=Application
Name=NixOS Manual
- Exec=${openManual}
- Icon=konqueror
+ Exec=firefox ${config.system.build.manual.manual}/share/doc/nixos/index.html
+ Icon=text-html
'';
in ''
mkdir -p /root/Desktop
ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop
- ln -sfT ${pkgs.kde4.konsole}/share/applications/kde4/konsole.desktop /root/Desktop/konsole.desktop
+ ln -sfT ${pkgs.kde5.konsole}/share/applications/org.kde.konsole.desktop /root/Desktop/org.kde.konsole.desktop
ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop
'';
- services.xserver.desktopManager.kde4.kdeWorkspacePackage = let
- pkg = pkgs.kde4.kde_workspace;
-
- plasmaInit = pkgs.writeText "00-defaultLayout.js" ''
- loadTemplate("org.kde.plasma-desktop.defaultPanel")
-
- for (var i = 0; i < screenCount; ++i) {
- var desktop = new Activity
- desktop.name = i18n("Desktop")
- desktop.screen = i
- desktop.wallpaperPlugin = 'image'
- desktop.wallpaperMode = 'SingleImage'
-
- var folderview = desktop.addWidget("folderview");
- folderview.writeConfig("url", "desktop:/");
-
- //Create more panels for other screens
- if (i > 0){
- var panel = new Panel
- panel.screen = i
- panel.location = 'bottom'
- panel.height = screenGeometry(i).height > 1024 ? 35 : 27
- var tasks = panel.addWidget("tasks")
- tasks.writeConfig("showOnlyCurrentScreen", true);
- }
- }
- '';
-
- in
- pkgs.runCommand pkg.name
- { inherit (pkg) meta; }
- ''
- mkdir -p $out
- cp -prf ${pkg}/* $out/
- chmod a+w $out/share/apps/plasma-desktop/init
- cp -f ${plasmaInit} $out/share/apps/plasma-desktop/init/00-defaultLayout.js
- '';
-
- # Disable large stuff that's not very useful on the installation CD.
- services.xserver.desktopManager.kde4.enablePIM = false;
-
}
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 80a9a520e24e..b61c1f4799ec 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -84,7 +84,7 @@
spamd = 56;
#networkmanager = 57; # unused
nslcd = 58;
- #scanner = 59; # unused
+ scanner = 59;
nginx = 60;
chrony = 61;
#systemd-journal = 62; # unused
@@ -279,6 +279,8 @@
hound = 259;
leaps = 260;
ipfs = 261;
+ stanchion = 262;
+ riak-cs = 263;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@@ -528,6 +530,8 @@
hound = 259;
leaps = 260;
ipfs = 261;
+ stanchion = 262;
+ riak-cs = 263;
# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8254ada3ddf7..4589f47e7c19 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -159,6 +159,8 @@
./services/databases/postgresql.nix
./services/databases/redis.nix
./services/databases/riak.nix
+ ./services/databases/riak-cs.nix
+ ./services/databases/stanchion.nix
./services/databases/virtuoso.nix
./services/desktops/accountsservice.nix
./services/desktops/geoclue2.nix
@@ -346,6 +348,7 @@
./services/networking/connman.nix
./services/networking/consul.nix
./services/networking/coturn.nix
+ ./services/networking/dante.nix
./services/networking/ddclient.nix
./services/networking/dhcpcd.nix
./services/networking/dhcpd.nix
@@ -539,7 +542,6 @@
./services/x11/window-managers/fluxbox.nix
./services/x11/window-managers/icewm.nix
./services/x11/window-managers/bspwm.nix
- ./services/x11/window-managers/bspwm-unstable.nix
./services/x11/window-managers/metacity.nix
./services/x11/window-managers/none.nix
./services/x11/window-managers/twm.nix
diff --git a/nixos/modules/programs/java.nix b/nixos/modules/programs/java.nix
index 3292aa369d28..d31698c3b392 100644
--- a/nixos/modules/programs/java.nix
+++ b/nixos/modules/programs/java.nix
@@ -34,6 +34,7 @@ in
package = mkOption {
default = pkgs.jdk;
+ defaultText = "pkgs.jdk";
description = ''
Java package to install. Typical values are pkgs.jdk or pkgs.jre.
'';
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index b6fd9868f98f..5f4d4dc9475e 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -165,7 +165,7 @@ in
config = {
programs.ssh.setXAuthLocation =
- mkDefault (config.services.xserver.enable || config.programs.ssh.forwardX11);
+ mkDefault (config.services.xserver.enable || config.programs.ssh.forwardX11 || config.services.openssh.forwardX11);
assertions =
[ { assertion = cfg.forwardX11 -> cfg.setXAuthLocation;
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 44e07f4618de..a89ce2c743d4 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -30,6 +30,8 @@ with lib;
(mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ])
(mkRemovedOptionModule [ "services" "gitlab" "satelliteDir" ] "")
+ (mkRenamedOptionModule [ "services" "clamav" "updater" "config" ] [ "services" "clamav" "updater" "extraConfig" ])
+
# Old Grub-related options.
(mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ])
(mkRenamedOptionModule [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ])
@@ -142,6 +144,12 @@ with lib;
# murmur
(mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ])
+ # parsoid
+ (mkRemovedOptionModule [ "services" "parsoid" "interwikis" ] [ "services" "parsoid" "wikis" ])
+
+ # tarsnap
+ (mkRemovedOptionModule [ "services" "tarsnap" "cachedir" ] "Use services.tarsnap.archives..cachedir")
+
# Options that are obsolete and have no replacement.
(mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "")
(mkRemovedOptionModule [ "programs" "bash" "enable" ] "")
diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix
index 0e3a54325cad..97e2d39dc076 100644
--- a/nixos/modules/security/duosec.nix
+++ b/nixos/modules/security/duosec.nix
@@ -73,7 +73,7 @@ in
};
failmode = mkOption {
- type = types.str;
+ type = types.enum [ "safe" "enum" ];
default = "safe";
description = ''
On service or configuration errors that prevent Duo
@@ -115,7 +115,7 @@ in
};
prompts = mkOption {
- type = types.int;
+ type = types.enum [ 1 2 3 ];
default = 3;
description = ''
If a user fails to authenticate with a second factor, Duo
@@ -181,13 +181,7 @@ in
config = mkIf (cfg.ssh.enable || cfg.pam.enable) {
assertions =
- [ { assertion = cfg.failmode == "safe" || cfg.failmode == "secure";
- message = "Invalid value for failmode (must be safe or secure).";
- }
- { assertion = cfg.prompts == 1 || cfg.prompts == 2 || cfg.prompts == 3;
- message = "Invalid value for prompts (must be 1, 2, or 3).";
- }
- { assertion = !cfg.pam.enable;
+ [ { assertion = !cfg.pam.enable;
message = "PAM support is currently not implemented.";
}
];
diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index 53c2ace784ef..ea245ecc5b6a 100644
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@@ -6,14 +6,6 @@ let
cfg = config.security.grsecurity;
grsecLockPath = "/proc/sys/kernel/grsecurity/grsec_lock";
- # Ascertain whether ZFS is required for booting the system; grsecurity is
- # currently incompatible with ZFS, rendering the system unbootable.
- zfsNeededForBoot = filter
- (fs: (fs.neededForBoot
- || elem fs.mountPoint [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ])
- && fs.fsType == "zfs")
- config.system.build.fileSystems != [];
-
# Ascertain whether NixOS container support is required
containerSupportRequired =
config.boot.enableContainers && config.containers != {};
@@ -27,7 +19,14 @@ in
options.security.grsecurity = {
- enable = mkEnableOption "grsecurity/PaX";
+ enable = mkOption {
+ type = types.bool;
+ example = true;
+ default = false;
+ description = ''
+ Enable grsecurity/PaX.
+ '';
+ };
lockTunables = mkOption {
type = types.bool;
@@ -58,20 +57,10 @@ in
config = mkIf cfg.enable {
- # Allow the user to select a different package set, subject to the stated
- # required kernel config
boot.kernelPackages = mkDefault pkgs.linuxPackages_grsec_nixos;
boot.kernelParams = optional cfg.disableEfiRuntimeServices "noefi";
- system.requiredKernelConfig = with config.lib.kernelConfig;
- [ (isEnabled "GRKERNSEC")
- (isEnabled "PAX")
- (isYes "GRKERNSEC_SYSCTL")
- (isYes "GRKERNSEC_SYSCTL_DISTRO")
- (isNo "GRKERNSEC_NO_RBAC")
- ];
-
nixpkgs.config.grsecurity = true;
# Install PaX related utillities into the system profile.
@@ -135,11 +124,5 @@ in
"kernel.grsecurity.chroot_caps" = mkForce 0;
};
- assertions = [
- { assertion = !zfsNeededForBoot;
- message = "grsecurity is currently incompatible with ZFS";
- }
- ];
-
};
}
diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml
index 37314bdba8a5..6f9884336b1e 100644
--- a/nixos/modules/security/grsecurity.xml
+++ b/nixos/modules/security/grsecurity.xml
@@ -225,11 +225,9 @@
- The NixOS module makes several assumptions about the kernel and so may be
- incompatible with your customised kernel. Most of these assumptions are
- encoded as assertions — mismatches should ideally result in a build
- failure. Currently, the only way to work around incompatibilities is to
- eschew the NixOS module and do all configuration yourself.
+ The NixOS module makes several assumptions about the kernel and so
+ may be incompatible with your customised kernel. Currently, the only way
+ to work around incompatibilities is to eschew the NixOS module.
diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index 24892a2a59a1..67112343c335 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -1,25 +1,25 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, utils, ... }:
with lib;
let
- cfg = config.services.tarsnap;
+ gcfg = config.services.tarsnap;
configFile = name: cfg: ''
- cachedir ${config.services.tarsnap.cachedir}/${name}
- keyfile ${cfg.keyfile}
+ keyfile ${cfg.keyfile}
+ ${optionalString (cfg.cachedir != null) "cachedir ${cfg.cachedir}"}
${optionalString cfg.nodump "nodump"}
${optionalString cfg.printStats "print-stats"}
${optionalString cfg.printStats "humanize-numbers"}
${optionalString (cfg.checkpointBytes != null) ("checkpoint-bytes "+cfg.checkpointBytes)}
${optionalString cfg.aggressiveNetworking "aggressive-networking"}
- ${concatStringsSep "\n" (map (v: "exclude "+v) cfg.excludes)}
- ${concatStringsSep "\n" (map (v: "include "+v) cfg.includes)}
+ ${concatStringsSep "\n" (map (v: "exclude ${v}") cfg.excludes)}
+ ${concatStringsSep "\n" (map (v: "include ${v}") cfg.includes)}
${optionalString cfg.lowmem "lowmem"}
${optionalString cfg.verylowmem "verylowmem"}
- ${optionalString (cfg.maxbw != null) ("maxbw "+toString cfg.maxbw)}
- ${optionalString (cfg.maxbwRateUp != null) ("maxbw-rate-up "+toString cfg.maxbwRateUp)}
- ${optionalString (cfg.maxbwRateDown != null) ("maxbw-rate-down "+toString cfg.maxbwRateDown)}
+ ${optionalString (cfg.maxbw != null) "maxbw ${toString cfg.maxbw}"}
+ ${optionalString (cfg.maxbwRateUp != null) "maxbw-rate-up ${toString cfg.maxbwRateUp}"}
+ ${optionalString (cfg.maxbwRateDown != null) "maxbw-rate-down ${toString cfg.maxbwRateDown}"}
'';
in
{
@@ -60,34 +60,13 @@ in
'';
};
- cachedir = mkOption {
- type = types.nullOr types.path;
- default = "/var/cache/tarsnap";
- description = ''
- The cache allows tarsnap to identify previously stored data
- blocks, reducing archival time and bandwidth usage.
-
- Should the cache become desynchronized or corrupted, tarsnap
- will refuse to run until you manually rebuild the cache with
- tarsnap --fsck.
-
- Note that each individual archive (specified below) has its own cache
- directory specified under cachedir; this is because
- tarsnap locks the cache during backups, meaning multiple services
- archives cannot be backed up concurrently or overlap with a shared
- cache.
-
- Set to null to disable caching.
- '';
- };
-
archives = mkOption {
- type = types.attrsOf (types.submodule (
+ type = types.attrsOf (types.submodule ({ config, ... }:
{
options = {
keyfile = mkOption {
type = types.str;
- default = config.services.tarsnap.keyfile;
+ default = gcfg.keyfile;
description = ''
Set a specific keyfile for this archive. This defaults to
"/root/tarsnap.key" if left unspecified.
@@ -107,6 +86,21 @@ in
'';
};
+ cachedir = mkOption {
+ type = types.nullOr types.path;
+ default = "/var/cache/tarsnap/${utils.escapeSystemdPath config.keyfile}";
+ description = ''
+ The cache allows tarsnap to identify previously stored data
+ blocks, reducing archival time and bandwidth usage.
+
+ Should the cache become desynchronized or corrupted, tarsnap
+ will refuse to run until you manually rebuild the cache with
+ tarsnap --fsck.
+
+ Set to null to disable caching.
+ '';
+ };
+
nodump = mkOption {
type = types.bool;
default = true;
@@ -249,7 +243,7 @@ in
};
gamedata =
- { directories = [ "/var/lib/minecraft "];
+ { directories = [ "/var/lib/minecraft" ];
period = "*:30";
};
}
@@ -262,8 +256,8 @@ in
archive names are suffixed by a 1 second resolution timestamp.
For each member of the set is created a timer which triggers the
- instanced tarsnap@ service unit. You may use
- systemctl start tarsnap@archive-name to
+ instanced tarsnap-archive-name service unit. You may use
+ systemctl start tarsnap-archive-name to
manually trigger creation of archive-name at
any time.
'';
@@ -271,63 +265,73 @@ in
};
};
- config = mkIf cfg.enable {
+ config = mkIf gcfg.enable {
assertions =
(mapAttrsToList (name: cfg:
{ assertion = cfg.directories != [];
message = "Must specify paths for tarsnap to back up";
- }) cfg.archives) ++
+ }) gcfg.archives) ++
(mapAttrsToList (name: cfg:
{ assertion = !(cfg.lowmem && cfg.verylowmem);
message = "You cannot set both lowmem and verylowmem";
- }) cfg.archives);
+ }) gcfg.archives);
- systemd.services."tarsnap@" = {
- description = "Tarsnap archive '%i'";
- requires = [ "network-online.target" ];
- after = [ "network-online.target" ];
+ systemd.services =
+ mapAttrs' (name: cfg: nameValuePair "tarsnap-${name}" {
+ description = "Tarsnap archive '${name}'";
+ requires = [ "network-online.target" ];
+ after = [ "network-online.target" ];
- path = [ pkgs.iputils pkgs.tarsnap pkgs.coreutils ];
+ path = [ pkgs.iputils pkgs.tarsnap pkgs.utillinux ];
- # In order for the persistent tarsnap timer to work reliably, we have to
- # make sure that the tarsnap server is reachable after systemd starts up
- # the service - therefore we sleep in a loop until we can ping the
- # endpoint.
- preStart = "while ! ping -q -c 1 v1-0-0-server.tarsnap.com &> /dev/null; do sleep 3; done";
- scriptArgs = "%i";
- script = ''
- mkdir -p -m 0755 ${dirOf cfg.cachedir}
- mkdir -p -m 0700 ${cfg.cachedir}
- chown root:root ${cfg.cachedir}
- chmod 0700 ${cfg.cachedir}
- mkdir -p -m 0700 ${cfg.cachedir}/$1
- DIRS=`cat /etc/tarsnap/$1.dirs`
- exec tarsnap --configfile /etc/tarsnap/$1.conf -c -f $1-$(date +"%Y%m%d%H%M%S") $DIRS
- '';
+ # In order for the persistent tarsnap timer to work reliably, we have to
+ # make sure that the tarsnap server is reachable after systemd starts up
+ # the service - therefore we sleep in a loop until we can ping the
+ # endpoint.
+ preStart = ''
+ while ! ping -q -c 1 v1-0-0-server.tarsnap.com &> /dev/null; do sleep 3; done
+ '';
- serviceConfig = {
- IOSchedulingClass = "idle";
- NoNewPrivileges = "true";
- CapabilityBoundingSet = "CAP_DAC_READ_SEARCH";
- PermissionsStartOnly = "true";
- };
- };
+ script =
+ let run = ''tarsnap --configfile "/etc/tarsnap/${name}.conf" -c -f "${name}-$(date +"%Y%m%d%H%M%S")" ${concatStringsSep " " cfg.directories}'';
+ in if (cfg.cachedir != null) then ''
+ mkdir -p ${cfg.cachedir}
+ chmod 0700 ${cfg.cachedir}
+
+ ( flock 9
+ if [ ! -e ${cfg.cachedir}/firstrun ]; then
+ ( flock 10
+ flock -u 9
+ tarsnap --configfile "/etc/tarsnap/${name}.conf" --fsck
+ flock 9
+ ) 10>${cfg.cachedir}/firstrun
+ fi
+ ) 9>${cfg.cachedir}/lockf
+
+ exec flock ${cfg.cachedir}/firstrun ${run}
+ '' else "exec ${run}";
+
+ serviceConfig = {
+ Type = "oneshot";
+ IOSchedulingClass = "idle";
+ NoNewPrivileges = "true";
+ CapabilityBoundingSet = [ "CAP_DAC_READ_SEARCH" ];
+ PermissionsStartOnly = "true";
+ };
+ }) gcfg.archives;
# Note: the timer must be Persistent=true, so that systemd will start it even
# if e.g. your laptop was asleep while the latest interval occurred.
- systemd.timers = mapAttrs' (name: cfg: nameValuePair "tarsnap@${name}"
+ systemd.timers = mapAttrs' (name: cfg: nameValuePair "tarsnap-${name}"
{ timerConfig.OnCalendar = cfg.period;
timerConfig.Persistent = "true";
wantedBy = [ "timers.target" ];
- }) cfg.archives;
+ }) gcfg.archives;
environment.etc =
- (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.conf"
+ mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.conf"
{ text = configFile name cfg;
- }) cfg.archives) //
- (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.dirs"
- { text = concatStringsSep " " cfg.directories;
- }) cfg.archives);
+ }) gcfg.archives;
environment.systemPackages = [ pkgs.tarsnap ];
};
diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix
new file mode 100644
index 000000000000..5e73638913de
--- /dev/null
+++ b/nixos/modules/services/computing/boinc/client.nix
@@ -0,0 +1,88 @@
+{config, lib, pkgs, ...}:
+
+with lib;
+
+let
+ cfg = config.services.boinc;
+ allowRemoteGuiRpcFlag = optionalString cfg.allowRemoteGuiRpc "--allow_remote_gui_rpc";
+
+in
+ {
+ options.services.boinc = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ example = true;
+ description = ''
+ Whether to enable the BOINC distributed computing client. If this
+ option is set to true, the boinc_client daemon will be run as a
+ background service. The boinccmd command can be used to control the
+ daemon.
+ '';
+ };
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.boinc;
+ defaultText = "pkgs.boinc";
+ description = ''
+ Which BOINC package to use.
+ '';
+ };
+
+ dataDir = mkOption {
+ type = types.path;
+ default = "/var/lib/boinc";
+ description = ''
+ The directory in which to store BOINC's configuration and data files.
+ '';
+ };
+
+ allowRemoteGuiRpc = mkOption {
+ type = types.bool;
+ default = false;
+ example = true;
+ description = ''
+ If set to true, any remote host can connect to and control this BOINC
+ client (subject to password authentication). If instead set to false,
+ only the hosts listed in dataDir/remote_hosts.cfg will be allowed to
+ connect.
+
+ See also:
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [cfg.package];
+
+ users.users.boinc = {
+ createHome = false;
+ description = "BOINC Client";
+ home = cfg.dataDir;
+ isSystemUser = true;
+ };
+
+ systemd.services.boinc = {
+ description = "BOINC Client";
+ after = ["network.target" "local-fs.target"];
+ wantedBy = ["multi-user.target"];
+ preStart = ''
+ mkdir -p ${cfg.dataDir}
+ chown boinc ${cfg.dataDir}
+ '';
+ script = ''
+ ${cfg.package}/bin/boinc_client --dir ${cfg.dataDir} --redirectio ${allowRemoteGuiRpcFlag}
+ '';
+ serviceConfig = {
+ PermissionsStartOnly = true; # preStart must be run as root
+ User = "boinc";
+ Nice = 10;
+ };
+ };
+ };
+
+ meta = {
+ maintainers = with lib.maintainers; [kierdavis];
+ };
+ }
diff --git a/nixos/modules/services/continuous-integration/gocd-agent/default.nix b/nixos/modules/services/continuous-integration/gocd-agent/default.nix
index d60b55e83d11..05adb18fbe91 100644
--- a/nixos/modules/services/continuous-integration/gocd-agent/default.nix
+++ b/nixos/modules/services/continuous-integration/gocd-agent/default.nix
@@ -37,6 +37,7 @@ in {
packages = mkOption {
default = [ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ];
+ defaultText = "[ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]";
type = types.listOf types.package;
description = ''
Packages to add to PATH for the Go.CD agent process.
diff --git a/nixos/modules/services/continuous-integration/gocd-server/default.nix b/nixos/modules/services/continuous-integration/gocd-server/default.nix
index 4bb792055d25..07e00f17f1e8 100644
--- a/nixos/modules/services/continuous-integration/gocd-server/default.nix
+++ b/nixos/modules/services/continuous-integration/gocd-server/default.nix
@@ -68,6 +68,7 @@ in {
packages = mkOption {
default = [ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ];
+ defaultText = "[ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]";
type = types.listOf types.package;
description = ''
Packages to add to PATH for the Go.CD server's process.
diff --git a/nixos/modules/services/databases/riak-cs.nix b/nixos/modules/services/databases/riak-cs.nix
new file mode 100644
index 000000000000..198efc29222a
--- /dev/null
+++ b/nixos/modules/services/databases/riak-cs.nix
@@ -0,0 +1,202 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.riak-cs;
+
+in
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.riak-cs = {
+
+ enable = mkEnableOption "riak-cs";
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.riak-cs;
+ defaultText = "pkgs.riak-cs";
+ example = literalExample "pkgs.riak-cs";
+ description = ''
+ Riak package to use.
+ '';
+ };
+
+ nodeName = mkOption {
+ type = types.str;
+ default = "riak-cs@127.0.0.1";
+ description = ''
+ Name of the Erlang node.
+ '';
+ };
+
+ anonymousUserCreation = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Anonymous user creation.
+ '';
+ };
+
+ riakHost = mkOption {
+ type = types.str;
+ default = "127.0.0.1:8087";
+ description = ''
+ Name of riak hosting service.
+ '';
+ };
+
+ listener = mkOption {
+ type = types.str;
+ default = "127.0.0.1:8080";
+ description = ''
+ Name of Riak CS listening service.
+ '';
+ };
+
+ stanchionHost = mkOption {
+ type = types.str;
+ default = "127.0.0.1:8085";
+ description = ''
+ Name of stanchion hosting service.
+ '';
+ };
+
+ stanchionSsl = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Tell stanchion to use SSL.
+ '';
+ };
+
+ distributedCookie = mkOption {
+ type = types.str;
+ default = "riak";
+ description = ''
+ Cookie for distributed node communication. All nodes in the
+ same cluster should use the same cookie or they will not be able to
+ communicate.
+ '';
+ };
+
+ dataDir = mkOption {
+ type = types.path;
+ default = "/var/db/riak-cs";
+ description = ''
+ Data directory for Riak CS.
+ '';
+ };
+
+ logDir = mkOption {
+ type = types.path;
+ default = "/var/log/riak-cs";
+ description = ''
+ Log directory for Riak CS.
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Additional text to be appended to riak-cs.conf.
+ '';
+ };
+
+ extraAdvancedConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Additional text to be appended to advanced.config.
+ '';
+ };
+ };
+
+ };
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ environment.systemPackages = [ cfg.package ];
+ environment.etc."riak-cs/riak-cs.conf".text = ''
+ nodename = ${cfg.nodeName}
+ distributed_cookie = ${cfg.distributedCookie}
+
+ platform_log_dir = ${cfg.logDir}
+
+ riak_host = ${cfg.riakHost}
+ listener = ${cfg.listener}
+ stanchion_host = ${cfg.stanchionHost}
+
+ anonymous_user_creation = ${if cfg.anonymousUserCreation then "on" else "off"}
+
+ ${cfg.extraConfig}
+ '';
+
+ environment.etc."riak-cs/advanced.config".text = ''
+ ${cfg.extraAdvancedConfig}
+ '';
+
+ users.extraUsers.riak-cs = {
+ name = "riak-cs";
+ uid = config.ids.uids.riak-cs;
+ group = "riak";
+ description = "Riak CS server user";
+ };
+
+ systemd.services.riak-cs = {
+ description = "Riak CS Server";
+
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+
+ path = [
+ pkgs.utillinux # for `logger`
+ pkgs.bash
+ ];
+
+ environment.HOME = "${cfg.dataDir}";
+ environment.RIAK_CS_DATA_DIR = "${cfg.dataDir}";
+ environment.RIAK_CS_LOG_DIR = "${cfg.logDir}";
+ environment.RIAK_CS_ETC_DIR = "/etc/riak";
+
+ preStart = ''
+ if ! test -e ${cfg.logDir}; then
+ mkdir -m 0755 -p ${cfg.logDir}
+ chown -R riak-cs ${cfg.logDir}
+ fi
+
+ if ! test -e ${cfg.dataDir}; then
+ mkdir -m 0700 -p ${cfg.dataDir}
+ chown -R riak-cs ${cfg.dataDir}
+ fi
+ '';
+
+ serviceConfig = {
+ ExecStart = "${cfg.package}/bin/riak-cs console";
+ ExecStop = "${cfg.package}/bin/riak-cs stop";
+ StandardInput = "tty";
+ User = "riak-cs";
+ Group = "riak-cs";
+ PermissionsStartOnly = true;
+ # Give Riak a decent amount of time to clean up.
+ TimeoutStopSec = 120;
+ LimitNOFILE = 65536;
+ };
+
+ unitConfig.RequiresMountsFor = [
+ "${cfg.dataDir}"
+ "${cfg.logDir}"
+ "/etc/riak"
+ ];
+ };
+ };
+}
diff --git a/nixos/modules/services/databases/riak.nix b/nixos/modules/services/databases/riak.nix
index 4477904f78c6..e0ebf164aef0 100644
--- a/nixos/modules/services/databases/riak.nix
+++ b/nixos/modules/services/databases/riak.nix
@@ -20,6 +20,8 @@ in
package = mkOption {
type = types.package;
+ default = pkgs.riak;
+ defaultText = "pkgs.riak";
example = literalExample "pkgs.riak";
description = ''
Riak package to use.
@@ -68,6 +70,14 @@ in
'';
};
+ extraAdvancedConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Additional text to be appended to advanced.config.
+ '';
+ };
+
};
};
@@ -88,6 +98,10 @@ in
${cfg.extraConfig}
'';
+ environment.etc."riak/advanced.config".text = ''
+ ${cfg.extraAdvancedConfig}
+ '';
+
users.extraUsers.riak = {
name = "riak";
uid = config.ids.uids.riak;
diff --git a/nixos/modules/services/databases/stanchion.nix b/nixos/modules/services/databases/stanchion.nix
new file mode 100644
index 000000000000..f2dbb78b5c4b
--- /dev/null
+++ b/nixos/modules/services/databases/stanchion.nix
@@ -0,0 +1,212 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.stanchion;
+
+in
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.stanchion = {
+
+ enable = mkEnableOption "stanchion";
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.stanchion;
+ defaultText = "pkgs.stanchion";
+ example = literalExample "pkgs.stanchion";
+ description = ''
+ Stanchion package to use.
+ '';
+ };
+
+ nodeName = mkOption {
+ type = types.str;
+ default = "stanchion@127.0.0.1";
+ description = ''
+ Name of the Erlang node.
+ '';
+ };
+
+ adminKey = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ Name of admin user.
+ '';
+ };
+
+ adminSecret = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ Name of admin secret
+ '';
+ };
+
+ riakHost = mkOption {
+ type = types.str;
+ default = "127.0.0.1:8087";
+ description = ''
+ Name of riak hosting service.
+ '';
+ };
+
+ listener = mkOption {
+ type = types.str;
+ default = "127.0.0.1:8085";
+ description = ''
+ Name of Riak CS listening service.
+ '';
+ };
+
+ stanchionHost = mkOption {
+ type = types.str;
+ default = "127.0.0.1:8085";
+ description = ''
+ Name of stanchion hosting service.
+ '';
+ };
+
+ stanchionSsl = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Tell stanchion to use SSL.
+ '';
+ };
+
+ distributedCookie = mkOption {
+ type = types.str;
+ default = "riak";
+ description = ''
+ Cookie for distributed node communication. All nodes in the
+ same cluster should use the same cookie or they will not be able to
+ communicate.
+ '';
+ };
+
+ dataDir = mkOption {
+ type = types.path;
+ default = "/var/db/stanchion";
+ description = ''
+ Data directory for Stanchion.
+ '';
+ };
+
+ logDir = mkOption {
+ type = types.path;
+ default = "/var/log/stanchion";
+ description = ''
+ Log directory for Stanchino.
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Additional text to be appended to stanchion.conf.
+ '';
+ };
+ };
+ };
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ environment.systemPackages = [ cfg.package ];
+
+ environment.etc."stanchion/advanced.config".text = ''
+ [{stanchion, []}].
+ '';
+
+ environment.etc."stanchion/stanchion.conf".text = ''
+ listener = ${cfg.listener}
+
+ riak_host = ${cfg.riakHost}
+
+ ${optionalString (cfg.adminKey == "") "#"} admin.key=${optionalString (cfg.adminKey != "") cfg.adminKey}
+ ${optionalString (cfg.adminSecret == "") "#"} admin.secret=${optionalString (cfg.adminSecret != "") cfg.adminSecret}
+
+ platform_bin_dir = ${pkgs.stanchion}/bin
+ platform_data_dir = ${cfg.dataDir}
+ platform_etc_dir = /etc/stanchion
+ platform_lib_dir = ${pkgs.stanchion}/lib
+ platform_log_dir = ${cfg.logDir}
+
+ nodename = ${cfg.nodeName}
+
+ distributed_cookie = ${cfg.distributedCookie}
+
+ stanchion_ssl=${if cfg.stanchionSsl then "on" else "off"}
+
+ ${cfg.extraConfig}
+ '';
+
+ users.extraUsers.stanchion = {
+ name = "stanchion";
+ uid = config.ids.uids.stanchion;
+ group = "stanchion";
+ description = "Stanchion server user";
+ };
+
+ users.extraGroups.stanchion.gid = config.ids.gids.stanchion;
+
+ systemd.services.stanchion = {
+ description = "Stanchion Server";
+
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+
+ path = [
+ pkgs.utillinux # for `logger`
+ pkgs.bash
+ ];
+
+ environment.HOME = "${cfg.dataDir}";
+ environment.STANCHION_DATA_DIR = "${cfg.dataDir}";
+ environment.STANCHION_LOG_DIR = "${cfg.logDir}";
+ environment.STANCHION_ETC_DIR = "/etc/stanchion";
+
+ preStart = ''
+ if ! test -e ${cfg.logDir}; then
+ mkdir -m 0755 -p ${cfg.logDir}
+ chown -R stanchion:stanchion ${cfg.logDir}
+ fi
+
+ if ! test -e ${cfg.dataDir}; then
+ mkdir -m 0700 -p ${cfg.dataDir}
+ chown -R stanchion:stanchion ${cfg.dataDir}
+ fi
+ '';
+
+ serviceConfig = {
+ ExecStart = "${cfg.package}/bin/stanchion console";
+ ExecStop = "${cfg.package}/bin/stanchion stop";
+ StandardInput = "tty";
+ User = "stanchion";
+ Group = "stanchion";
+ PermissionsStartOnly = true;
+ # Give Stanchion a decent amount of time to clean up.
+ TimeoutStopSec = 120;
+ LimitNOFILE = 65536;
+ };
+
+ unitConfig.RequiresMountsFor = [
+ "${cfg.dataDir}"
+ "${cfg.logDir}"
+ "/etc/stanchion"
+ ];
+ };
+ };
+}
diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix
index a34037403123..8ddb9ef9c53b 100644
--- a/nixos/modules/services/hardware/sane.nix
+++ b/nixos/modules/services/hardware/sane.nix
@@ -7,9 +7,35 @@ let
pkg = if config.hardware.sane.snapshot
then pkgs.sane-backends-git
else pkgs.sane-backends;
- backends = [ pkg ] ++ config.hardware.sane.extraBackends;
+
+ sanedConf = pkgs.writeTextFile {
+ name = "saned.conf";
+ destination = "/etc/sane.d/saned.conf";
+ text = ''
+ localhost
+ ${config.services.saned.extraConfig}
+ '';
+ };
+
+ netConf = pkgs.writeTextFile {
+ name = "net.conf";
+ destination = "/etc/sane.d/net.conf";
+ text = ''
+ ${lib.optionalString config.services.saned.enable "localhost"}
+ ${config.hardware.sane.netConf}
+ '';
+ };
+
+ env = {
+ SANE_CONFIG_DIR = config.hardware.sane.configDir;
+ LD_LIBRARY_PATH = [ "${saneConfig}/lib/sane" ];
+ };
+
+ backends = [ pkg netConf ] ++ optional config.services.saned.enable sanedConf ++ config.hardware.sane.extraBackends;
saneConfig = pkgs.mkSaneConfig { paths = backends; };
+ enabled = config.hardware.sane.enable || config.services.saned.enable;
+
in
{
@@ -51,27 +77,86 @@ in
hardware.sane.configDir = mkOption {
type = types.string;
+ internal = true;
description = "The value of SANE_CONFIG_DIR.";
};
+ hardware.sane.netConf = mkOption {
+ type = types.lines;
+ default = "";
+ example = "192.168.0.16";
+ description = ''
+ Network hosts that should be probed for remote scanners.
+ '';
+ };
+
+ services.saned.enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enable saned network daemon for remote connection to scanners.
+
+ saned would be runned from scanner user; to allow
+ access to hardware that doesn't have scanner group
+ you should add needed groups to this user.
+ '';
+ };
+
+ services.saned.extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ example = "192.168.0.0/24";
+ description = ''
+ Extra saned configuration lines.
+ '';
+ };
+
};
###### implementation
- config = mkIf config.hardware.sane.enable {
+ config = mkMerge [
+ (mkIf enabled {
+ hardware.sane.configDir = mkDefault "${saneConfig}/etc/sane.d";
- hardware.sane.configDir = mkDefault "${saneConfig}/etc/sane.d";
+ environment.systemPackages = backends;
+ environment.sessionVariables = env;
+ services.udev.packages = backends;
- environment.systemPackages = backends;
- environment.sessionVariables = {
- SANE_CONFIG_DIR = config.hardware.sane.configDir;
- LD_LIBRARY_PATH = [ "${saneConfig}/lib/sane" ];
- };
- services.udev.packages = backends;
+ users.extraGroups."scanner".gid = config.ids.gids.scanner;
+ })
- users.extraGroups."scanner".gid = config.ids.gids.scanner;
+ (mkIf config.services.saned.enable {
+ networking.firewall.connectionTrackingModules = [ "sane" ];
- };
+ systemd.services."saned@" = {
+ description = "Scanner Service";
+ environment = mapAttrs (name: val: toString val) env;
+ serviceConfig = {
+ User = "scanner";
+ Group = "scanner";
+ ExecStart = "${pkg}/bin/saned";
+ };
+ };
+
+ systemd.sockets.saned = {
+ description = "saned incoming socket";
+ wantedBy = [ "sockets.target" ];
+ listenStreams = [ "0.0.0.0:6566" "[::]:6566" ];
+ socketConfig = {
+ # saned needs to distinguish between IPv4 and IPv6 to open matching data sockets.
+ BindIPv6Only = "ipv6-only";
+ Accept = true;
+ MaxConnections = 1;
+ };
+ };
+
+ users.extraUsers."scanner" = {
+ uid = config.ids.uids.scanner;
+ group = "scanner";
+ };
+ })
+ ];
}
diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix
index 24dca15dd913..7e3b6431a133 100644
--- a/nixos/modules/services/misc/dictd.nix
+++ b/nixos/modules/services/misc/dictd.nix
@@ -25,7 +25,8 @@ in
DBs = mkOption {
type = types.listOf types.package;
default = with pkgs.dictdDBs; [ wiktionary wordnet ];
- example = [ pkgs.dictdDBs.nld2eng ];
+ defaultText = "with pkgs.dictdDBs; [ wiktionary wordnet ]";
+ example = literalExample "[ pkgs.dictdDBs.nld2eng ]";
description = ''List of databases to make available.'';
};
diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index e5a125ad3245..e96645c79c77 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@@ -41,6 +41,7 @@ in
type = types.path;
description = "The Disnix package";
default = pkgs.disnix;
+ defaultText = "pkgs.disnix";
};
};
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 3e4584c7a512..cb8fa901bbd2 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -164,18 +164,21 @@ in {
packages.gitlab = mkOption {
type = types.package;
default = pkgs.gitlab;
+ defaultText = "pkgs.gitlab";
description = "Reference to the gitlab package";
};
packages.gitlab-shell = mkOption {
type = types.package;
default = pkgs.gitlab-shell;
+ defaultText = "pkgs.gitlab-shell";
description = "Reference to the gitlab-shell package";
};
packages.gitlab-workhorse = mkOption {
type = types.package;
default = pkgs.gitlab-workhorse;
+ defaultText = "pkgs.gitlab-workhorse";
description = "Reference to the gitlab-workhorse package";
};
diff --git a/nixos/modules/services/misc/parsoid.nix b/nixos/modules/services/misc/parsoid.nix
index ab1b54068772..ae3f84333d2d 100644
--- a/nixos/modules/services/misc/parsoid.nix
+++ b/nixos/modules/services/misc/parsoid.nix
@@ -6,20 +6,21 @@ let
cfg = config.services.parsoid;
- conf = ''
- exports.setup = function( parsoidConfig ) {
- ${toString (mapAttrsToList (name: str: "parsoidConfig.setInterwiki('${name}', '${str}');") cfg.interwikis)}
+ confTree = {
+ worker_heartbeat_timeout = 300000;
+ logging = { level = "info"; };
+ services = [{
+ module = "lib/index.js";
+ entrypoint = "apiServiceWorker";
+ conf = {
+ mwApis = map (x: if isAttrs x then x else { uri = x; }) cfg.wikis;
+ serverInterface = cfg.interface;
+ serverPort = cfg.port;
+ };
+ }];
+ };
- parsoidConfig.serverInterface = "${cfg.interface}";
- parsoidConfig.serverPort = ${toString cfg.port};
-
- parsoidConfig.useSelser = true;
-
- ${cfg.extraConfig}
- };
- '';
-
- confFile = builtins.toFile "localsettings.js" conf;
+ confFile = pkgs.writeText "config.yml" (builtins.toJSON (recursiveUpdate confTree cfg.extraConfig));
in
{
@@ -38,9 +39,9 @@ in
'';
};
- interwikis = mkOption {
- type = types.attrsOf types.str;
- example = { localhost = "http://localhost/api.php"; };
+ wikis = mkOption {
+ type = types.listOf (types.either types.str types.attrs);
+ example = [ "http://localhost/api.php" ];
description = ''
Used MediaWiki API endpoints.
'';
@@ -71,8 +72,8 @@ in
};
extraConfig = mkOption {
- type = types.lines;
- default = "";
+ type = types.attrs;
+ default = {};
description = ''
Extra configuration to add to parsoid configuration.
'';
diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 7e981183353d..f50dae2ab7be 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -19,30 +19,21 @@ let
type = types.str;
description = "Public key at the opposite end of the tunnel.";
};
- hostname = mkOption {
- default = "";
- example = "foobar.hype";
- type = types.str;
- description = "Optional hostname to add to /etc/hosts; prevents reverse lookup failures.";
- };
};
};
- # Additional /etc/hosts entries for peers with an associated hostname
- cjdnsExtraHosts = import (pkgs.runCommand "cjdns-hosts" {}
- # Generate a builder that produces an output usable as a Nix string value
- ''
- exec >$out
- echo \'\'
- ${concatStringsSep "\n" (mapAttrsToList (k: v:
- optionalString (v.hostname != "")
- "echo $(${pkgs.cjdns}/bin/publictoip6 ${v.publicKey}) ${v.hostname}")
- (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo))}
- echo \'\'
- '');
-
- parseModules = x:
- x // { connectTo = mapAttrs (name: value: { inherit (value) password publicKey; }) x.connectTo; };
+ # check for the required attributes, otherwise
+ # permit attributes not undefined here
+ checkPeers = x:
+ x // {
+ connectTo = mapAttrs
+ (name: value:
+ if !hasAttr "publicKey" value then abort "cjdns peer ${name} missing a publicKey" else
+ if !hasAttr "password" value then abort "cjdns peer ${name} missing a password" else
+ value
+ )
+ x.connectTo;
+ };
# would be nice to merge 'cfg' with a //,
# but the json nesting is wacky.
@@ -53,8 +44,8 @@ let
};
authorizedPasswords = map (p: { password = p; }) cfg.authorizedPasswords;
interfaces = {
- ETHInterface = if (cfg.ETHInterface.bind != "") then [ (parseModules cfg.ETHInterface) ] else [ ];
- UDPInterface = if (cfg.UDPInterface.bind != "") then [ (parseModules cfg.UDPInterface) ] else [ ];
+ ETHInterface = if (cfg.ETHInterface.bind != "") then [ (checkPeers cfg.ETHInterface) ] else [ ];
+ UDPInterface = if (cfg.UDPInterface.bind != "") then [ (checkPeers cfg.UDPInterface) ] else [ ];
};
privateKey = "@CJDNS_PRIVATE_KEY@";
@@ -134,12 +125,12 @@ in
'';
};
connectTo = mkOption {
- type = types.attrsOf ( types.submodule ( connectToSubmodule ) );
+ type = types.attrsOf (types.attrsOf types.str);
default = { };
example = {
"192.168.1.1:27313" = {
- hostname = "homer.hype";
- password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
+ user = "foobar";
+ password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k";
};
};
@@ -179,12 +170,12 @@ in
};
connectTo = mkOption {
- type = types.attrsOf ( types.submodule ( connectToSubmodule ) );
+ type = types.attrsOf (types.attrsOf types.str);
default = { };
example = {
"01:02:03:04:05:06" = {
- hostname = "homer.hype";
- password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
+ user = "foobar";
+ password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k";
};
};
@@ -254,8 +245,6 @@ in
};
};
- networking.extraHosts = cjdnsExtraHosts;
-
assertions = [
{ assertion = ( cfg.ETHInterface.bind != "" || cfg.UDPInterface.bind != "" || cfg.confFile != null );
message = "Neither cjdns.ETHInterface.bind nor cjdns.UDPInterface.bind defined.";
diff --git a/nixos/modules/services/networking/dante.nix b/nixos/modules/services/networking/dante.nix
new file mode 100644
index 000000000000..8f4e15223ab0
--- /dev/null
+++ b/nixos/modules/services/networking/dante.nix
@@ -0,0 +1,61 @@
+{ config, lib, pkgs, ... }:
+with lib;
+
+let
+ cfg = config.services.dante;
+ confFile = pkgs.writeText "dante-sockd.conf" ''
+ user.privileged: root
+ user.unprivileged: dante
+
+ ${cfg.config}
+ '';
+in
+
+{
+ meta = {
+ maintainers = with maintainers; [ arobyn ];
+ };
+
+ options = {
+ services.dante = {
+ enable = mkEnableOption "Dante SOCKS proxy";
+
+ config = mkOption {
+ default = null;
+ type = types.str;
+ description = ''
+ Contents of Dante's configuration file
+ NOTE: user.privileged/user.unprivileged are set by the service
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ assertions = [
+ { assertion = cfg.config != null;
+ message = "please provide Dante configuration file contents";
+ }
+ ];
+
+ users.users.dante = {
+ description = "Dante SOCKS proxy daemon user";
+ isSystemUser = true;
+ group = "dante";
+ };
+ users.groups.dante = {};
+
+ systemd.services.dante = {
+ description = "Dante SOCKS v4 and v5 compatible proxy server";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+
+ serviceConfig = {
+ Type = "simple";
+ ExecStart = "${pkgs.dante}/bin/sockd -f ${confFile}";
+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ Restart = "always";
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix
index 28b6c4f657dd..ca47a18bc1f6 100644
--- a/nixos/modules/services/networking/flannel.nix
+++ b/nixos/modules/services/networking/flannel.nix
@@ -20,6 +20,7 @@ in {
description = "Package to use for flannel";
type = types.package;
default = pkgs.flannel.bin;
+ defaultText = "pkgs.flannel.bin";
};
publicIp = mkOption {
diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index 51f95af48029..fd4545e88e2d 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@@ -86,7 +86,7 @@ in
hwMode = mkOption {
default = "g";
- type = types.string;
+ type = types.enum [ "a" "b" "g" ];
description = ''
Operation mode.
(a = IEEE 802.11a, b = IEEE 802.11b, g = IEEE 802.11g).
@@ -152,9 +152,6 @@ in
config = mkIf cfg.enable {
assertions = [
- { assertion = (cfg.hwMode == "a" || cfg.hwMode == "b" || cfg.hwMode == "g");
- message = "hwMode must be a/b/g";
- }
{ assertion = (cfg.channel >= 1 && cfg.channel <= 13);
message = "channel must be between 1 and 13";
}];
diff --git a/nixos/modules/services/networking/nntp-proxy.nix b/nixos/modules/services/networking/nntp-proxy.nix
index dca8ccac7627..7eebecb23b00 100644
--- a/nixos/modules/services/networking/nntp-proxy.nix
+++ b/nixos/modules/services/networking/nntp-proxy.nix
@@ -148,11 +148,11 @@ in
};
verbosity = mkOption {
- type = types.str;
+ type = types.enum [ "error" "warning" "notice" "info" "debug" ];
default = "info";
example = "error";
description = ''
- Verbosity level (error, warning, notice, info, debug)
+ Verbosity level
'';
};
diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index ccfd219620cf..481e267f6c38 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -345,12 +345,10 @@ let
};
rrlWhitelist = mkOption {
- type = types.listOf types.str;
+ type = with types; listOf (enum [ "nxdomain" "error" "referral" "any" "rrsig" "wildcard" "nodata" "dnskey" "positive" "all" ]);
default = [];
description = ''
Whitelists the given rrl-types.
- The RRL classification types are: nxdomain, error, referral, any,
- rrsig, wildcard, nodata, dnskey, positive, all
'';
};
diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix
index 3f0906fdb80d..edcc12170b20 100644
--- a/nixos/modules/services/networking/quassel.nix
+++ b/nixos/modules/services/networking/quassel.nix
@@ -26,10 +26,11 @@ in
package = mkOption {
type = types.package;
default = pkgs.kde4.quasselDaemon;
+ defaultText = "pkgs.kde4.quasselDaemon";
description = ''
The package of the quassel daemon.
'';
- example = pkgs.quasselDaemon;
+ example = literalExample "pkgs.quasselDaemon";
};
interfaces = mkOption {
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 81941ce1cfb6..073391ffdbbc 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -228,8 +228,6 @@ in
config = mkIf cfg.enable {
- programs.ssh.setXAuthLocation = mkForce cfg.forwardX11;
-
users.extraUsers.sshd =
{ isSystemUser = true;
description = "SSH privilege separation user";
diff --git a/nixos/modules/services/search/hound.nix b/nixos/modules/services/search/hound.nix
index 1226cba682ec..a94a851e80ec 100644
--- a/nixos/modules/services/search/hound.nix
+++ b/nixos/modules/services/search/hound.nix
@@ -50,6 +50,8 @@ in {
package = mkOption {
default = pkgs.hound;
+ defaultText = "pkgs.hound";
+ type = types.package;
description = ''
Package for running hound.
'';
diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix
index 89ac1c01f521..b045e140546d 100644
--- a/nixos/modules/services/security/clamav.nix
+++ b/nixos/modules/services/security/clamav.nix
@@ -3,26 +3,37 @@ with lib;
let
clamavUser = "clamav";
stateDir = "/var/lib/clamav";
- runDir = "/var/run/clamav";
- logDir = "/var/log/clamav";
+ runDir = "/run/clamav";
clamavGroup = clamavUser;
cfg = config.services.clamav;
+ pkg = pkgs.clamav;
+
clamdConfigFile = pkgs.writeText "clamd.conf" ''
DatabaseDirectory ${stateDir}
LocalSocket ${runDir}/clamd.ctl
- LogFile ${logDir}/clamav.log
PidFile ${runDir}/clamd.pid
+ TemporaryDirectory /tmp
User clamav
+ Foreground yes
${cfg.daemon.extraConfig}
'';
- pkg = pkgs.clamav;
+
+ freshclamConfigFile = pkgs.writeText "freshclam.conf" ''
+ DatabaseDirectory ${stateDir}
+ Foreground yes
+ Checks ${toString cfg.updater.frequency}
+
+ ${cfg.updater.extraConfig}
+
+ DatabaseMirror database.clamav.net
+ '';
in
{
options = {
services.clamav = {
daemon = {
- enable = mkEnableOption "clamd daemon";
+ enable = mkEnableOption "ClamAV clamd daemon";
extraConfig = mkOption {
type = types.lines;
@@ -34,16 +45,27 @@ in
};
};
updater = {
- enable = mkEnableOption "freshclam updater";
+ enable = mkEnableOption "ClamAV freshclam updater";
frequency = mkOption {
+ type = types.int;
default = 12;
description = ''
Number of database checks per day.
'';
};
- config = mkOption {
+ interval = mkOption {
+ type = types.str;
+ default = "hourly";
+ description = ''
+ How often freshclam is invoked. See systemd.time(7) for more
+ information about the format.
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
default = "";
description = ''
Extra configuration for freshclam. Contents will be added verbatim to the
@@ -68,50 +90,53 @@ in
gid = config.ids.gids.clamav;
};
- services.clamav.updater.config = mkIf cfg.updater.enable ''
- DatabaseDirectory ${stateDir}
- Foreground yes
- Checks ${toString cfg.updater.frequency}
- DatabaseMirror database.clamav.net
- '';
+ environment.etc."clamav/freshclam.conf".source = freshclamConfigFile;
+ environment.etc."clamav/clamd.conf".source = clamdConfigFile;
- systemd.services.clamd = mkIf cfg.daemon.enable {
+ systemd.services.clamav-daemon = mkIf cfg.daemon.enable {
description = "ClamAV daemon (clamd)";
- path = [ pkg ];
- after = [ "network.target" "freshclam.service" ];
- requires = [ "freshclam.service" ];
+ after = mkIf cfg.updater.enable [ "clamav-freshclam.service" ];
+ requires = mkIf cfg.updater.enable [ "clamav-freshclam.service" ];
wantedBy = [ "multi-user.target" ];
+ restartTriggers = [ clamdConfigFile ];
+
preStart = ''
- mkdir -m 0755 -p ${logDir}
mkdir -m 0755 -p ${runDir}
- chown ${clamavUser}:${clamavGroup} ${logDir}
chown ${clamavUser}:${clamavGroup} ${runDir}
'';
+
serviceConfig = {
- ExecStart = "${pkg}/bin/clamd --config-file=${clamdConfigFile}";
- Type = "forking";
- ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
- Restart = "on-failure";
- RestartSec = "10s";
- StartLimitInterval = "1min";
+ ExecStart = "${pkg}/bin/clamd";
+ ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID";
+ PrivateTmp = "yes";
+ PrivateDevices = "yes";
+ PrivateNetwork = "yes";
};
};
- systemd.services.freshclam = mkIf cfg.updater.enable {
- description = "ClamAV updater (freshclam)";
- after = [ "network.target" ];
- wantedBy = [ "multi-user.target" ];
- path = [ pkg ];
+ systemd.timers.clamav-freshclam = mkIf cfg.updater.enable {
+ description = "Timer for ClamAV virus database updater (freshclam)";
+ wantedBy = [ "timers.target" ];
+ timerConfig = {
+ OnCalendar = cfg.updater.interval;
+ Unit = "clamav-freshclam.service";
+ };
+ };
+
+ systemd.services.clamav-freshclam = mkIf cfg.updater.enable {
+ description = "ClamAV virus database updater (freshclam)";
+ restartTriggers = [ freshclamConfigFile ];
+
preStart = ''
mkdir -m 0755 -p ${stateDir}
chown ${clamavUser}:${clamavGroup} ${stateDir}
'';
+
serviceConfig = {
- ExecStart = "${pkg}/bin/freshclam --daemon --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}";
- ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
- Restart = "on-failure";
- RestartSec = "10s";
- StartLimitInterval = "1min";
+ Type = "oneshot";
+ ExecStart = "${pkg}/bin/freshclam";
+ PrivateTmp = "yes";
+ PrivateDevices = "yes";
};
};
};
diff --git a/nixos/modules/services/torrent/opentracker.nix b/nixos/modules/services/torrent/opentracker.nix
index d86b9fea2d79..74f443381d92 100644
--- a/nixos/modules/services/torrent/opentracker.nix
+++ b/nixos/modules/services/torrent/opentracker.nix
@@ -13,6 +13,7 @@ in {
opentracker package to use
'';
default = pkgs.opentracker;
+ defaultText = "pkgs.opentracker";
};
extraOptions = mkOption {
diff --git a/nixos/modules/services/web-apps/quassel-webserver.nix b/nixos/modules/services/web-apps/quassel-webserver.nix
index 7de9480d4c46..d19e4bc58277 100644
--- a/nixos/modules/services/web-apps/quassel-webserver.nix
+++ b/nixos/modules/services/web-apps/quassel-webserver.nix
@@ -31,6 +31,8 @@ in {
};
pkg = mkOption {
default = pkgs.quassel-webserver;
+ defaultText = "pkgs.quassel-webserver";
+ type = types.package;
description = "The quassel-webserver package";
};
quasselCoreHost = mkOption {
diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix
index bda4eec01026..7cbca1dcddfd 100644
--- a/nixos/modules/services/x11/compton.nix
+++ b/nixos/modules/services/x11/compton.nix
@@ -188,6 +188,7 @@ in {
package = mkOption {
type = types.package;
default = pkgs.compton;
+ defaultText = "pkgs.compton";
example = literalExample "pkgs.compton";
description = ''
Compton derivation to use.
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index bc010d1ce1cf..9b51b92faa4d 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -22,6 +22,15 @@ in
description = "Enable the Plasma 5 (KDE 5) desktop environment.";
};
+ enableQt4Support = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Enable support for Qt 4-based applications. Particularly, install the
+ Qt 4 version of the Breeze theme and a default backend for Phonon.
+ '';
+ };
+
};
};
@@ -105,7 +114,7 @@ in
kde5.sonnet
kde5.threadweaver
- kde5.breeze
+ kde5.breeze-qt5
kde5.kactivitymanagerd
kde5.kde-cli-tools
kde5.kdecoration
@@ -141,13 +150,12 @@ in
kde5.konsole
kde5.print-manager
- # Oxygen icons moved to KDE Frameworks 5.16 and later.
- (kde5.oxygen-icons or kde5.oxygen-icons5)
+ # Install Breeze icons if available
+ (kde5.breeze-icons or kde5.oxygen-icons5 or kde5.oxygen-icons)
pkgs.hicolor_icon_theme
- kde5.kde-gtk-config
+ kde5.kde-gtk-config kde5.breeze-gtk
- pkgs.phonon-backend-gstreamer
pkgs.qt5.phonon-backend-gstreamer
]
@@ -155,15 +163,14 @@ in
# If it is not available, Orion is very similar to Breeze.
++ lib.optional (!(lib.hasAttr "breeze-gtk" kde5)) pkgs.orion
- # Install Breeze icons if available
- ++ lib.optional (lib.hasAttr "breeze-icons" kde5) kde5.breeze-icons
-
# Install activity manager if available
++ lib.optional (lib.hasAttr "kactivitymanagerd" kde5) kde5.kactivitymanagerd
# frameworkintegration was split with plasma-integration in Plasma 5.6
++ lib.optional (lib.hasAttr "plasma-integration" kde5) kde5.plasma-integration
+ ++ lib.optionals cfg.enableQt4Support [ kde5.breeze-qt4 pkgs.phonon-backend-gstreamer ]
+
# Optional hardware support features
++ lib.optional config.hardware.bluetooth.enable kde5.bluedevil
++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm
@@ -217,7 +224,6 @@ in
kde5.ecm # for the setup-hook
kde5.plasma-workspace
kde5.breeze-icons
- (kde5.oxygen-icons or kde5.oxygen-icons5)
];
};
diff --git a/nixos/modules/services/x11/window-managers/bspwm-unstable.nix b/nixos/modules/services/x11/window-managers/bspwm-unstable.nix
deleted file mode 100644
index 3282e0d0851f..000000000000
--- a/nixos/modules/services/x11/window-managers/bspwm-unstable.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- cfg = config.services.xserver.windowManager.bspwm-unstable;
-in
-
-{
- options = {
- services.xserver.windowManager.bspwm-unstable = {
- enable = mkEnableOption "bspwm-unstable";
- startThroughSession = mkOption {
- type = with types; bool;
- default = false;
- description = "
- Start the window manager through the script defined in
- sessionScript. Defaults to the the bspwm-session script
- provided by bspwm
- ";
- };
- sessionScript = mkOption {
- default = "${pkgs.bspwm-unstable}/bin/bspwm-session";
- defaultText = "(pkgs.bspwm-unstable)/bin/bspwm-session";
- description = "
- The start-session script to use. Defaults to the
- provided bspwm-session script from the bspwm package.
-
- Does nothing unless `bspwm.startThroughSession` is enabled
- ";
- };
- };
- };
-
- config = mkIf cfg.enable {
- services.xserver.windowManager.session = singleton {
- name = "bspwm-unstable";
- start = if cfg.startThroughSession
- then cfg.sessionScript
- else ''
- export _JAVA_AWT_WM_NONREPARENTING=1
- SXHKD_SHELL=/bin/sh ${pkgs.sxhkd-unstable}/bin/sxhkd -f 100 &
- ${pkgs.bspwm-unstable}/bin/bspwm
- '';
- };
- environment.systemPackages = [ pkgs.bspwm-unstable ];
- };
-}
diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix
index 03a1b7a72e88..6783ac3479e6 100644
--- a/nixos/modules/services/x11/window-managers/bspwm.nix
+++ b/nixos/modules/services/x11/window-managers/bspwm.nix
@@ -9,40 +9,69 @@ in
{
options = {
services.xserver.windowManager.bspwm = {
- enable = mkEnableOption "bspwm";
- startThroughSession = mkOption {
- type = with types; bool;
- default = false;
- description = "
- Start the window manager through the script defined in
- sessionScript. Defaults to the the bspwm-session script
- provided by bspwm
- ";
- };
- sessionScript = mkOption {
- default = "${pkgs.bspwm}/bin/bspwm-session";
- defaultText = "(pkgs.bspwm)/bin/bspwm-session";
- description = "
- The start-session script to use. Defaults to the
- provided bspwm-session script from the bspwm package.
+ enable = mkEnableOption "bspwm";
- Does nothing unless `bspwm.startThroughSession` is enabled
- ";
+ package = mkOption {
+ type = types.package;
+ default = pkgs.bspwm;
+ defaultText = "pkgs.bspwm";
+ example = "pkgs.bspwm-unstable";
+ description = ''
+ bspwm package to use.
+ '';
+ };
+ configFile = mkOption {
+ type = with types; nullOr path;
+ example = "${pkgs.bspwm}/share/doc/bspwm/examples/bspwmrc";
+ default = null;
+ description = ''
+ Path to the bspwm configuration file.
+ If null, $HOME/.config/bspwm/bspwmrc will be used.
+ '';
+ };
+
+ sxhkd = {
+ package = mkOption {
+ type = types.package;
+ default = pkgs.sxhkd;
+ defaultText = "pkgs.sxhkd";
+ example = "pkgs.sxhkd-unstable";
+ description = ''
+ sxhkd package to use.
+ '';
};
+ configFile = mkOption {
+ type = with types; nullOr path;
+ example = "${pkgs.bspwm}/share/doc/bspwm/examples/sxhkdrc";
+ default = null;
+ description = ''
+ Path to the sxhkd configuration file.
+ If null, $HOME/.config/sxhkd/sxhkdrc will be used.
+ '';
+ };
+ };
};
};
config = mkIf cfg.enable {
services.xserver.windowManager.session = singleton {
- name = "bspwm";
- start = if cfg.startThroughSession
- then cfg.sessionScript
- else ''
- export _JAVA_AWT_WM_NONREPARENTING=1
- SXHKD_SHELL=/bin/sh ${pkgs.sxhkd}/bin/sxhkd -f 100 &
- ${pkgs.bspwm}/bin/bspwm
- '';
+ name = "bspwm";
+ start = ''
+ export _JAVA_AWT_WM_NONREPARENTING=1
+ SXHKD_SHELL=/bin/sh ${cfg.sxhkd.package}/bin/sxhkd ${optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\""} &
+ ${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""}
+ waitPID=$!
+ '';
};
- environment.systemPackages = [ pkgs.bspwm ];
+ environment.systemPackages = [ cfg.package ];
};
+
+ imports = [
+ (mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm-unstable" "enable" ]
+ "Use services.xserver.windowManager.bspwm.enable and set services.xserver.windowManager.bspwm.package to pkgs.bspwm-unstable to use the unstable version of bspwm.")
+ (mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm" "startThroughSession" ]
+ "bspwm package does not provide bspwm-session anymore.")
+ (mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm" "sessionScript" ]
+ "bspwm package does not provide bspwm-session anymore.")
+ ];
}
diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index dabe2c26a72f..f005decfa33c 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -10,7 +10,6 @@ in
imports = [
./afterstep.nix
./bspwm.nix
- ./bspwm-unstable.nix
./compiz.nix
./dwm.nix
./exwm.nix
diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix
index a8c7d4b3ee5e..59ecaf8d5a6d 100644
--- a/nixos/modules/system/boot/initrd-ssh.nix
+++ b/nixos/modules/system/boot/initrd-ssh.nix
@@ -122,7 +122,7 @@ in
mkdir -p /root/.ssh
${concatStrings (map (key: ''
- echo -n ${escapeShellArg key} >> /root/.ssh/authorized_keys
+ echo ${escapeShellArg key} >> /root/.ssh/authorized_keys
'') cfg.authorizedKeys)}
dropbear -s -j -k -E -m -p ${toString cfg.port}
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 17c842ddc533..294fc1988e9f 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -53,7 +53,7 @@ let
inherit (args) devices;
inherit (efi) canTouchEfiVariables;
inherit (cfg)
- version extraConfig extraPerEntryConfig extraEntries
+ version extraConfig extraPerEntryConfig extraEntries forceInstall
extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels
default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios;
path = (makeBinPath ([
@@ -403,6 +403,16 @@ in
'';
};
+ forceInstall = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Whether to try and forcibly install GRUB even if problems are
+ detected. It is not recommended to enable this unless you know what
+ you are doing.
+ '';
+ };
+
trustedBoot = {
enable = mkOption {
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index b93395300b72..24442ca12a30 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -65,6 +65,7 @@ my $efiSysMountPoint = get("efiSysMountPoint");
my $gfxmodeEfi = get("gfxmodeEfi");
my $gfxmodeBios = get("gfxmodeBios");
my $bootloaderId = get("bootloaderId");
+my $forceInstall = get("forceInstall");
$ENV{'PATH'} = get("path");
die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2;
@@ -531,13 +532,14 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) {
foreach my $dev (@deviceTargets) {
next if $dev eq "nodev";
print STDERR "installing the GRUB $grubVersion boot loader on $dev...\n";
- if ($grubTarget eq "") {
- system("$grub/sbin/grub-install", "--recheck", "--root-directory=$tmpDir", Cwd::abs_path($dev)) == 0
- or die "$0: installation of GRUB on $dev failed\n";
- } else {
- system("$grub/sbin/grub-install", "--recheck", "--root-directory=$tmpDir", "--target=$grubTarget", Cwd::abs_path($dev)) == 0
- or die "$0: installation of GRUB on $dev failed\n";
+ my @command = ("$grub/sbin/grub-install", "--recheck", "--root-directory=$tmpDir", Cwd::abs_path($dev));
+ if ($forceInstall eq "true") {
+ push @command, "--force";
}
+ if ($grubTarget ne "") {
+ push @command, "--target=$grubTarget";
+ }
+ (system @command) == 0 or die "$0: installation of GRUB on $dev failed\n";
}
}
@@ -546,6 +548,9 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) {
if (($requireNewInstall != 0) && ($efiTarget eq "only" || $efiTarget eq "both")) {
print STDERR "installing the GRUB $grubVersion EFI boot loader into $efiSysMountPoint...\n";
my @command = ("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint");
+ if ($forceInstall eq "true") {
+ push @command, "--force";
+ }
if ($canTouchEfiVariables eq "true") {
push @command, "--bootloader-id=$bootloaderId";
} else {
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
index b7400e333e21..eb8ea6130972 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
@@ -33,7 +33,7 @@ in
boot.loader.raspberryPi.version = mkOption {
default = 2;
- type = types.int;
+ type = types.enum [ 1 2 ];
description = ''
'';
};
@@ -44,10 +44,5 @@ in
system.build.installBootLoader = builder;
system.boot.loader.id = "raspberrypi";
system.boot.loader.kernelFile = platform.kernelTarget;
- assertions = [
- { assertion = (cfg.version == 1 || cfg.version == 2);
- message = "loader.raspberryPi.version should be 1 or 2";
- }
- ];
};
}
diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index 60a587af8e9f..d45b1686c1ea 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -51,6 +51,10 @@ in
url = "https://nixos.org/logo/nixos-hires.png";
sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si";
};
+ defaultText = ''pkgs.fetchurl {
+ url = "https://nixos.org/logo/nixos-hires.png";
+ sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si";
+ }'';
description = ''
Logo which is displayed on the splash screen.
'';
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 1faa8abd5f7f..aaa78daeb3a3 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -782,13 +782,12 @@ in
};
type = mkOption {
- type = types.string;
+ type = types.enum [ "managed" "ibss" "monitor" "mesh" "wds" ];
default = "managed";
example = "ibss";
description = ''
- The type of the WLAN interface. The type has to be either managed,
- ibss, monitor, mesh or wds.
- Also, the type has to be supported by the underlying hardware of the device.
+ The type of the WLAN interface.
+ The type has to be supported by the underlying hardware of the device.
'';
};
@@ -799,17 +798,11 @@ in
};
flags = mkOption {
- type = types.nullOr types.string;
+ type = with types; nullOr (enum [ "none" "fcsfail" "control" "otherbss" "cook" "active" ]);
default = null;
example = "control";
description = ''
- Flags for interface of type monitor. The valid flags are:
- none: no special flags
- fcsfail: show frames with FCS errors
- control: show control frames
- otherbss: show frames from other BSSes
- cook: use cooked mode
- active: use active mode (ACK incoming unicast packets)
+ Flags for interface of type monitor.
'';
};
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index aa28a25be7ac..cfc1065b7294 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -129,9 +129,12 @@ let
--setenv HOST_ADDRESS6="$HOST_ADDRESS6" \
--setenv LOCAL_ADDRESS6="$LOCAL_ADDRESS6" \
--setenv PATH="$PATH" \
- ${if cfg.additionalCapabilities != null then
+ ${if cfg.additionalCapabilities != null && cfg.additionalCapabilities != [] then
''--capability="${concatStringsSep " " cfg.additionalCapabilities}"'' else ""
} \
+ ${if cfg.tmpfs != null && cfg.tmpfs != [] then
+ ''--tmpfs=${concatStringsSep " --tmpfs=" cfg.tmpfs}'' else ""
+ } \
${containerInit cfg} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init"
'';
@@ -367,6 +370,7 @@ let
hostAddress6 = null;
localAddress = null;
localAddress6 = null;
+ tmpfs = null;
};
in
@@ -510,6 +514,18 @@ in
'';
};
+ tmpfs = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = [ "/var" ];
+ description = ''
+ Mounts a set of tmpfs file systems into the container.
+ Multiple paths can be specified.
+ Valid items must conform to the --tmpfs argument
+ of systemd-nspawn. See systemd-nspawn(1) for details.
+ '';
+ };
+
} // networkOptions;
config = mkMerge
diff --git a/nixos/modules/virtualisation/grow-partition.nix b/nixos/modules/virtualisation/grow-partition.nix
index abc2e766959e..5039118d78ee 100644
--- a/nixos/modules/virtualisation/grow-partition.nix
+++ b/nixos/modules/virtualisation/grow-partition.nix
@@ -24,7 +24,7 @@ with lib;
copy_bin_and_libs ${pkgs.gnused}/bin/sed
copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk
copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk
- cp -v ${pkgs.cloud-utils}/bin/growpart $out/bin/growpart
+ cp -v ${pkgs.cloud-utils}/bin/.growpart-wrapped $out/bin/growpart
ln -s sed $out/bin/gnused
'';
diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix
index b9a4f3b11dc1..ac5f87817fe9 100644
--- a/nixos/modules/virtualisation/vmware-guest.nix
+++ b/nixos/modules/virtualisation/vmware-guest.nix
@@ -5,6 +5,7 @@ with lib;
let
cfg = config.services.vmwareGuest;
open-vm-tools = pkgs.open-vm-tools;
+ xf86inputvmmouse = pkgs.xorg.xf86inputvmmouse;
in
{
options = {
@@ -29,18 +30,17 @@ in
services.xserver = {
videoDrivers = mkOverride 50 [ "vmware" ];
+ modules = [ xf86inputvmmouse ];
config = ''
- Section "InputDevice"
+ Section "InputClass"
Identifier "VMMouse"
+ MatchDevicePath "/dev/input/event*"
+ MatchProduct "ImPS/2 Generic Wheel Mouse"
Driver "vmmouse"
EndSection
'';
- serverLayoutSection = ''
- InputDevice "VMMouse"
- '';
-
displayManager.sessionCommands = ''
${open-vm-tools}/bin/vmware-user-suid-wrapper
'';
diff --git a/nixos/release.nix b/nixos/release.nix
index 639ee45b38d6..4fd48bc2477f 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -228,6 +228,7 @@ in rec {
tests.containers-imperative = callTest tests/containers-imperative.nix {};
tests.containers-extra_veth = callTest tests/containers-extra_veth.nix {};
tests.containers-physical_interfaces = callTest tests/containers-physical_interfaces.nix {};
+ tests.containers-tmpfs = callTest tests/containers-tmpfs.nix {};
tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; });
tests.dnscrypt-proxy = callTest tests/dnscrypt-proxy.nix { system = "x86_64-linux"; };
tests.ecryptfs = callTest tests/ecryptfs.nix {};
diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix
new file mode 100644
index 000000000000..564831fa2737
--- /dev/null
+++ b/nixos/tests/containers-tmpfs.nix
@@ -0,0 +1,79 @@
+# Test for NixOS' container support.
+
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "containers-bridge";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ ckampka ];
+ };
+
+ machine =
+ { config, pkgs, ... }:
+ { imports = [ ../modules/installer/cd-dvd/channel.nix ];
+ virtualisation.writableStore = true;
+ virtualisation.memorySize = 768;
+
+ containers.tmpfs =
+ {
+ autoStart = true;
+ tmpfs = [
+ # Mount var as a tmpfs
+ "/var"
+
+ # Add a nested mount inside a tmpfs
+ "/var/log"
+
+ # Add a tmpfs on a path that does not exist
+ "/some/random/path"
+ ];
+ config = { };
+ };
+
+ virtualisation.pathsInNixDB = [ pkgs.stdenv ];
+ };
+
+ testScript =
+ ''
+ $machine->waitForUnit("default.target");
+ $machine->succeed("nixos-container list") =~ /tmpfs/ or die;
+
+ # Start the tmpfs container.
+ #$machine->succeed("nixos-container status tmpfs") =~ /up/ or die;
+
+ # Verify that /var is mounted as a tmpfs
+ #$machine->succeed("nixos-container run tmpfs -- systemctl status var.mount --no-pager 2>/dev/null") =~ /What: tmpfs/ or die;
+ $machine->succeed("nixos-container run tmpfs -- mountpoint -q /var 2>/dev/null");
+
+ # Verify that /var/log is mounted as a tmpfs
+ $machine->succeed("nixos-container run tmpfs -- systemctl status var-log.mount --no-pager 2>/dev/null") =~ /What: tmpfs/ or die;
+ $machine->succeed("nixos-container run tmpfs -- mountpoint -q /var/log 2>/dev/null");
+
+ # Verify that /some/random/path is mounted as a tmpfs
+ $machine->succeed("nixos-container run tmpfs -- systemctl status some-random-path.mount --no-pager 2>/dev/null") =~ /What: tmpfs/ or die;
+ $machine->succeed("nixos-container run tmpfs -- mountpoint -q /some/random/path 2>/dev/null");
+
+ # Verify that files created in the container in a non-tmpfs directory are visible on the host.
+ # This establishes legitimacy for the following tests
+ $machine->succeed("nixos-container run tmpfs -- touch /root/test.file 2>/dev/null");
+ $machine->succeed("nixos-container run tmpfs -- ls -l /root | grep -q test.file 2>/dev/null");
+ $machine->succeed("test -e /var/lib/containers/tmpfs/root/test.file");
+
+
+ # Verify that /some/random/path is writable and that files created there
+ # are not in the hosts container dir but in the tmpfs
+ $machine->succeed("nixos-container run tmpfs -- touch /some/random/path/test.file 2>/dev/null");
+ $machine->succeed("nixos-container run tmpfs -- test -e /some/random/path/test.file 2>/dev/null");
+
+ $machine->fail("test -e /var/lib/containers/tmpfs/some/random/path/test.file");
+
+ # Verify that files created in the hosts container dir in a path where a tmpfs file system has been mounted
+ # are not visible to the container as the do not exist in the tmpfs
+ $machine->succeed("touch /var/lib/containers/tmpfs/var/test.file");
+
+ $machine->succeed("test -e /var/lib/containers/tmpfs/var/test.file");
+ $machine->succeed("ls -l /var/lib/containers/tmpfs/var/ | grep -q test.file 2>/dev/null");
+
+ $machine->fail("nixos-container run tmpfs -- ls -l /var | grep -q test.file 2>/dev/null");
+
+ '';
+
+})
diff --git a/pkgs/applications/audio/faust/faust2ladspa.nix b/pkgs/applications/audio/faust/faust2ladspa.nix
new file mode 100644
index 000000000000..67de98cab9a2
--- /dev/null
+++ b/pkgs/applications/audio/faust/faust2ladspa.nix
@@ -0,0 +1,12 @@
+{ boost
+, faust
+, ladspaH
+}:
+
+faust.wrapWithBuildEnv {
+
+ baseName = "faust2ladspa";
+
+ propagatedBuildInputs = [ boost ladspaH ];
+
+}
diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix
index 4cb7668a43f5..50996b71c643 100644
--- a/pkgs/applications/audio/moc/default.nix
+++ b/pkgs/applications/audio/moc/default.nix
@@ -5,16 +5,18 @@
stdenv.mkDerivation rec {
name = "moc-${version}";
- version = "2.5.0";
+ version = "2.5.1";
src = fetchurl {
url = "http://ftp.daper.net/pub/soft/moc/stable/moc-${version}.tar.bz2";
- sha256 = "14b0g9jn12jzxsf292g64dc6frlxv99kaagsasmc8xmg80iab7nj";
+ sha256 = "1wn4za08z64bhsgfhr9c0crfyvy8c3b6a337wx7gz19am5srqh8v";
};
+ nativeBuildInputs = [ pkgconfig ];
+
buildInputs = [
- ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis
- libmpc libsndfile libjack2 db libmodplug timidity libid3tag libtool
+ ncurses alsaLib flac libmad speex ffmpeg libvorbis libmpc libsndfile libjack2
+ db libmodplug timidity libid3tag libtool
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 96b26e6bee1b..03b858c896cc 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "atom-${version}";
- version = "1.12.2";
+ version = "1.12.5";
src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
- sha256 = "03kznbxfxyjq9fqq1jvq3gvvy50dz3wqvn098n9k9gv8x3595mw4";
+ sha256 = "0bxv9j6v77g9sjlg6vjcxjdsgbh10v3c8f0qp5fpzr7dzk7k9w41";
name = "${name}.deb";
};
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 61b4e6617edd..1ad97a0f7649 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -171,12 +171,12 @@ rec {
checkstyle = buildEclipseUpdateSite rec {
name = "checkstyle-${version}";
- version = "6.19.1.201607051943";
+ version = "7.2.0.201611082205";
src = fetchzip {
stripRoot = false;
- url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.19.1/net.sf.eclipsecs-updatesite_${version}.zip";
- sha256 = "03aah57g0cgxym95p1wcj2h69xy3r9c0vv7js3gpmw1hx8w9sjsf";
+ url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/7.2.0/net.sf.eclipsecs-updatesite_${version}.zip";
+ sha256 = "1zngyrh5ckgli0xxm52vm6mzbbvrjslwqcymggfqjhzplpcgwqk1";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
index ef006439a555..6b51f117ad85 100644
--- a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
+++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
@@ -24,12 +24,11 @@ stdenv.mkDerivation rec {
install *.el* $out/share/emacs/site-lisp
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Precision colors for machines and people";
homepage = http://ethanschoonover.com/solarized;
- maintainers = "Samuel Rivas ";
- license = stdenv.lib.licenses.mit;
-
- platforms = stdenv.lib.platforms.all;
+ maintainers = [ maintainers.samuelrivas ];
+ license = licenses.mit;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 1ce86e96c4da..a768ecb7c8a6 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -156,12 +156,12 @@ in
idea-community = buildIdea rec {
name = "idea-community-${version}";
- version = "2016.2.5";
+ version = "2016.3";
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
- sha256 = "0d1pssnrn36fibwsyjh30fsd5hn7qw3nljdnwg40q52skilcdk0v";
+ sha256 = "1bp2a1x8nl5flklf160n7ka5clnb0xx9gwv5zd9li2bsf04zlzf3";
};
wmClass = "jetbrains-idea-ce";
};
@@ -192,12 +192,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
- version = "2016.2.5";
+ version = "2016.3";
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
- sha256 = "0g8v3fw3610gyi25x489vlb72200rgb3b4rwh0igr4w35gwdv91h";
+ sha256 = "1sax3sjhsyvb9qfnn0gc74p3ym6j5f30mmapd4irq9fk4bsl8c31";
};
wmClass = "jetbrains-idea";
};
@@ -288,12 +288,12 @@ in
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
- version = "2016.2.4";
+ version = "2016.3";
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
- sha256 = "1h61l44xnbcdb26q8ylb25sj3rs43nxki203i2jra2i6j5jzxrvg";
+ sha256 = "12jv8x7rq0cpvrbrb2l2x1p7is8511fx6ia79z5v3fnwxf17i3w5";
};
wmClass = "jetbrains-webstorm";
};
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 9fd669551dec..fa6db4e7f02f 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -233,21 +233,20 @@ rec {
};
gimplensfun = pluginDerivation rec {
- name = "gimplensfun-0.1.1";
+ version = "0.2.4";
+ name = "gimplensfun-${version}";
- src = fetchurl {
- url = "http://lensfun.sebastiankraft.net/${name}.tar.gz";
- sha256 = "0kr296n4k7gsjqg1abmvpysxi88iq5wrzdpcg7vm7l1ifvbs972q";
+ src = fetchFromGitHub {
+ owner = "seebk";
+ repo = "GIMP-Lensfun";
+ rev = version;
+ sha256 = "0zlmp9v732qmzj083mnk5z421s57mnckmpjhiw890wmmwzj2lhxz";
};
- patchPhase = '' sed -i Makefile -e's|/usr/bin/g++|g++|' '';
-
buildInputs = [ gimp pkgconfig glib gimp.gtk pkgs.lensfun pkgs.exiv2 ];
installPhase = "
- installPlugins gimplensfun
- mkdir -p $out/bin
- cp gimplensfun $out/bin
+ installPlugins gimp-lensfun
";
meta = {
diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix
index 4b8c7a4fe921..c0a0206ddd1f 100644
--- a/pkgs/applications/graphics/sane/config.nix
+++ b/pkgs/applications/graphics/sane/config.nix
@@ -4,25 +4,26 @@
with stdenv.lib;
let installSanePath = path: ''
- if test -e "${path}/lib/sane"; then
+ if [ -e "${path}/lib/sane" ]; then
find "${path}/lib/sane" -maxdepth 1 -not -type d | while read backend; do
- ln -s $backend $out/lib/sane/$(basename $backend)
+ ln -s "$backend" "$out/lib/sane/$(basename "$backend")"
done
fi
- if test -e "${path}/etc/sane.d"; then
+ if [ -e "${path}/etc/sane.d" ]; then
find "${path}/etc/sane.d" -maxdepth 1 -not -type d | while read conf; do
- if test $(basename $conf) = "dll.conf"; then
- cat $conf >> $out/etc/sane.d/dll.conf
+ name="$(basename $conf)"
+ if [ "$name" = "dll.conf" ] || [ "$name" = "saned.conf" ] || [ "$name" = "net.conf" ]; then
+ cat "$conf" >> "$out/etc/sane.d/$name"
else
- ln -s $conf $out/etc/sane.d/$(basename $conf)
+ ln -s "$conf" "$out/etc/sane.d/$name"
fi
done
fi
- if test -e "${path}/etc/sane.d/dll.d"; then
+ if [ -e "${path}/etc/sane.d/dll.d" ]; then
find "${path}/etc/sane.d/dll.d" -maxdepth 1 -not -type d | while read conf; do
- ln -s $conf $out/etc/sane.d/dll.d/$(basename $conf)
+ ln -s "$conf" "$out/etc/sane.d/dll.d/$(basename $conf)"
done
fi
'';
diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix
index b81efb08d8ac..669fc5a28a73 100644
--- a/pkgs/applications/graphics/xournal/default.nix
+++ b/pkgs/applications/graphics/xournal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, makeDesktopItem
, ghostscript, atk, gtk2, glib, fontconfig, freetype
, libgnomecanvas, libgnomeprint, libgnomeprintui
, pango, libX11, xproto, zlib, poppler
@@ -21,6 +21,32 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = [ "-lX11" "-lz" ];
+ desktopItem = makeDesktopItem {
+ name = name;
+ exec = "xournal";
+ icon = "xournal";
+ desktopName = "Xournal";
+ comment = meta.description;
+ categories = "Office;Graphics;";
+ mimeType = "application/pdf;application/x-xoj";
+ genericName = "PDF Editor";
+ };
+
+ postInstall=''
+ mkdir --parents $out/share/mime/packages
+ cat << EOF > $out/share/mime/packages/xournal.xml
+
+
+ Xournal Document
+
+
+
+ EOF
+ cp --recursive ${desktopItem}/share/applications $out/share
+ mkdir --parents $out/share/icons
+ cp $out/share/xournal/pixmaps/xournal.png $out/share/icons
+ '';
+
meta = {
homepage = http://xournal.sourceforge.net/;
description = "Note-taking application (supposes stylus)";
diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index 96ad943ad57c..812c7ec61145 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala_0_26, gtk3, libgee
+{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee
, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg }:
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "pdfpc";
- version = "4.0.2";
+ version = "4.0.3";
src = fetchFromGitHub {
repo = "pdfpc";
owner = "pdfpc";
rev = "v${version}";
- sha256 = "0151i9msagcqcfaddgd1vkmman0qgqy6s3714sqas568r4r9ngdk";
+ sha256 = "1fcwxvik3nnn0g37xvb30vxaxwrd881fw07fyfb9c6ami9bnva3p";
};
nativeBuildInputs = [ cmake pkgconfig ];
- buildInputs = [ gstreamer gst-plugins-base vala_0_26 gtk3 libgee poppler
- libpthreadstubs makeWrapper librsvg ];
+ buildInputs = [ gstreamer gst-plugins-base vala gtk3 libgee poppler
+ libpthreadstubs makeWrapper librsvg ];
postInstall = ''
wrapProgram $out/bin/pdfpc \
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index d07863df0e0d..cbf602b75dab 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -1,28 +1,30 @@
{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus_glib, expat, gettext
, gsettings_desktop_schemas, gdk_pixbuf, gtk2, gtk3, hicolor_icon_theme
, imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper
-, pkgconfig, python, pythonPackages, vte }:
+, pkgconfig, python, pythonPackages, vte
+, wrapGAppsHook}:
# TODO: Still getting following warning.
# WARNING **: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files
# Seems related to this:
# https://forums.gentoo.org/viewtopic-t-947210-start-0.html
-let version = "2.9.4";
+let version = "3.3.2";
in stdenv.mkDerivation rec {
name = "roxterm-${version}";
src = fetchurl {
- url = "mirror://sourceforge/roxterm/${name}.tar.bz2";
- sha256 = "0djfiwfmnqqp6930kswzr2rss0mh40vglcdybwpxrijcw4n8j21x";
+ url = "mirror://sourceforge/roxterm/${name}.tar.xz";
+ sha256 = "0vjh7k4jm4bd01j88w9bmvq27zqsajjzy131fpi81zkii5lisl1k";
};
+ nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
buildInputs =
[ docbook_xsl expat imagemagick itstool librsvg libtool libxslt
- makeWrapper pkgconfig python pythonPackages.lockfile ];
-
- propagatedBuildInputs =
- [ dbus_libs dbus_glib gdk_pixbuf gettext gsettings_desktop_schemas gtk2 gtk3 hicolor_icon_theme vte ];
+ makeWrapper python pythonPackages.lockfile dbus_libs dbus_glib
+ gdk_pixbuf gsettings_desktop_schemas gtk3
+ hicolor_icon_theme vte ];
NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0"
"-I${dbus_libs.dev}/include/dbus-1.0"
@@ -37,16 +39,12 @@ in stdenv.mkDerivation rec {
# Fix up the LD_LIBRARY_PATH so that expat is on it
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${expat.out}/lib"
- python mscript.py configure --prefix="$out"
+ python mscript.py configure --prefix="$out" --disable-nls --disable-translations
python mscript.py build
'';
installPhase = ''
python mscript.py install
-
- wrapProgram "$out/bin/roxterm" \
- --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
'';
meta = with stdenv.lib; {
@@ -54,10 +52,10 @@ in stdenv.mkDerivation rec {
license = licenses.gpl3;
description = "Tabbed, VTE-based terminal emulator";
longDescription = ''
- Tabbed, VTE-based terminal emulator. Similar to gnome-terminal without the dependencies on Gnome.
+ Tabbed, VTE-based terminal emulator. Similar to gnome-terminal without
+ the dependencies on Gnome.
'';
maintainers = with maintainers; [ cdepillabout ];
platforms = platforms.linux;
- broken = true; # https://github.com/NixOS/nixpkgs/issues/19579
};
}
diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix
new file mode 100644
index 000000000000..7367c8207054
--- /dev/null
+++ b/pkgs/applications/misc/simplenote/default.nix
@@ -0,0 +1,63 @@
+{ fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
+, libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
+, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome3 }:
+
+ stdenv.mkDerivation rec {
+
+ name = "simplenote-${pkgver}";
+ pkgver = "1.0.6";
+
+ src = fetchurl {
+ url = "https://github.com/Automattic/simplenote-electron/releases/download/v${pkgver}/Simplenote-linux-x64.${pkgver}.tar.gz";
+ sha256 = "18wj880iw92yd57w781dqaj7iv9j3bqhyh2cbikqrl4m5w9xkla8";
+ };
+
+ buildCommand = let
+
+ packages = [
+ stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3
+ fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss
+ xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
+ xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
+ xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome3.gconf
+ ];
+
+ libPathNative = lib.makeLibraryPath packages;
+ libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages;
+ libPath = "${libPathNative}:${libPath64}";
+
+ in ''
+ mkdir -p $out/share/
+ mkdir -p $out/bin
+ tar xvzf $src -C $out/share/
+ mv $out/share/Simplenote-linux-x64 $out/share/simplenote
+ mv $out/share/simplenote/Simplenote $out/share/simplenote/simplenote
+ mkdir -p $out/share/applications
+
+ cat > $out/share/applications/simplenote.desktop << EOF
+ [Desktop Entry]
+ Name=Simplenote
+ Comment=Simplenote for Linux
+ Exec=$out/bin/simplenote
+ Icon=$out/share/simplenote/Simplenote.png
+ Type=Application
+ StartupNotify=true
+ Categories=Development;
+ EOF
+
+ fixupPhase
+
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${libPath}:$out/share/simplenote" \
+ $out/share/simplenote/simplenote
+
+ ln -s $out/share/simplenote/simplenote $out/bin/simplenote
+ '';
+
+ meta = with stdenv.lib; {
+ description = "The simplest way to keep notes";
+ homepage = https://github.com/Automattic/simplenote-electron;
+ license = licenses.lgpl2;
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix
index 43b7312cda64..a64ab0ea2ca3 100644
--- a/pkgs/applications/misc/tilda/default.nix
+++ b/pkgs/applications/misc/tilda/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "tilda-${version}";
- version = "1.2.4";
+ version = "1.3.3";
src = fetchurl {
url = "https://github.com/lanoxx/tilda/archive/${name}.tar.gz";
- sha256 = "1f7b52c5d8cfd9038ad2e41fc633fce935f420fa657ed15e3942722c8570751e";
+ sha256 = "1cc4qbg1m3i04lj5p6i6xbd0zvy1320pxdgmjhz5p3j95ibsbfki";
};
buildInputs = [ pkgconfig autoreconfHook gettext confuse vte gtk makeWrapper ];
diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index adc0c3c9fb63..8d157d414f86 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "xterm-325";
+ name = "xterm-327";
src = fetchurl {
url = "ftp://invisible-island.net/xterm/${name}.tgz";
- sha256 = "06sz66z4hvjjkvm3r5a5z442iis8lz8yjfzc629pwhj01ixb0c9v";
+ sha256 = "02qmfr1y24y5vq6kddksw84b8gxalc96n9wwaj7i8hmk6mn2zyv6";
};
buildInputs =
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 9b779ab98928..bad888bff52e 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -94,12 +94,12 @@ let
flash = stdenv.mkDerivation rec {
name = "flashplayer-ppapi-${version}";
- version = "23.0.0.205";
+ version = "23.0.0.207";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
+ "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
- sha256 = "0gj5d8475qcplm3iqs3hkq0i6qkmbhci1zp3ljnhafc6xz0avyhj";
+ sha256 = "1spwv06rynaw45pdll6hzsq6zbz1q10bf7dx4zz25gh8x3sl9l6a";
stripRoot = false;
};
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index a785b8593504..cc34318edf3c 100644
--- a/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/pkgs/applications/networking/browsers/elinks/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, perl, ncurses, xlibsWrapper, bzip2, zlib, openssl
-, spidermonkey, gpm
+, spidermonkey_1_8_5, gpm
, enableGuile ? false, guile ? null # Incompatible licenses, LGPLv3 - GPLv2
, enablePython ? false, python ? null
}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
patches = [ ./gc-init.patch ];
- buildInputs = [ perl ncurses xlibsWrapper bzip2 zlib openssl spidermonkey gpm ]
+ buildInputs = [ perl ncurses xlibsWrapper bzip2 zlib openssl spidermonkey_1_8_5 gpm ]
++ stdenv.lib.optional enableGuile guile
++ stdenv.lib.optional enablePython python;
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
''
--enable-finger --enable-html-highlight
--with-perl --enable-gopher --enable-cgi --enable-bittorrent
- --with-spidermonkey=${spidermonkey}
+ --with-spidermonkey=${spidermonkey_1_8_5}
--enable-nntp --with-openssl=${openssl.dev}
'' + stdenv.lib.optionalString enableGuile " --with-guile"
+ stdenv.lib.optionalString enablePython " --with-python";
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 5c3749f83fa1..e0689206382c 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -70,6 +70,7 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec {
"--enable-jemalloc"
"--disable-gconf"
"--enable-default-toolkit=cairo-gtk2"
+ "--with-google-api-keyfile=ga"
]
++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3"
++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]
@@ -85,6 +86,11 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec {
configureScript="$(realpath ./configure)"
mkdir ../objdir
cd ../objdir
+
+ # Google API key used by Chromium and Firefox.
+ # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
+ # please get your own set of keys.
+ echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" >ga
'';
preInstall =
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index d10e787b6ff5..3c1ae4b2bbde 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -23,11 +23,11 @@
let
# NOTE: When updating, please also update in current stable,
# as older versions stop working
- version = "13.4.21";
+ version = "14.4.19";
sha256 =
{
- "x86_64-linux" = "0ckinjrnnijs2wx80c0bqdlcsw5zhx64rsh3bylcjfbpvyli96q4";
- "i686-linux" = "08lhj4hlhvxm4zp9jai01f8cydfgfkl91l4ydd85yccl9ii4flh5";
+ "x86_64-linux" = "06ln88dx6k1d2b2wwj66gj1gyy0s3xvs7m50v8i2ycdw3d9kimkw";
+ "i686-linux" = "0mil1h86r8fmzxb6d7ycwz9yqkmj66k37zxxb2x8mw15l9qndrwf";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
arch =
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 12a85f5e1db7..d49eaad4d33d 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,21 +1,22 @@
{ stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:
-let version = "3.22.1"; in
+let version = "3.22.2.2"; in
stdenv.mkDerivation {
name = "filezilla-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
- sha256 = "0pr8wj2dk5s5xxrsl0pb8y1bna0k1s3c18dh056c6qp02gba1a1f";
+ sha256 = "1h02k13x88f04gkf433cxx1xvbr7kkl2aygb4i6581gzhzjifwdv";
};
configureFlags = [
"--disable-manualupdatecheck"
];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- dbus gnutls wxGTK30 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite
+ dbus gnutls wxGTK30 libidn tinyxml gettext xdg_utils gtk2 sqlite
pugixml libfilezilla nettle ];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix
index 10cf9874ff1e..946d0dedba0c 100644
--- a/pkgs/applications/networking/ids/bro/default.nix
+++ b/pkgs/applications/networking/ids/bro/default.nix
@@ -1,15 +1,15 @@
{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, perl, zlib, file, curl
-, geoip, gperftools }:
+, geoip, gperftools, python }:
stdenv.mkDerivation rec {
- name = "bro-2.4.1";
+ name = "bro-2.5";
src = fetchurl {
- url = "http://www.bro.org/downloads/release/${name}.tar.gz";
- sha256 = "1xn8qwgnxihlr4lmg7kz2vqjk46aqgwc8878pbv30ih2lmrrdffq";
+ url = "http://www.bro.org/downloads/${name}.tar.gz";
+ sha256 = "10603lwhwsmh08m5rgknbspbhd4lis71qv7z8ixacgv6sf8a40hm";
};
- buildInputs = [ cmake flex bison openssl libpcap perl zlib file curl geoip gperftools ];
+ buildInputs = [ cmake flex bison openssl libpcap perl zlib file curl geoip gperftools python ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index 8d7b16337f28..ef84f6402b52 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
"16l9jma2hiwzl9l41yhrwribcgmxca271rq0cfbbm9701mmmciyy";
};
- phases = [ "unpackPhase" "installPhase" ];
+ phases = [ "unpackPhase" "installPhase" "postFixup" ];
deps = with xorg; [
gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
@@ -53,6 +53,10 @@ in stdenv.mkDerivation rec {
ln -s $out/share/franz/resources/app.asar.unpacked/assets/franz.png $out/share/pixmaps
'';
+ postFixup = ''
+ paxmark m $out/share/franz/Franz
+ '';
+
meta = with stdenv.lib; {
description = "A free messaging app that combines chat & messaging services into one application";
homepage = http://meetfranz.com;
diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix
new file mode 100644
index 000000000000..bbeb6c4aa4a3
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchFromGitHub, ocamlPackages, opam}:
+
+assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2";
+
+stdenv.mkDerivation rec {
+ version = "2016-11-18";
+ name = "jackline-${version}";
+
+ src = fetchFromGitHub {
+ owner = "hannesm";
+ repo = "jackline";
+ rev = "cab34acab004023911997ec9aee8b00a976af7e4";
+ sha256 = "0h7wdsic4v6ys130w61zvxm5s2vc7y574hn7zby12rq88lhhrjh7";
+ };
+
+ buildInputs = with ocamlPackages; [
+ ocaml ocamlbuild findlib topkg ppx_sexp_conv
+ erm_xmpp_0_3 tls nocrypto x509 ocaml_lwt otr astring
+ ptime notty sexplib_p4 hex uutf opam
+ ];
+
+ buildPhase = with ocamlPackages;
+ "ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build --pinned true";
+
+ installPhase = "opam-installer --prefix=$out --script | sh";
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/hannesm/jackline;
+ description = "Terminal-based XMPP client in OCaml";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ sternenseemann ];
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
index 533c0ba48ba7..f68b8306fc84 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "pidgin-skypeweb-${version}";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchFromGitHub {
owner = "EionRobb";
repo = "skype4pidgin";
rev = "${version}";
- sha256 = "0qmqf1r9kc7r6rgzz0byyq7yf5spsl2iima0cvxafs43gn4hnc2z";
+ sha256 = "1lxpz316jmns6i143v4j6sd6k0a4a54alw08rvwjckf2rig57lj2";
};
sourceRoot = "skype4pidgin-${version}-src/skypeweb";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
index 1a036c3083b2..4b68d603f211 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/lib/pidgin/
- cp bin/*.so $out/lib/pidgin/
+ cp bin/*.so $out/lib/pidgin/ #*/
cp tg-server.tglpub $out/lib/pidgin/server.tglpub
mkdir -p $out/pixmaps/pidgin/protocols/{16,22,48}
cp imgs/telegram16.png $out/pixmaps/pidgin/protocols/16
@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
cp imgs/telegram48.png $out/pixmaps/pidgin/protocols/48
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = https://github.com/majn/telegram-purple;
description = "Telegram for Pidgin / libpurple";
- license = stdenv.lib.licenses.gpl2;
- maintainers = stdenv.lib.maintainers.jagajaga;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.jagajaga ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index e1cfb2fceddb..e0b86dfc6331 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -6,7 +6,7 @@ let
bits = if stdenv.system == "x86_64-linux" then "x64"
else "ia32";
- version = "0.4.4";
+ version = "0.4.5";
myIcon = fetchurl {
url = "https://raw.githubusercontent.com/saenzramiro/rambox/9e4444e6297dd35743b79fe23f8d451a104028d5/resources/Icon.png";
@@ -26,11 +26,11 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox-${version}-${bits}.tar.gz";
sha256 = if bits == "x64" then
- "05xwabwij7fyifrypahcplymz46k01rzrwgp5gn79hh023w259i0" else
- "16j17rc8mld96mq1rxnwmxwfa2q5b44s40c56mwh34plqyn546l2";
+ "0z2rmfiwhb6v2hkzgrbkd4nhdvm1rssh0mbfbdmdwxq91qzp6558" else
+ "0gq0ywk1jr0apl39dnm0vwdwg1inr7fari3cmfz3fvaym7gc8fki";
};
- phases = [ "unpackPhase" "installPhase" ];
+ phases = [ "unpackPhase" "installPhase" "postFixup" ];
deps = with xorg; [
gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
@@ -53,6 +53,10 @@ in stdenv.mkDerivation rec {
ln -s ${desktopItem}/share/applications/* $out/share/applications
'';
+ postFixup = ''
+ paxmark m $out/share/rambox/Rambox
+ '';
+
meta = with stdenv.lib; {
description = "Free and Open Source messaging and emailing app that combines common web applications into one";
homepage = http://rambox.pro;
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
index f95d3f0490aa..73e8ab83f725 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper }:
let
- version = "3.0.12.4";
+ version = "3.0.13.5";
arch = if stdenv.is64bit then "amd64" else "x86";
libDir = if stdenv.is64bit then "lib64" else "lib";
in
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
"http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"
];
sha256 = if stdenv.is64bit
- then "1n8vgbgnfbllfvsl82ai6smv6hl32a3nd071j2dp79agjz4fic3b"
- else "19vkcgb0h71amixry8r72qqwaxwplzyz9nrxg5bdjjg8r2mkh4bc";
+ then "bd5933dd17d17f93d56f69332927cd1ce6f34439ec464a0ce2ca73102d85080c"
+ else "848e1a44af3c2b00840a280ba558a13407f4844432ddfd262ee8a7800365386b";
};
buildInputs = [ makeWrapper ];
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
meta = {
description = "TeamSpeak voice communication server";
- homepage = http://teamspeak.com/;
+ homepage = https://teamspeak.com/;
license = stdenv.lib.licenses.unfreeRedistributable;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.arobyn ];
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
index ffc29a52aa1f..b1880be6562b 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pidgin, telepathy_glib, glib, dbus_glib, pkgconfig, libxslt }:
+{ stdenv, fetchurl, fetchpatch, pidgin, telepathy_glib, glib, dbus_glib, pkgconfig, libxslt }:
stdenv.mkDerivation rec {
pname = "telepathy-haze";
@@ -13,6 +13,15 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig libxslt ];
+ patches = [
+ # Patch from Gentoo that helps telepathy-haze build with more
+ # recent versions of pidgin.
+ (fetchpatch {
+ url = https://raw.githubusercontent.com/gentoo/gentoo/master/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch;
+ sha256 = "0fa1p4n1559qd096w7ya4kvfnc1c98ykarkxzlpkwvzbczwzng3c";
+ })
+ ];
+
meta = {
description = "A Telepathy connection manager based on libpurple";
platforms = stdenv.lib.platforms.gnu; # Random choice
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index f8509a46248d..967ae7914e91 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -4,123 +4,123 @@
# ruby generate_sources.rb 45.1.1 > sources.nix
{
- version = "45.4.0";
+ version = "45.5.0";
sources = [
- { locale = "ar"; arch = "linux-i686"; sha512 = "8db134f67ea813c12d97b0a44fb6169f42b45b8f9e7e151cb6389ee6628e301c95b5ca7492ec5c803cd44225b1929539e81c4df840bb533ef12740c4b9b82f28"; }
- { locale = "ar"; arch = "linux-x86_64"; sha512 = "b3da97b15b71aa536d0acdf08e9e980ddd1917113579db8c9058068bd104b3029c721bf1bac1c9ed56c39540bdb7fd667605259b1c2a8d910401259d2cb0e3e5"; }
- { locale = "ast"; arch = "linux-i686"; sha512 = "2e83efd53b191d7bee999fa45f09583c818377443b9bbf3203b7f11a31b67d371e34980267cc509c47a57b4a6540b1f7f4293252f02138b24869c29bfc64423d"; }
- { locale = "ast"; arch = "linux-x86_64"; sha512 = "9d9ef1a1bcbb32cf04e26ad499bf1f8122b3b1a964e6c4eb6726d2271fba28c78f0d7bc60641d8cc6c2a0e1153a25483a6f8eb12568128045f7d6cf5ed6746d3"; }
- { locale = "be"; arch = "linux-i686"; sha512 = "21cf44b0eb90d3662ef690c56a393bd4453809631209c8953156a1b59b6011fce407c4b3d54d956e5c376f36dac663cd874b4c917f41b9132e445968fd7bc439"; }
- { locale = "be"; arch = "linux-x86_64"; sha512 = "ce33a0750430a462aa07ad8995656dbf2689077746de8ee42ec361c544ccd53e182192f95f6ac755ee739035b5f2a2c8233ac1c37c0d156c4a2aabb39806039d"; }
- { locale = "bg"; arch = "linux-i686"; sha512 = "fe763ecd1a572ed6e3864aa9d934b821fae2f91f02d959e22e96314e26271a9f5695930a0388fadd6bd34e0f7ab6938a48bfd346901e139128e0e24483c36d90"; }
- { locale = "bg"; arch = "linux-x86_64"; sha512 = "935bc0f19a45314341f76cb53dc4c617a5104a0a17c56f60679974eaec9fc8d9ee609d543a5a310bf4d1e8db6cdc54b660db5b2b85af7838dc5711e10ecff77c"; }
- { locale = "bn-BD"; arch = "linux-i686"; sha512 = "d9bdc81c10d1ef370275d3f152669ca50a7fb2b126cdd396d63aa8b7c97a46d815b1fa77b8135887b0f6c825ba87617c81e1f3698e455d75b2bc9862e47fe761"; }
- { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "0b420e4168df1a0b7ff8e4983892de9b08cf644a6e7b28c090477b3efe557a7a34a17ac90a722b497298759d98c1a3346ff84789598359e4052a35b44b3bbba2"; }
- { locale = "br"; arch = "linux-i686"; sha512 = "5e0726512ff28ee00498a4a8493d4f00e8375950fe8489c3e5906b37bf057c76eca66ccea8aaf7e165ca56b02ed14041efcab8b75170ae4daa2b2df2bf2ddc8f"; }
- { locale = "br"; arch = "linux-x86_64"; sha512 = "1240f62d8a0530ead4b19983a36bdd894b5f812c82b68c49a4f7d9a961e0ff2542244ef405e03bb281ec65f070e815246487347a99bec76dd3509ec4512c1d47"; }
- { locale = "ca"; arch = "linux-i686"; sha512 = "ce79eebfe0a93a9e15237317fa3dcca6fd6f20c90adf431366e5d30ce026da0f4af4e1be0745cfa6620b2a75838fbed93a85ed0695c486eb46b58cfb3cea3571"; }
- { locale = "ca"; arch = "linux-x86_64"; sha512 = "f290ac184b7086349a173b1597341731b6c696c8806b3b5adb8e7f0121f298ae9971f8f96981662bac72079f03d7d2ce17f0c385662d06657a1519d7bf32ef64"; }
- { locale = "cs"; arch = "linux-i686"; sha512 = "a06b8a0db00b35ba16541a72623fc764c87c45e15e69079b757449e9c67988764f65bf6ae214ac4a0c0c541549fb6fb48bd1dbb2efe02541e3bda12938e2d787"; }
- { locale = "cs"; arch = "linux-x86_64"; sha512 = "b96dca42026adb793ab5d37544d42ff8d5668adbff6a94f6c37a33ea63eb87622a7eeee8c02976b16c1d8c38b3348387aa46daa2bf5ccfd66f2a176ba4c113ff"; }
- { locale = "cy"; arch = "linux-i686"; sha512 = "dee0395f80b3e0db7b6cedf3d7e22b574f3f2734da518db684ab8ddfb502a127d2e0c75849819638ea61fd8604b84f8b1118c036d8ffd5f444ebd8adce19fa2e"; }
- { locale = "cy"; arch = "linux-x86_64"; sha512 = "8162ba8abda1906ce0fa78455faf823ce4bf6eaab9ecafa50b5669f2485861f59fe2be3820d75d7f168432ede5e9ced170928e883ebd06f8ab3145065f31e610"; }
- { locale = "da"; arch = "linux-i686"; sha512 = "f5bee461d1e0ba0ffc1de1fee05d41d0aa9db904061a7e4947d2a22ce8e3eb9ab40e15ace81a9cb248f72b5c08b699b39b46031f5673045eefe2e3346e7ae18a"; }
- { locale = "da"; arch = "linux-x86_64"; sha512 = "dab187762c44a7092136d5b12be43bb3675c37dbaa1ffb36171e9cc76ffd94fd0f80872008bd686515f0a84c3adc9c36d5eff9240e871dff457145bc21981777"; }
- { locale = "de"; arch = "linux-i686"; sha512 = "35994979446f4bcf5a6b79875e84999188d8ee58143b741e583302b29c0619566b5d4d65e640156168974e4c59c7d454ffeac47a8aaf35c344bcf2ec44520334"; }
- { locale = "de"; arch = "linux-x86_64"; sha512 = "ae7169f84c945cd7886ef0ee84a1e57cb3017ad89b991c0f8dfb36d5537c2d9253345e111916a234c228a99e153c9d8c2f5bbb61e3d4d5fcbe95f507d863b735"; }
- { locale = "dsb"; arch = "linux-i686"; sha512 = "1b10d6c4da26452c89089c2938db3559cc46c098baf917ebbcfc1d107bd9591630749aeae87a5b9e8819ebb5e4ad2b7d5321531bbdc3045df604e3929d2d6d93"; }
- { locale = "dsb"; arch = "linux-x86_64"; sha512 = "c6195bdf00e05921a19eb37a74c34794cb08d8b8cd43609eed9f64bbe89788d9c87a45df449cc400e6cee31b7ac6f02ce57083581c85885acd620931c657a833"; }
- { locale = "el"; arch = "linux-i686"; sha512 = "e7d7f38fecea77d93bb99656a6dd566c6f396e108910152917cd1c908f09d1f276385ed771d5500feac572356e688e43ab3a91651d64bd7d522db9daaa4f32ef"; }
- { locale = "el"; arch = "linux-x86_64"; sha512 = "bec617a64ce06f7aacfd936cb85f29684d1afc4246c05f1de6bf1e11819a44eec0e395a446e64676fe6453ce41f173f938a845fb50a625e3f5bb325098e09d11"; }
- { locale = "en-GB"; arch = "linux-i686"; sha512 = "c06fcb56eafbe894e15a0380f49ce5455c95b2b6c9520ef3b15f699778a575e5c643db5797e72441a68e063bce0bd4c0003cd0b58c78c7d1a744223598ab3549"; }
- { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "1b095d5e254c2eef894b9954f42031b6e7eedbf0c753ac3e9f7b51b152dfb9c21d90ace238fe5bd58c63292587e477d23121dd0f96f7489b7564ae1bca27eef7"; }
- { locale = "en-US"; arch = "linux-i686"; sha512 = "7561111abeda21de3c4c9f585528ea9fc76409b15c0679b22743180f3b987aefac19ff45a682519511e347b0881e0f924f4efe35a782ceb4da9c6af05132fb78"; }
- { locale = "en-US"; arch = "linux-x86_64"; sha512 = "2beacec69acea8bdc98b5a7df5111318c6b47bbe1bb4356d3f9a2ce3b783ce6fad01a3ef11658c9d24d89e5c3f3e5c71de6b6623e93187d1221c25d415dac3c4"; }
- { locale = "es-AR"; arch = "linux-i686"; sha512 = "c6d1fc35bb89ed23b5f4e3be2fa6c28c3e29a7e821be1ae79345bb26a6db1ecae67b27f7ac9d3bd5bd803b6c7613aba3f0ad35cb07b607c1030f84a365da2b2c"; }
- { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "e3c95879782c17963e9f17dfde11a416502bb89d5c712ae445bd476e1bc1fb76bb0716764150b2b1f92ab8487d736c39f29ceb023f226b92f8c07bfb7da8e76e"; }
- { locale = "es-ES"; arch = "linux-i686"; sha512 = "3f8f3263650fd4722da121566cd9afe8e671005eafee26f550a940dd76b1ed02c3f34f32f886c2cb2e2b1ed029f9997f2686a2494f4b24b6f32a7bcb8226f6aa"; }
- { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "587ca874ed5e035291099db107cf29f19562c0adb785c33ad92bab9d5eac2f2615143b5587bf7da7df61c071995eaf7894e5733d2fb311ffa14671c14aed54d3"; }
- { locale = "et"; arch = "linux-i686"; sha512 = "a08b99a3e444135d538f3b53669a2f4e900f86406e74076a2ca986c7d9bf55661aac248fa564eda3b6bd491cd284690da9c61a56a43f2884167998a10b666785"; }
- { locale = "et"; arch = "linux-x86_64"; sha512 = "97043053f1512e6ac7298208e219bd2cd8dd1abd403ecbae90e365aa69b098becdef3f6cec9998fc71b237d78e3b7693fa93cf9452317bf1f4793425f23c0b5d"; }
- { locale = "eu"; arch = "linux-i686"; sha512 = "2de3d5915801e62196339e6acaa7f601740212a59f4ec6c684cb40c830bc6fdab843b3497a168bc6b2889f80449900406c05cabb3ba656d7d6b0be5750a31aab"; }
- { locale = "eu"; arch = "linux-x86_64"; sha512 = "834f9e712183f14af927ccb719325dad1a7f778d7d3beeec87cbb559d039b8764efb9447b8a0e40eb0ad55c88b525e5bbc2e2f5729c11b173ef86f63e4f92974"; }
- { locale = "fi"; arch = "linux-i686"; sha512 = "b8b1c42b3ab0a365c9a478fea0e83ac49b709dd2d117c1d8ed6fd7946b5dd32a1d3907b653c5aa0fada4ba8cc365ee9fc723fbbed76219a7c5d4b70eb68dbf65"; }
- { locale = "fi"; arch = "linux-x86_64"; sha512 = "64b5bc313fa64abc56961b0c6abdcc6fa72cd321f422857fece9bfb3673747d5992d96dc9d98a76c71148b6261ea9a750147c94f171c548170c0681d597d8402"; }
- { locale = "fr"; arch = "linux-i686"; sha512 = "45e7a37ac6c18d31e834b88789d6039bed489bc1cb4601399b3cf76feef52c3c36249e297750d39e3e3071c2d90a1ff6f0bcfef8bec89997ac552cceff88e78f"; }
- { locale = "fr"; arch = "linux-x86_64"; sha512 = "02a31ae95b6a6dac76eabd8e1de27ff50f29725be221841a738f60e41306d39ea050b73f78105561344d042ed988955e1801b5379bcecadccc89481c3bfcc13e"; }
- { locale = "fy-NL"; arch = "linux-i686"; sha512 = "bc14d4d16f0b196eaf92d551df6b565bfdf56806dc97714e97db7fd201c6e4e80df0485f77ff4bc5218b8c2f96a01a39f87c6c3e156c5c0cd72a8b932248370e"; }
- { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "025411d23fae36123a86b72818b486412aad0f532631e4c48da5dea9b41d7b2875aba463a4a721e422cc4b141c8cce155dab01fd7056dfbadd435cd3e3061f08"; }
- { locale = "ga-IE"; arch = "linux-i686"; sha512 = "56d20e9bd013dea41f8686f7ab4da48b1c96e0d93c7639e990daf174cf7c9313ab659eb9256f8ee52adc9659d6ce766921eab1a24a0f963a8a8dc1d614ed34e9"; }
- { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "1bd36aababa4fa8e47bb62d9a49b2a5303b5b0404f5ea370fd4b6b152327766a42bc6c15a85c693aaf532b9c3aa8598911e313a861d3eb946bb4ac8d0642de6f"; }
- { locale = "gd"; arch = "linux-i686"; sha512 = "bc0f98937cb2c2ef98ebf6625179f77d36d12f6c95eb413cd570f4b3a9fbe733888b57ef946fcde2daf59183291a8bd1258e8c7f80b260e6af3138c8b83117f9"; }
- { locale = "gd"; arch = "linux-x86_64"; sha512 = "d2729fddbd4db455b1f2b738d9bbd6d155db664c01ba6617128728caffe8f96aada8b02d49fb1b90695c4bf37db6960f51d6c074b5df94ab4e74996370679d2a"; }
- { locale = "gl"; arch = "linux-i686"; sha512 = "6306be1026b9127e455a3b0c720f7de495811c3bfb578090ee33d8b4200bec3390c006767d45ce165b57325f1c41e98ce078cf78bdf0a2e9d0bf5fd704cf8374"; }
- { locale = "gl"; arch = "linux-x86_64"; sha512 = "cb977c4f60041ccba81ae9708b381d8e073c2041104549973f33695d6f08663d23fc9dccc112d6fd9e4c61847211ecd2b762b81d842853ff80a7b813955295c9"; }
- { locale = "he"; arch = "linux-i686"; sha512 = "e39c70ed7711a4c7c5baf0594917e2727bf0d081f9d38d2f0d539e557fa9c20e639c3e98ef8926cdc9f57ffee2c4b8896b044bd1fe9aeca39e64af2b56e35dfd"; }
- { locale = "he"; arch = "linux-x86_64"; sha512 = "86ad9d155916dbf7318fe054286b8808bd6072735b6264db61d51745abaa975311776d9a15da13b9f6c536e78714501f1855291bcf59b49cebc047da112fcc91"; }
- { locale = "hr"; arch = "linux-i686"; sha512 = "e82a125725373a5fcadb4ad010809fd307f5caea4bbdb428cce3c267da197bc73355f655397283fc6bf93838ce41896b7d6dd1174fc56526a04b61559babf42d"; }
- { locale = "hr"; arch = "linux-x86_64"; sha512 = "ba8928e57b1eeeaa2b1e1b95ef87908247695b09d3f7220113820cc13a07223088a1c0468e362488b303a60456e2d63c631150025715d3a4b66b6a6204e31c9b"; }
- { locale = "hsb"; arch = "linux-i686"; sha512 = "276a97640f24aade9d0658529e13d4e50b70bd5e98d30c43d7af6e0cdb368d3a54ed9365aea9cc03bef6938bb3c7dc0649ca09543278538fea5dc24a15ab5072"; }
- { locale = "hsb"; arch = "linux-x86_64"; sha512 = "ab527b02bc792b2fe2a939a82b5ef4797f7ae94144a5161e11722d46d38da75203139faa85655248e4aba12090d79a46a0db0310b32ec0db02c4e68e932f0d2f"; }
- { locale = "hu"; arch = "linux-i686"; sha512 = "34e1f7e790deb7d4594f2edcf6ba1641730bdb6ceb72fb08071daed02713de8ff6931e3986fb3125646ecb3d2f299e5bf5028fc0425ac9790d57d4aace9e81f0"; }
- { locale = "hu"; arch = "linux-x86_64"; sha512 = "e7df1f64c41110d56959237555ff3a066b8d503f28c6d504c7080f3af2548d5ee66a60771872065222db57624b40d1a647aa278f89c04fa3c520730147227c83"; }
- { locale = "hy-AM"; arch = "linux-i686"; sha512 = "356ac76891199061fd4698c51903ddc7e92858252a6ca502543b0403790b9b80ba8799e847a00331f19b6ab56d2e3d02fac79ec7b5502ed8227c5abd82ad3fc3"; }
- { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "410ca6dbd22d870ec4d74e0dc19b65009d860e93b905dc43ae0d5086f83ad1dbae81d2213b0f39afbd5e428287d0f35e5c7b923df594494e66fcf08d4663cf82"; }
- { locale = "id"; arch = "linux-i686"; sha512 = "ddab3b64afba2862a18879845cea3945fd3a34295ab07e5c7f53435ef8af005fdaa3beb5fedbee27818917a320fa5e1d1cdc618ac1767db9ceb1bf3c912720b0"; }
- { locale = "id"; arch = "linux-x86_64"; sha512 = "4b26928f579b56c965992b4425a9af6d85fd7a288d699942448ff8f331833e53625f0d48e62794356ed7056ce75d0efa3fcce3f3be9acee099060b4c5a20e281"; }
- { locale = "is"; arch = "linux-i686"; sha512 = "8ad9065d628cddc34fad8afb5477edc2ecbac7add4162c87e6790bbee58e8d40e40b087f879fd09a44f180b30e3929bcfe2ed268fe5bd549c0d5c011be7d974a"; }
- { locale = "is"; arch = "linux-x86_64"; sha512 = "f2a14977d98e0e7575dbe1f3f068472bb90d25a9c333ed191ee17fbf647b1c47143136ef7fc1871bcdbf3b55c2d414a05a119a7a2337b9cd05f039d74915c727"; }
- { locale = "it"; arch = "linux-i686"; sha512 = "18a3951092f38dded053b25658da79188aff3a3dd6e008f269b0b4c32151f7d2d2483932145ccc50c6c9d199af94b43abde65b61e8b1093d9b4c52692382d8ca"; }
- { locale = "it"; arch = "linux-x86_64"; sha512 = "f834a9ba6f6cc2745d4e54eb73ef174e913009e82e989d1386e8598f9f83c32fa65de6902de641b62ebbf183a25f0037d119bb61884f3548d8f425fa63c9f5d0"; }
- { locale = "ja"; arch = "linux-i686"; sha512 = "f91904e585e30ac18e4065046ec184607705bce423ea79aadbecf32fa0f9f598a439ae8f955e79389c411f0836dd6bcf9a74e1e78cb70471a3c523a807e43c41"; }
- { locale = "ja"; arch = "linux-x86_64"; sha512 = "3052946955110d0f1df66df9933079bbe0b0247f9eef0a07c02c43f6463055bcde33e27b7ec1beb511e70f3b524d55ab404a0be755599f9e15f1902b4eb457c4"; }
- { locale = "ko"; arch = "linux-i686"; sha512 = "e0f79d30960bff54ee064ae381dd89b877c2f5055424eaf017382f6b2d1d0b34544cf3d88fefce8f2e294e84477e5109a17fca83083b0c5602ea5d0eec7b9c0c"; }
- { locale = "ko"; arch = "linux-x86_64"; sha512 = "ce515c74e7d69394f79ff7adf6ffe2118b0dc76f49672f19cbc299b21705ba18a88c6780f88bf28bcbf208ad33914da13031617a20494160d771ec09c10a798d"; }
- { locale = "lt"; arch = "linux-i686"; sha512 = "f9d00ec17abd13d575d651caad02e1a46adef760ca6b706df31708375b7c721f3cfd1d99964cc2e16615f5fc422855dba8fa722d57b355782dba1541cf32e1e1"; }
- { locale = "lt"; arch = "linux-x86_64"; sha512 = "2572ee32695dd0abf10a486453a3ca9d7fc26e88993a374677fb5f96edb319a5ba2892d8f9a236195ecd8199a7936d3969830571411ea35a8dc1f229089595e2"; }
- { locale = "nb-NO"; arch = "linux-i686"; sha512 = "26db6cf82400b4a1bff5747d4e301c46f3391b97e28b64716e2b2dcfb2ab2da583142b487f90fe0798bee3cdf49d5965b9d9b124e95f1d65b32c9f84c42a7ebc"; }
- { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "9b83eed9b3e93a5ddf463aa631bb4905abb8e02574e1be8a4cc9fe5cea7f3aee743b0f570a748fba67adbf6096a8443378ddfeedaa9cb0aa8f072dadf906929d"; }
- { locale = "nl"; arch = "linux-i686"; sha512 = "ff00b25886df3a9ff0eb9c4c9a1b34be21edc69ac20f0d994b9dd9b0618037c92c15ead664b071d09766a0e764acb5e118185dc3f08c42f2cca62c4c70fc8ffe"; }
- { locale = "nl"; arch = "linux-x86_64"; sha512 = "6796f4f3d1525a3b617c99eacec76c1cdc5c8fcadc39120d1da052518cb663093c695060b37120ea6337e21b9fcc20c5a5119878ba1068553772f2d8ed89db32"; }
- { locale = "nn-NO"; arch = "linux-i686"; sha512 = "ab236204028e79bb98e78b2900b434f1237e407e864d346fae975d123fa87e727710e41e19625b6c69548497cd9d7716467dc01002e4ff6025301a141125c723"; }
- { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "0544c952ae8fddf43b784bab00aa9d4fd05566e06b9df15990ea91cc65aace6066855a8bdc3f6e6eb01e2a7030a49df67962de4af8d9d84d003cb2553af71006"; }
- { locale = "pa-IN"; arch = "linux-i686"; sha512 = "618d3e621bed807521f4b933a44e8e87b38b2843a5f85f59a83a60a3df6e13a96d1b3c250a9d77200b03be69116cbdeb33c7e2e2b4d02b8672ab90f0e303dfe3"; }
- { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "226844283b3aa5dd4f224a85101529099c8fde81aed5d354b685953019b27d445ac3347f642ea93145be4dce328c4f1711e0bd21bd9f5a2b97e6b822130546cd"; }
- { locale = "pl"; arch = "linux-i686"; sha512 = "4ba51ed645292165343bd104dc36ba0126435fdc06764e587379ed4de6a89a9f7711890f5f12f6176851ffcfbcd267cc1927b6e8c2a710d505cb3bbc7120209c"; }
- { locale = "pl"; arch = "linux-x86_64"; sha512 = "2702db95f2e166dd5097ae7c2c83fea39f666a0a9e811e7876042e6b5ee0dcad6061fb6b6950a2f8fd8f97c434476155b8e2a306e1fee5cc54100e2d2ec7d619"; }
- { locale = "pt-BR"; arch = "linux-i686"; sha512 = "ec7bb46f323030f180bb7e83b40e421a245ca4a1aec5f548a2bde1796db00fec415889cca836394b172b1923638e61eba4b71f56bf8aaa55b902deaa7f57842e"; }
- { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "48406e53ba5276f3721cc5a9af825aa48215862134addefdb136ccc013dc63ca664baa820c2f34f4dd02e79e747bcd4ab73b59ab71773f05c5fede7bfc005745"; }
- { locale = "pt-PT"; arch = "linux-i686"; sha512 = "27f8bfc56044d000c8c43c759c16c3eb891a0d3b6aa4d62a18477a3dd816f0b67e899a1ec375376ee83fa97d0d2d836fcb5b1eb3407b09b194600206072d6c49"; }
- { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "7fa5298de1e5128b4895491d99ab5222f23c1e36e2f07582b6e970de95f45b6ae89a8e4a03b394d0910129ca16be593a47217124b1619ec567ec9d470fe78100"; }
- { locale = "rm"; arch = "linux-i686"; sha512 = "2e25f6ed8e9c92a888c9b2fc0105d5912a9b85fe438c8889728d5522aebf23e86655af2066046e9ed0ea232a59d19b4affe73fa14d4e15af7cb337fef4438b49"; }
- { locale = "rm"; arch = "linux-x86_64"; sha512 = "c2adc7519b2a6670e7c0e7190c6788a5c5c8882b86bbd58c3472de51e958a22126c575413b6a604eca737d120b1da1863f35702f65220bb0e7f81e4deaa21587"; }
- { locale = "ro"; arch = "linux-i686"; sha512 = "ac7c8df9f06cf03c4b91e22668697bc74fff7dfa2edbf6873786e98acd5bf79535d8ad9a913811ed3567cb7e4427a8b3751a7adb011bd0567e433064e712be43"; }
- { locale = "ro"; arch = "linux-x86_64"; sha512 = "f4f80a8b25410b2a48c95dad316fc98b9f5391f08d3df699628b4bf9e343d00ded9cd1ff71b0d5e441ffe6c6a2edae29790a93b5e2117d7343a537d6cbd0738b"; }
- { locale = "ru"; arch = "linux-i686"; sha512 = "73009743b635761c1ac5d588837084cfb7041f639fc81646d2b6ad7bd92be5d7f742562c8c5522248f20dbca7fd430826617ae706821f107911303d416cb5f4c"; }
- { locale = "ru"; arch = "linux-x86_64"; sha512 = "cd2dbc81d761077f4fcff759dcb2ff02ae0e61b0b91007e7514081926e9f3cb2bcd2e65fc3ca44ad5d07caa4e4bd9e450feb25bc184f8c136ea3aa6cc4d05968"; }
- { locale = "si"; arch = "linux-i686"; sha512 = "d5a416aff2e5fd3b294d8028ee6008c9086b9c5fdb15b52b8810e9e623865b946d46e1b812849ecd7331923f7e7ba01711a909396c8676db917b2a36f7370504"; }
- { locale = "si"; arch = "linux-x86_64"; sha512 = "8284411d705c804fb0e90f7358e79e0687ef892342ed06c2030803d07b1a901e7f1a6ac2acb375eac10566b1885826c4fa187d3517a2bea35222bd2604d3992a"; }
- { locale = "sk"; arch = "linux-i686"; sha512 = "c905adaeca4c3daa57cd54d9a7ce49762e4ab4d32594dffcbf5b9d581409a9f7a0eea1abb51ffa94c35433d20cfd0be3baa914d9821e8f754cdcdb80de7a82fc"; }
- { locale = "sk"; arch = "linux-x86_64"; sha512 = "2741ea21d5714836116595529f4e240accf95ae1e549ac4cb083669beb20d40e7fdeb7805a836ada5d4310e31d74c8bebb1cb5c8f48b3fa585edfd880109b2a1"; }
- { locale = "sl"; arch = "linux-i686"; sha512 = "b61cb4971cfd9701dc8aad80848e41bdd399a53fc3282d72e7a866b782cebce928bbc163d2557c24dd0fa3f51f2d2cc40e27fc578d39392d00c15ad08d0df3ad"; }
- { locale = "sl"; arch = "linux-x86_64"; sha512 = "47491dfb70268c3ef00d4599e487fc2af35277de2746a106f59eb1b0813a4201c1e3ff735b0d7b48ea23bf3aac18fa1bb8e0c7948651e421f2677b988633e3ca"; }
- { locale = "sq"; arch = "linux-i686"; sha512 = "7773088708cc1ca1c115acaafc2d1456b854a413daf9622c2d267dc33e8a4727b6836743c9cfaf8c5694c729241e317a53b8411e37b8d4f94b67bc02c2878e41"; }
- { locale = "sq"; arch = "linux-x86_64"; sha512 = "db776cedad7842e02a87347e2f97aa5e583e2d1e2859659032e338b5c855f24241a4a1950fdb3a13b6dec643a73a7cb5f7e527ecdf50deafa5138c9f273d3408"; }
- { locale = "sr"; arch = "linux-i686"; sha512 = "e9eb4827e12db0173643bab8ffca55d50238a1184a2e2ae3543248400f39685b999a068ddab523e429c2667f2966e4a0a09c432837f5e852065459cda67e96b4"; }
- { locale = "sr"; arch = "linux-x86_64"; sha512 = "a38c5f80c0e6a442d035f7b4c18a350421948e9246ac65389959978cfe51f317644c06ecc567bb09739bee0303e4e2b8920bc7903900eabe92ad244e20370345"; }
- { locale = "sv-SE"; arch = "linux-i686"; sha512 = "d7692def00b3a47e86fc01ad192a610352a6c958e53d1b2e4ac6d27a017643e2c0e9887a173268278b9ee7d2e3116368a8dde4d2fce6ea9b56a2bb3963a31ba7"; }
- { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "4656a0d46d358476fcba3be275740a289d79159fa346f4903cac0830341f9a630f1eb0c007d8429cde47821c441d01e792634d32d6e7b94f1bb2c94f18a56563"; }
- { locale = "ta-LK"; arch = "linux-i686"; sha512 = "d6ed8ef83f1d4af62a5c2f92c791822d1b711ed4a51d9656c0e73dbe20510efe017f615537c892b43e43a5503ace92652faa5fa5f2d9956349386fe784fe0dc5"; }
- { locale = "ta-LK"; arch = "linux-x86_64"; sha512 = "7a994549f4f8c33b185d094e5d207942b62bdf983546aec357404b46e74ec0b790c9b83ffd3cf3687b5bf09457cdbc14593af30ea425718baeb5ecc5703ec15b"; }
- { locale = "tr"; arch = "linux-i686"; sha512 = "c5833f7c43919a842f7b840a35ec8752401c24c559d620cdbdc83e70d77e5fbb5a364e44ac3c5f1f1339d9752b9a9825ac0e00d314aa9025760800fc4fc3ce18"; }
- { locale = "tr"; arch = "linux-x86_64"; sha512 = "f1338235583f5888fb7bd30c4c66341bf7ebc4a771e76571e22a5ef445398c9d2ced0f2f93d99bb2f180fa73a4a1f3560616570c8711e54d40a9b931e5eeb4d1"; }
- { locale = "uk"; arch = "linux-i686"; sha512 = "a40710948603a427c098619be1f203f2e7182eeb697de2b1dfdf824e556353b133839f0e5ce929fa9e31e70b1f248053bddeeba394dfb74e6c747aaa537d1df0"; }
- { locale = "uk"; arch = "linux-x86_64"; sha512 = "5dc6979da2242e45c5ca8a4ca50dd2858c1781256e5b2a9b8bed84e1b2af9f98e5ddea285e49549b3afc1a98df2ab89d74c99a6082309f0150ff426c1d9449c0"; }
- { locale = "vi"; arch = "linux-i686"; sha512 = "fa795ede70edb6c6237502cde8acdb7d5573db1d995d5e96f274b83f8ea0b827c37a5bcfc74b4aa99f1e15bf8dd68e30d756a0bcecc9e5946c2c5e275dad29bd"; }
- { locale = "vi"; arch = "linux-x86_64"; sha512 = "de8a0e22cfc727ccbc460a26a0cb80985c1957da99b050f6f00e4b20b050ba605d815577d392504d0a5e53ba4e12045f3a9a36626ed21682c493259fe0400ecf"; }
- { locale = "zh-CN"; arch = "linux-i686"; sha512 = "381d66fc71d3f03f979ccd76aef75fdcf8eb2e182b4a0fa81c08976d195bd696d0213482d40ab365f2dad594587ba8359df4db2cf8febd8d724d5c50f3ba72ed"; }
- { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "d988114967c4656a13fa3fd562166e7444811ce16c5fc2af06619a47b941b8e07de0993a5593f2e5bad22ff6e856e969dc4cedb9c8df0f532a807e4a30b0c2ef"; }
- { locale = "zh-TW"; arch = "linux-i686"; sha512 = "097a53d990af79e54e445e05c35fc08c86c0d003a04c48daadebb8dc0bd13f57072a82da01c3ae293f4a6766b3e2082bebe12bbb2a8c2f1c7d8eab23eecc2262"; }
- { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "9d4dd9e429623009e21b41383776864804803affc9837068bbafd7507bbc5ed70362582da0adb5c811d21c068a96bb4725c4581bf81ac0acb3d57b19fdb4fff6"; }
+ { locale = "ar"; arch = "linux-i686"; sha512 = "bd6c633bd3ac5fc26f98ba1183f51b4380826d40762b1a28aa2fb6cda2ae776e3dc7909024d7f66b771323d489510c5237977e1380f33e5ac6ece933336e75c5"; }
+ { locale = "ar"; arch = "linux-x86_64"; sha512 = "bfe82d658ce9950bde473836f2cfcc1319d22939a5fad3804808258faee4e96b0cb208ba386c102e41633137c19d071da3868868ccda8155d2ee02d71c05b132"; }
+ { locale = "ast"; arch = "linux-i686"; sha512 = "99870cc67812e321dd2338f68612b63a31803065021fcec02b205f45f9cf263ef535421c249ba4a6a7205979679436a746300902b5c716ec333de0b9769d4f47"; }
+ { locale = "ast"; arch = "linux-x86_64"; sha512 = "911ea7a1852bd61695058f68ae2ad991fd10107d876cf95b95f7df4b42ffe45a787aeee9241e1824281dbd3b1e32d8d815369f674bcaa21ad9268fc2f104a646"; }
+ { locale = "be"; arch = "linux-i686"; sha512 = "3faa1393235b24a73e04be481601552acd28620807a64129061a4fee18d42022e7765a510b61d17193066feeb99a8f3ca2fac405056f66a401c35f23791c8f83"; }
+ { locale = "be"; arch = "linux-x86_64"; sha512 = "d2118deecf5ff12d6e9b2807ff3129bd33e3d8d24ef0db067b031894c266636c103efe8e1d0103f41eaf2e1ae6edfa51bbac11973c082a1ad2339c992e7fd856"; }
+ { locale = "bg"; arch = "linux-i686"; sha512 = "2123fc69d26ed28c6f4a2a8e6ffa3294e594e87608f9c7da3f4a811e39e58e59e1a50af616a6df810f3c8e0872eabcfc4708c4590530d780a52a2200e4a321c3"; }
+ { locale = "bg"; arch = "linux-x86_64"; sha512 = "bf11f9106525f5e02ee26b89560136a07e142aced7abb3b7d9d7578e413ce24abc20995afe054ce32d3d9b6e4fb68a254bbf6a268658c908b33e2da26efdec03"; }
+ { locale = "bn-BD"; arch = "linux-i686"; sha512 = "1823ada3babc79e5d38f1012723c3c7eab2f885a7159d3b6b9d54573fb8c8d849799aebf60a66914cb545095894402cae6acf4b49e99d77e3b1a49b5418c04c7"; }
+ { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "737d2557dade96501f4442001a803eafb5c872967850cc875b902acb17b1133fdf0d0248271ff225babb29b937d744ed3294e4e73e82fef96d07a63fab80ba92"; }
+ { locale = "br"; arch = "linux-i686"; sha512 = "8e4377c42db9535a708a18d0b4d251d0bc14da24bf8cbf5fcb318d77f4a90e26f535f46642c9b940b3ee8887fdfeb218aaa9f846dd3b9cf89ce9d4e6035518af"; }
+ { locale = "br"; arch = "linux-x86_64"; sha512 = "4720d43ca4bdb2d809b4ed36352c03f05c823485951aee8943c24952aa493ed570c4eaecd83920c6ebc112d71e6afddb7b2851ee5a72faf3b4536fd23b35678e"; }
+ { locale = "ca"; arch = "linux-i686"; sha512 = "94132e06f04bdd7928090944d3ae65440e15d15ec1f690d157809d5c524b071ea3c0f3f12b6b6987becdbcb33324d7471fd23feffd3f4f136e9f485b5dfc964d"; }
+ { locale = "ca"; arch = "linux-x86_64"; sha512 = "84e4e65bdab737a8f5663dbcc1116b55a8ef88d9401f30a6a8acbff156913aade12d7b0aa61d9678811032b2e3a905d50ecaf0c9a9653500034e2f90f8ccc510"; }
+ { locale = "cs"; arch = "linux-i686"; sha512 = "a51b94013fe020edc5b3f75f950fd6bb626c8ad18c73e8884ced1d74feaa97d899482e213639bb26496cada97cfbf4024380c49a45547b9e65c033f8ec09c2f2"; }
+ { locale = "cs"; arch = "linux-x86_64"; sha512 = "50214c46072d17c30f19f0ce8a15a68a20839b5f985ce3a4c995c9739fc1290ca2d40601b7349c2af2214aef3207fcfda2a9115dfcef9ee1b005523b23a22317"; }
+ { locale = "cy"; arch = "linux-i686"; sha512 = "a528980e1ca863c47d8b8a8e5b5891916d3de78bd20c1236b9d1954d0f057fb2c247b303eeb8643b6be0fac46a1c665da487c9a5b57f974066a5e3007df92123"; }
+ { locale = "cy"; arch = "linux-x86_64"; sha512 = "fb3b1f14d55d32afcd22f3fa57736fcd820dbf06e6a92b72b8b1ca2f33df9156a0ffd8d0ada11bc86e11359add9d5c225aa07f4b1321464486cd75ca276594dd"; }
+ { locale = "da"; arch = "linux-i686"; sha512 = "1519def46f7b154a517344fff1ec076b5288cde722aeffa683dc3f990434fab4558b63d8062306c5a68d1efd3e30c983f3deced50043fac24c256f7b58542498"; }
+ { locale = "da"; arch = "linux-x86_64"; sha512 = "c5c0e24a0359a0ab178c369d3fcc7bfdf15411088033646d4e699f6e2e3ca8bc8a4719f8c214442661dcdc34e5e1f577dddbda40363cb9824fc9e378ff2444e6"; }
+ { locale = "de"; arch = "linux-i686"; sha512 = "83f7bc92338a30ed183dc9ee67d94e02dd8c659b8a711adad023f79a6253530cb6f530a4f31ad90796cb78566f2e280cf4ee19060b59323c22ed9bc678bee85f"; }
+ { locale = "de"; arch = "linux-x86_64"; sha512 = "6163afd45c2730e8970eddd8f5c159d4a0b4c48684fd6900a0b61eff1ba683a320a6ead6cd0052f0b9cb04f7a54f8e6b633c2bf6a594ed9c94afd7fa742e9061"; }
+ { locale = "dsb"; arch = "linux-i686"; sha512 = "9772c7bbcb2ffd475aba6c00dd527defcc7d2618e6537029abb49a47038c0c16b32f1c35ca4acad2ec53a7e5265598b0a32bad615281cc96afec819eaac32d9c"; }
+ { locale = "dsb"; arch = "linux-x86_64"; sha512 = "99a29d265454eeeac1f80e91913fdf4c6ec850532dea4a3891d0c0ab0a68e5391b9fb42640269c95214131c63e37e4ff7a2b6ea93c609e7b1ea02a04cabb0749"; }
+ { locale = "el"; arch = "linux-i686"; sha512 = "b6878a4ef1b32ac0390feffe6da0dc2c5c88e0bb6c88505e653a630eaa47432be1bd2903d97bed855c41dbbd5f5babf7b0b747b8afdc0675ed670c6bf5a69649"; }
+ { locale = "el"; arch = "linux-x86_64"; sha512 = "a11f653ef20c76187c9a794b70d876f9b2244c5bf9a10a9f7b41969bf35d36b1d75b319bab6cb9b29616546d68be4b587c47e9f54e8cb93f861f1bbfb9c2c1bd"; }
+ { locale = "en-GB"; arch = "linux-i686"; sha512 = "88f1754d40cabbd473dcd5a24a7a91f7bd625b83b91223eafe78271409720ac9d4cfcf32711f36f72cb8b3269275d950ec55d2f11377880b8fddedd2cb04348b"; }
+ { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "b754899626a8bc0fa7e491e6d18b84e8900266cbd39ab619e8a9821825614a46c6bf42ea490e56a8d25b5467e5e9280936f5a5034e055bfe736140f4bb9c1ce3"; }
+ { locale = "en-US"; arch = "linux-i686"; sha512 = "a66a92dbc8c2093d7498934c5f8d5a0e68ec3649b74d60d98775e33832902796667f2c06b2001faf07a535de18b6a2cca6f61dac4f8e8173040cdc9eeebbac88"; }
+ { locale = "en-US"; arch = "linux-x86_64"; sha512 = "4d5c6ce9f3e2a6fa9c44d6b8bc2cc50a2c129037f9a16833cc767efa379c2c2db27b2576c7a8cf93e87646244839614577230161f1bc813755f8fc43ffbafc7b"; }
+ { locale = "es-AR"; arch = "linux-i686"; sha512 = "317865e753dcf03cbb0acaf67e0a34843e6f3264322e2fe63a1eec916bec07678026e6be4f7ce49626bef945a6f34125f28077ab367f954d11ba6f082014b4e5"; }
+ { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "cfd16a5ec21a1ca13fb5e882a75a767da1387c5f4adbeb3a9f608f0035ba60003650e6d3be57b2af8efba2d0bb8ed94ac879ad5f5e2039fddc6d9228f8ae0336"; }
+ { locale = "es-ES"; arch = "linux-i686"; sha512 = "7017c9da2dbeb468c2ff3ebba91c2e83a6a233940296fd5bb03b4d1e5531fae189240f630055ab2d6324a0dcece5d2e80d32d7d9ab17a81709985325d5fe505a"; }
+ { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "920dd641893de2e7b7692af104402e9898c3b8e3311960b5f3072cba07e0f8f918932be591cec92ca3a3aa9be6f17d605c55be5d2445864cc8ae025cef83dac2"; }
+ { locale = "et"; arch = "linux-i686"; sha512 = "0a24d1680b27a1e79985b9f124bc3742f2d4ecaaf2d4742db9ee1f9841d1d4b7d08ba60e71baf50ec6c593bd1a8f51d768a22b364e681b8c8a3651e37735f5f5"; }
+ { locale = "et"; arch = "linux-x86_64"; sha512 = "5c56cff2cd868985800c95eecffce5fc8d18def49b2c553b5c26decb364ce087d74220b2db78bb4c88c18a06eee4c5d0f3e49f17e54b67bce81083da465b53f7"; }
+ { locale = "eu"; arch = "linux-i686"; sha512 = "c903ccbcadb68d951442051e558ab657c337713207887c32383902cf82a32cfb04a60ce03a5cc02fc2cd9542ded108beb433eb32270fceb25e8dc29135d2f4ba"; }
+ { locale = "eu"; arch = "linux-x86_64"; sha512 = "9b782390d45dea01944c1ae29350cf01ee4bbab6ee94d00549aea195e4731b0c410b96f5101c44013352e8323f0baf27bd076a017456f6cc7a221c505fc7883f"; }
+ { locale = "fi"; arch = "linux-i686"; sha512 = "5b33f4d58604138ffc098e9f3e4284f11ec97e58d0586cfcfb89c0114c61b07c2e1ba0051c5751101838d3a1125fd0dd81ca818d59e967dcc7a6cb166c01b27e"; }
+ { locale = "fi"; arch = "linux-x86_64"; sha512 = "41ffde0d385bb3f7d271b11e470614e63f3e25e718f5f0eaca383794543c45a067989f7e153c4d48ec59199d2209e1394f89a14f4b776a0a8d1dc58466f91a80"; }
+ { locale = "fr"; arch = "linux-i686"; sha512 = "2c1e6151f256b4e7b934830c84edd0faa942ad49ee7ee29b767bb75182f296a6a24bc5cd00e9649c78ec649c879fc4c0030d1a73a68b215e72132d0149361b89"; }
+ { locale = "fr"; arch = "linux-x86_64"; sha512 = "ba12fc325112ac1076a9dbb56db5c9b7c03ba67e196d90529cabc3499ea5f479c5ad4cf3360bc891dad8c76a9cf846e1bc99f775d7ad83c45215261731530e13"; }
+ { locale = "fy-NL"; arch = "linux-i686"; sha512 = "0588462a5b0777f77dfde87be365beb5864e4a89b11cb869b18b47d2a600fb25287ac01a9e0b74156c0d35cf9e05e14815b3395a9fcb19030300ec74c3697931"; }
+ { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "2333728d503d8d171009258f6b59f41c20175e3ffde9ab65da3199825901e1c10adbab7d83eed5485608203d8e985ba9fae392971a11070b9fa3ab8a257cc28c"; }
+ { locale = "ga-IE"; arch = "linux-i686"; sha512 = "f43b95950532e23d1ed3a45c309d1e6dd5d79b56ef4b06a44a02485a58aa306a810360349ff2dbb617709785c4633ec3c79ab930752d112e9f971ba2244882b6"; }
+ { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "4fc095fe246ca02ddba8f005ab95dc77b41ed766fff1b0d947f78db1e3fb09a1454d1f3f83b3160127e985a3256d630176f7e6076b4eb936d2529b5f86d1018b"; }
+ { locale = "gd"; arch = "linux-i686"; sha512 = "72e6c4b9e7afd114690f5416d4018eb72ccdd4f2e71e60328e4df92a4043c19bb1ef917661abb8476fe68068754b17b18f7b8178494ad7f7278568919123f495"; }
+ { locale = "gd"; arch = "linux-x86_64"; sha512 = "dcd069d8c4b2d096a01b2f24dd4acd60dbedc1b8511d1fa4346be9342b99b81b6252032470733385e70dfadf9cc755c1f4878542d275a17740290a35dabf6285"; }
+ { locale = "gl"; arch = "linux-i686"; sha512 = "f1e9d759fe8fe2d613bc640d519a73ce843776ab6f7511734522a8728bae07762705b1698a0526accdf9c0c3a9bd233649a01931af2a653d17ae368399df0a1a"; }
+ { locale = "gl"; arch = "linux-x86_64"; sha512 = "16953e45d9c3618c394e4150c58ca7fca45d90beab9a2253ee6cfe58a85e66aa2c5788fc4988c38b1c70470dc3fb9bb96a09daa354c88160d53739ce95ea25c7"; }
+ { locale = "he"; arch = "linux-i686"; sha512 = "89a6e7a06694e55128fa584cb6fac0c459d21c6f795caf581532b7ce69e0ba1954029667d5d3afb5835ffad1bc0d7444ab0c59cff2873870aad6bb232ede542a"; }
+ { locale = "he"; arch = "linux-x86_64"; sha512 = "183ce0c71d7852490f1f78d8a6380c7909f4462d238ecb342e35a8fe5b369161b9399c704011a0741bf0694b67713f93ec187331c414a72e0d77202382a99c7f"; }
+ { locale = "hr"; arch = "linux-i686"; sha512 = "03c6d917c230cb9075958a6317599efcdecba5d8623a2664342bdc3c450662be64d69c7136c4f7ee6c10b4c7cdad8ea5a19cff2862f1e8aed9e3df3687abe182"; }
+ { locale = "hr"; arch = "linux-x86_64"; sha512 = "b26d084369b30bd33011b9761b16769795e529575174f5533174bf7fd71ac387708942cb3e709398bd401341c7ca59486e203865adea58e89743520f0557d94a"; }
+ { locale = "hsb"; arch = "linux-i686"; sha512 = "06dfe62b99b8a52d0d2835c83e9becdd3af3b278e1fc8f7985f2d3883c25ff2e65d55a841c1040816d64faf4115f867c1c18a771e6139ea40fe770cc4dc137f5"; }
+ { locale = "hsb"; arch = "linux-x86_64"; sha512 = "e303bfc9ce30479d1d79611d29dc95cbdd3ea4a6abdd1df6961cc7e4d832c6b44f6010f5a7e74485b4648e781aae2cfd2da78bbae6ef09e0cac6e5b980abfdc4"; }
+ { locale = "hu"; arch = "linux-i686"; sha512 = "f454805664f2aa7262449acb74d78fba411e5de175076a50758f149fc4c1b4f5c76f2a36b253acc18bcc809172db3fea17c6cba524918dd80f2b17bad97e237a"; }
+ { locale = "hu"; arch = "linux-x86_64"; sha512 = "0e8a0a2eefacd575fc52e6a761be481b1a4fe29eab0aaf8d51e2aa624f4cf1f5fae2cc9dfa1f68af83b82813cb8cdb8da3e454711f611a621cc22b33acc44e98"; }
+ { locale = "hy-AM"; arch = "linux-i686"; sha512 = "3ed1482d68759f143f403c935af3412ab819b6801e13bcaf123ef910db0bbe2c7523b52f1dc5c4a93b1a087f3d78162f2b8c04930abe89abf9536abcea374dc8"; }
+ { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "bb43898b0953dbde2837906da9edeb0924a65488715d8e3cf22698ddf665a8037ec758ed6df4ca04ff2f04df437eb8c71d98496147bd5f92b22246bf967be769"; }
+ { locale = "id"; arch = "linux-i686"; sha512 = "c2800b997e412cfabd39d7c8412c02817121383ae477cade3db1d75f7be47091b84179e54e3bd968ca79c41199fbc1f5ece63cb2b9eef038e9af6e4034326db0"; }
+ { locale = "id"; arch = "linux-x86_64"; sha512 = "b5cddfb6c6e8a6fccf6ef4ccd78734e766c081ae5fe3d2a3ad73852d453fdd71eda917eb29ec3bbd2398c7c810c0e61195680de1cded8f4394322a12ce84e0f7"; }
+ { locale = "is"; arch = "linux-i686"; sha512 = "9ab50f7d7ea5450bfd984ef180eeef8672e21e5d1610def3f3725589740ce57486985706713bb292a1a577dae1f9b6106c568fb2acc11f4bb92c1801af444c8f"; }
+ { locale = "is"; arch = "linux-x86_64"; sha512 = "39b6c5ae33b191334d0867d031b59b06a86311527f19b1fa8f0bbe0dfbf90f4f2cf952b8d6ed22851828b16aa3019a8208e6f7b603a6d94741ba66111af00955"; }
+ { locale = "it"; arch = "linux-i686"; sha512 = "13899d6940dd4840566def16ad5d36b6c992349d68bc4d9dbb9c9b73bf53310401e687bf9a4b9837205f5a527f3b7ba1270bb4e4ebb46c129496d49b0b19f2e5"; }
+ { locale = "it"; arch = "linux-x86_64"; sha512 = "c1434939ff690a4036271c013f926230c7e612a64e41aad6e0885109eb5767fa0639286fd44e370f24cae1d4e70a72be8bb04f5533c66c7fb52ac0d1986a767e"; }
+ { locale = "ja"; arch = "linux-i686"; sha512 = "7b6464fd5fc2b0c0a54f760df62c9f08c94662d00e98d9d7a58844d189c765d780798a64079507aa84532e91b28a92e4d6f21c51bd9abf8263e8c4267ba2f9b2"; }
+ { locale = "ja"; arch = "linux-x86_64"; sha512 = "3545594699f209bc78353b3f4b17df5b31f1283e826937cbbd83f34a32aee658c67dffe4cc77a7ea055f09e6d966768715deb7037372d29796a1fddab89383ca"; }
+ { locale = "ko"; arch = "linux-i686"; sha512 = "df238479c6d58be8986a1ea581e63dd7e42a0c6d4a8fe2b3ef66ceeee34c68a4b02f689844e0a19d59d65abb175cbd95387a4e2d0041e7b126cf7728badaa0df"; }
+ { locale = "ko"; arch = "linux-x86_64"; sha512 = "e05d44fc6a66c79ca50cc2bfd88d39112783ed636370ea2927cc2202c8b5829f05aa1e6fd9083c4c5a37c8bb873aadc5aa81d0522abed5742fe78ea3258f8e15"; }
+ { locale = "lt"; arch = "linux-i686"; sha512 = "219d2030e11fdfe5f68f703e6141038177257025b5f1039776cc9093c35b9ac03d197488ceb960d1b2b5c9abc12ac2b4895990afbd430170499d3639476eff5d"; }
+ { locale = "lt"; arch = "linux-x86_64"; sha512 = "6221204aad7b62fd540a5776ac67ca968c5f7f436d260664184c871f8ecdccac6542f306c2d34ba8b74c17b15caf549ad30852fd003b711572ea3eba0c2a32bc"; }
+ { locale = "nb-NO"; arch = "linux-i686"; sha512 = "54b3db811b3573cf0084cd5a5df45e33c6540b1d6df301023853b1fb023f786e70b9f6d2b827273504e70809096d392b0fb91ff89ad363c051ddbfbb6dcf8099"; }
+ { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "8ccafab65ece0dbc9d7ea7067846d3a45df6b4a78d543d54f87a52f359a759dd4d3f0272ca3ce8c792feb643c5d3871ed411d0b8719527969acc1cde39577768"; }
+ { locale = "nl"; arch = "linux-i686"; sha512 = "4ac1dddb4f65c05306738fdfff6b939e4678a59282519a053ae3b919e2c9d0cd4f72f93f6c5925efad101c64a32ec10187fce6734dbdb8002ed05bb1690d8cc0"; }
+ { locale = "nl"; arch = "linux-x86_64"; sha512 = "58555fc9e43b9599486b25fdf8b0e4e27a0592f52db730123ea0513be255f026a35a2d9ac9be84be158e94c3f95fa5ce9dc531dc94bc839e36092ce6ad560b6e"; }
+ { locale = "nn-NO"; arch = "linux-i686"; sha512 = "102ff8f498c9acd7fec58973bde3807f2821723a223ac7646985faf1342eeba15b438b57a6c1e64005ebd86b97cd37555ab568ed96c228ca825651e9133c2696"; }
+ { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "eeda11d9e76e713a287130e1c0cfbc8507c0a148061dab878891af0c7751fb517a0f9d3d49c31ae69514e5caafb212c5e23b6254dc310b63c2f241741c8edf29"; }
+ { locale = "pa-IN"; arch = "linux-i686"; sha512 = "94dcd33d5a992ffd7a47114555d1a12d31e235eec60fa6792fe041154c27dd0d97bf55d0c8bff763502d07a9b458402322a54b0b1943ef7a55457d32360135f7"; }
+ { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "e7a5fd70e80c34c12650fc85af282dffce6fdcaa95c177e18930212605510858d4f71fe0600bccde80aa59bd81f22b4425830fc4c0c689c636105512fb55b0fe"; }
+ { locale = "pl"; arch = "linux-i686"; sha512 = "a056b9ddf6a2a04adf786bad7cecf4d4c02c0ddf8584ef602e390a2157073a654473f2262a4e418fb31ac0a198fd212ac67a2c9e9e52490b3d4236fc6c73edb6"; }
+ { locale = "pl"; arch = "linux-x86_64"; sha512 = "081cbbc49b12223e9a9f860fc6072ceb855634419bbb4d1e2923342c7f4f0b634443a0c1f9f60bf8622b9176412c4216d555d7d075bdc120d0c4bd2d809201db"; }
+ { locale = "pt-BR"; arch = "linux-i686"; sha512 = "22b4194129af89e81e1fa7ab38c2905169ca73c8656c6a7b718cf4013dbc0bcc4336ef68303506894e871487092f8ae7b2a05f914242dd2ea61109e3f969476a"; }
+ { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "c6a5556ceb64c4559e1ce92019312a9b862efe6e5c93380859f8e2787b54cc5e12796446d7effd3bf8c47704e6fadfd80da9261d30c1ab666ebb7a34ac15c525"; }
+ { locale = "pt-PT"; arch = "linux-i686"; sha512 = "46c292e1daa7755332f29e2e6e785013badb3bd869d497cd8fd85c107e9412bfac9ffe1e14f99addaac3d413e9ac7dcb2ee4ba4dc5dddaeee0fefddf0256e281"; }
+ { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "8c1e72eea7b4d30ffc6e5915d51289abce564674231f80ac0e5e03a45cc971683232ba08893672e424fa1bca75ebcc2847d18f044e2762c16f0d955f56895140"; }
+ { locale = "rm"; arch = "linux-i686"; sha512 = "0b3305f2c7d2626d2fe57484c694e5400f6d60dcfb62e65ca925501dc1c1ba3a9ab3f71f2d5584a5d6b49567aedd7188582967f0ad6e7a461034e50cfb577d32"; }
+ { locale = "rm"; arch = "linux-x86_64"; sha512 = "6c875b6806dda0ef2b140ae3a3bb47ae6f5b93a0b6d7b9b2d0e2182b6f3f356c85cbe60c9c79bac51f46a2c1adb59f240f7d1c45be203b38a25832be178cc0a9"; }
+ { locale = "ro"; arch = "linux-i686"; sha512 = "6043a890614495cf28a1271716e6add0229f8d5ed911fe04152503a20a26e7b4da03475e4a1c08b93cf512bde19916ca1a53d41094ffa8a2d48e4cbc71fcbc33"; }
+ { locale = "ro"; arch = "linux-x86_64"; sha512 = "9a5a81fd713ffde8e38aa9ed7557a9a8b6b902e8ba316e5bcd5c4af2f73a1fe67a226a9401ddabdf76086af6c8432d00d02cbafc250f03190878deca1bd69588"; }
+ { locale = "ru"; arch = "linux-i686"; sha512 = "aa205e2f3bc4a4e22520a41c9ba516f6360e062da74a180221b5236cf10d0a30e1ce3b5eec1081a8a9b4de3331fa3f289dfccc0b6785363b3411f77d8832f7c0"; }
+ { locale = "ru"; arch = "linux-x86_64"; sha512 = "7c8d7402949f34cbf9ba3eb32fe1fa1c225296bd179854a199968f012c64fa3a016dcaa922d0dc0abbe1fb0bae438030f7096aaf79be2c7822df2f529e1fa46a"; }
+ { locale = "si"; arch = "linux-i686"; sha512 = "841897e3a07a0a6dbb4e912e424ea52b17631549176995e3c8ab1581bbc4e565be084ffd686ae6a4596224a642213477d40a5b2aa702ac6679e1ae71bdd88516"; }
+ { locale = "si"; arch = "linux-x86_64"; sha512 = "618b49c54e2057c10e3ea5441e2e960e4581589fc2685ca2f42cb1cfb5defd9f26e60d3f7af603757aaf73021133a0bab94ddf3c0cded1442523a55661395720"; }
+ { locale = "sk"; arch = "linux-i686"; sha512 = "e00c42e2adf10e9d19d434bf67be2ff75f47ba11fb2a5d00d62f9946c3c274795fe2fa83b718cf21cc4ac396f10212ab459c81fa7d866ff6a9af8754b0663db0"; }
+ { locale = "sk"; arch = "linux-x86_64"; sha512 = "48a0277c6082e84dc51df64c9e726843d1361edee39e27e625f09cecd56c7b82e31d31e121799f34da4e85177506af680dc893b8f305d24ae7f6276146842120"; }
+ { locale = "sl"; arch = "linux-i686"; sha512 = "585fbe3e399d857ff21307a0ed53c5ea9aabb68232da44febd3c52297e7f9636f6aab6c8f698e2714a83632c48b4b60933568d6dcead5a614fbdc4b90be416c6"; }
+ { locale = "sl"; arch = "linux-x86_64"; sha512 = "e84ff51b3feb54408e6abaddaf23bddab85d6a3cf78286dcc13da43e743306addcd2dd6fd58419d2e5dfe2e5d63c0ba51810fdd9ec080427d26ab8ec7535eba6"; }
+ { locale = "sq"; arch = "linux-i686"; sha512 = "9ca817ada82c6f2199b0c357164fc28b98351c69a8cbfd98048eee407ddc05dc90714e7dfca4059a55ce2bcbc133ae22c8f26a8bd632d60b7bb561221d4fcc81"; }
+ { locale = "sq"; arch = "linux-x86_64"; sha512 = "707088e8fd72c8bf598108f57d684369ff5b1c996e39c88a002f724324b111b2d7c00cfb649eddedbd70dd0df22d10f2f83f9114a71031f33e9adc250a193402"; }
+ { locale = "sr"; arch = "linux-i686"; sha512 = "243baec5e5daca6cc7410bc3079db3e5201b49f7ea1b76bfdc84fcdfc50c3327e886ce7e008c9350c7bf5128f61c34ae543200bc11ae0d3cfa9166a3000b243d"; }
+ { locale = "sr"; arch = "linux-x86_64"; sha512 = "212ce66af4689db19b234b463b0f29b01c7ceebf1d4c67a10351f06f2e71b32d050e5232fe0e61e15fa30a852107ca7a1fd80475fac7d2b877074de3b40e6bdc"; }
+ { locale = "sv-SE"; arch = "linux-i686"; sha512 = "31637fef31f0e1d08ea528bd7b917c6d67ab047c3d1856fd60b8a1de20afec567aed093e27c938aee4c8b1b4269cda5f43a127cc3284deb3db4f0d98a8d23a8a"; }
+ { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "81b745a763fcf3b60b84ddae56cf59e363269986734f26275ad3e32320b8d5ac1a4a714a03861ccd0fdae499767a93b53f5717ca78074c79ca2c9b303406a5ec"; }
+ { locale = "ta-LK"; arch = "linux-i686"; sha512 = "c35956a5aacdbb2eec20feb41fac23349c621624ccc792c9f6e711935c45afaced43e8c75d00c4c59d0279d62d5092798c3200d25730a1fa15ad03682b5f0d86"; }
+ { locale = "ta-LK"; arch = "linux-x86_64"; sha512 = "5bfeaf3ec0ad5ae56b540337b72795e11fe66846df72ec849b51db32091df8ea8a9ba4b2e6c46f2cca2f672419c6ca6fe23de8c7668edce53c38c5587b83c075"; }
+ { locale = "tr"; arch = "linux-i686"; sha512 = "b617860d43de6c1f191ec0a021b86e49217310fb8aaf1ce5d8be11eb27e77f6cf7338f8e675dd25a53c298b4fc7e5228c289aff86b23b81c8176ac55953ddc03"; }
+ { locale = "tr"; arch = "linux-x86_64"; sha512 = "f421c0889af9229e7081bb9f4f5a6cced6647bb230b7dd5d14f46bc5a0ba4c36f7a711e9b9df446ee69e165953d1405c1b11c9912447194518bf9c9b58a5da53"; }
+ { locale = "uk"; arch = "linux-i686"; sha512 = "f33c519ea5fb12e5f98cab4d3de4bc23e8277db9534b765820f8cbe1c24d6d33a033b0ec357f8b13d9d16915f6d677b5b206cdceac86b9f8a09aa1d9e016a510"; }
+ { locale = "uk"; arch = "linux-x86_64"; sha512 = "1964f6597ba11f10010275f7ff256f8fb86bcafc426c81c4f2d55f5202b0d19bc978a1be24e2b204612bf19097afb0709f00de263fc34dbd43eb6b331f85b9ef"; }
+ { locale = "vi"; arch = "linux-i686"; sha512 = "4ca3d166fdfa02bdf8581bbe29b1d067011d4922b5308af369407da7e7a00239b75da739f4be88a158e29b939516095101cc03602545900f87d91455ad716c0e"; }
+ { locale = "vi"; arch = "linux-x86_64"; sha512 = "5e335a87ee0d5ec63e45c2570f628d0ca1cd5577b39f7469aef2367632c10df16525bfffe2a4f80f473d7faacf9e96986130e6548978d9b4f606de3a25a12cc0"; }
+ { locale = "zh-CN"; arch = "linux-i686"; sha512 = "de86ee26774483a31e74a9f89e144d5bb4eb5493f27cb1b5a21902b8e8cdc0322f15d38498b8d6005b59296715b9d9125676b26661433e280a2f1807fedc3df3"; }
+ { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "291074caef4a1a1162d0c3f90e630985978ddd731fde7d9d1d576c065ee8b89af5cd10196c4b05c537996ab99d00d78119af00bd1cd77e85b567303c38d1e792"; }
+ { locale = "zh-TW"; arch = "linux-i686"; sha512 = "6873ff342439247d5bda3e3065998b33bdf03f1d80d15a2f733a79eb7ede188a71e628ec3af6a67354f9adab9f67d79a86310060b20de09c623c342e3b894f2b"; }
+ { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "c60f4ef8b1dd22db617e8d6381f2e0ebd37fd8503c363548b5affda704d483432369138943f84ca07c89a15dcf72b9a081f8db6f1c202558050ec997b9389ecd"; }
];
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index d44c749a55ad..8e2e5a1be448 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -13,7 +13,7 @@
enableOfficialBranding ? false
}:
-let version = "45.4.0"; in
+let version = "45.5.0"; in
let verName = "${version}"; in
stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz";
- sha512 = "9c601d9625b43103b64e111da3a88fccdc30d4a52aa8a66ee02120bc13f3c5600d24fa1cfd3817975a0e58be9078d192334dd3099aa462468d8ab0cd05a3bcd5";
+ sha512 = "719469c4f66a9e4b09c360056c63ef2e1803334901dd4a23f12e455fe8ae4d0aba0a6273b3cf2796c925dc93f0add3df011ffe40148ef0b3f226d0b1a1c37b6a";
};
buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx
diff --git a/pkgs/applications/networking/p2p/ktorrent/5.nix b/pkgs/applications/networking/p2p/ktorrent/5.nix
new file mode 100644
index 000000000000..7e47838c4f98
--- /dev/null
+++ b/pkgs/applications/networking/p2p/ktorrent/5.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, cmake
+, ecm, qtbase, qtscript
+, ki18n, kio, knotifications, knotifyconfig, kdoctools, kross, kcmutils, kdelibs4support
+, libktorrent, boost, taglib
+}:
+
+stdenv.mkDerivation rec {
+ name = pname + "-" + version;
+
+ pname = "ktorrent";
+ version = "5.0.1";
+
+ src = fetchurl {
+ url = http://download.kde.org/stable/ktorrent/5.0/ktorrent-5.0.1.tar.xz;
+ sha256 = "1rbr932djmn1la6vs2sy1zdf39fmla8vwzfn76h7csncbp5fw3yh";
+ };
+
+ patches =
+ [ (fetchurl {
+ url = https://cgit.kde.org/ktorrent.git/patch/?id=f48acc22f0105ce6bac63294d248873ae231c6cc;
+ sha256 = "0jm4y35w2ypbjzf165rnjr224nq4w651ydnpd9zdn3inxh8r4s0v";
+ })
+ ];
+
+ nativeBuildInputs = [ kdoctools ecm ];
+
+ buildInputs =
+ [ cmake qtbase qtscript
+ ki18n kio knotifications knotifyconfig kross kcmutils kdelibs4support
+ libktorrent taglib
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "KDE integrated BtTorrent client";
+ homepage = https://www.kde.org/applications/internet/ktorrent/;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 99df01afa6a4..e2806b3d342f 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -3,6 +3,7 @@
, zlib
, withGtk ? false, gtk2 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null
, withQt ? false, qt4 ? null
+, ApplicationServices, SystemConfiguration, gmp
}:
assert withGtk -> !withQt && gtk2 != null;
@@ -11,7 +12,7 @@ assert withQt -> !withGtk && qt4 != null;
with stdenv.lib;
let
- version = "2.2.0";
+ version = "2.2.2";
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
in
@@ -20,14 +21,16 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2";
- sha256 = "010i7wpsv2231pwb1xdqs0xfwywi3514siidv6wnrfpw3rs7x156";
+ sha256 = "1csm035ayfzn1xzzsmzcjk2ixx39d70aykr4nh0a88chk9gfzb7r";
};
buildInputs = [
bison flex perl pkgconfig libpcap lua5 openssl libgcrypt gnutls
- geoip libnl c-ares python libcap glib zlib
+ geoip c-ares python glib zlib
] ++ optional withQt qt4
- ++ (optionals withGtk [gtk2 pango cairo gdk_pixbuf]);
+ ++ (optionals withGtk [gtk2 pango cairo gdk_pixbuf])
+ ++ optionals stdenv.isLinux [ libcap libnl ]
+ ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ];
patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
@@ -68,7 +71,7 @@ stdenv.mkDerivation {
experts. It runs on UNIX, OS X and Windows.
'';
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ bjornfor fpletz ];
};
}
diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix
new file mode 100644
index 000000000000..bb767da94d06
--- /dev/null
+++ b/pkgs/applications/networking/sync/acd_cli/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, buildPythonApplication, fuse
+, appdirs, colorama, dateutil, requests2, requests_toolbelt
+, fusepy, sqlalchemy }:
+
+buildPythonApplication rec {
+ name = pname + "-" + version;
+ pname = "acd_cli";
+ version = "0.3.2";
+
+ doCheck = false;
+
+ src = fetchFromGitHub {
+ owner = "yadayada";
+ repo = pname;
+ rev = version;
+ sha256 = "0a0fr632l24a3jmgla3b1vcm50ayfa9hdbp677ch1chwj5dq4zfp";
+ };
+
+ propagatedBuildInputs = [ appdirs colorama dateutil fusepy requests2
+ requests_toolbelt sqlalchemy ];
+
+ makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${fuse}/lib/libfuse.so" ];
+
+ postFixup = ''
+ function lnOverBin() {
+ rm -f $out/bin/{$2,.$2-wrapped}
+ ln -s $out/bin/$1 $out/bin/$2
+ }
+ lnOverBin acd_cli.py acd-cli
+ lnOverBin acd_cli.py acd_cli
+ lnOverBin acd_cli.py acdcli
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A command line interface and FUSE filesystem for Amazon Cloud Drive";
+ homepage = https://github.com/yadayada/acd_cli;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ edwtjo ];
+ };
+}
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index d7918b3b9120..2601078df224 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,14 +1,14 @@
{ stdenv, lib, fetchFromGitHub, go, pkgs }:
stdenv.mkDerivation rec {
- version = "0.14.8";
+ version = "0.14.11";
name = "syncthing-${version}";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
- sha256 = "0zhxgl6pgf60x99cappdfzk7h23g37hlanh72bwypx7pwbvhc91l";
+ sha256 = "12b8284mya5z1q7ighbzk8rqxj0kcv5n0l39dygikfcbl1krr6sg";
};
buildInputs = [ go ];
diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix
index 553719a1c60a..52b81595e434 100644
--- a/pkgs/applications/office/libreoffice/default-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/default-primary-src.nix
@@ -3,8 +3,8 @@
rec {
major = "5";
minor = "2";
- patch = "2";
- tweak = "2";
+ patch = "3";
+ tweak = "3";
subdir = "${major}.${minor}.${patch}";
@@ -12,6 +12,6 @@ rec {
src = fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
- sha256 = "1q6rv935g633ngg10hzi23sg0wqfq2apyffagk7mj1kan2hflljr";
+ sha256 = "1h9j3j7drhr49nw2p6by5vvrr8nc8rpldn3yp724mwkb2rfkdwd8";
};
}
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 8a69ca8eeb3b..cbe159857eb6 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -42,14 +42,14 @@ let
translations = fetchSrc {
name = "translations";
- sha256 = "0nxwf3b63gzb04svb6z1hi3qf95i90pwda5gpmlrfrq6250n3bpi";
+ sha256 = "0j0ajli1cbfwbgzrcqkx3db174jv1fgm22ds0gqlgkci9cffa0c4";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
- sha256 = "1gm23i0snhcm4svciypm0qiviiqv9zpiyplkh22baccs7li3kih1";
+ sha256 = "0fndi6cv8rw426c3l071z130ks9sqf6ca5yas7am9d666mmy4fs4";
};
};
diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix
index 3aace6b7e021..74a2267043cb 100644
--- a/pkgs/applications/version-management/cvs/default.nix
+++ b/pkgs/applications/version-management/cvs/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
patches = [ ./getcwd-chroot.patch ];
- hardeningDisable = [ "format" ];
+ hardeningDisable = [ "fortify" "format" ];
preConfigure = ''
# Apply the Debian patches.
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
index 2ee34d3c6e3f..ba2b71138067 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, fetchgit, docutils }:
+{ stdenv, fetchFromGitHub, docutils, makeWrapper, gnupg1compat, curl, rsync }:
-stdenv.mkDerivation {
- name = "git-remote-gcrypt-20140715";
+stdenv.mkDerivation rec {
+ name = "git-remote-gcrypt-${version}";
+ version = "1.0.0";
+ rev = version;
- # Use joeyh's branch that works better with git-annex
- src = fetchgit {
- url = "https://github.com/joeyh/git-remote-gcrypt.git";
- rev = "5dcc77f507d497fe4023e94a47b6a7a1f1146bce";
- sha256 = "d509efde143cfec4898872b5bb423d52d5d1c940b6a1e21b8444c904bdb250c2";
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "spwhitton";
+ repo = "git-remote-gcrypt";
+ sha256 = "0c8ig1pdqj7wjwldnf62pmm2x29ri62x6b24mbsl2nxzkqbwh379";
};
- # Required for rst2man.py
- buildInputs = [ docutils ];
+ outputs = [ "out" "man" ];
+
+ buildInputs = [ docutils makeWrapper ];
# The install.sh script expects rst2man, but here it's named rst2man.py
patchPhase = ''
@@ -20,13 +23,15 @@ stdenv.mkDerivation {
installPhase = ''
prefix="$out" ./install.sh
+ wrapProgram "$out/bin/git-remote-gcrypt" \
+ --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat curl rsync ]}"
'';
- meta = {
- homepage = "https://github.com/joeyh/git-remote-gcrypt";
- description = "GNU Privacy Guard-encrypted git remote";
- license = stdenv.lib.licenses.gpl3;
- maintainers = with stdenv.lib.maintainers; [ ellis ];
- platforms = with stdenv.lib.platforms; unix;
+ meta = with stdenv.lib; {
+ homepage = https://spwhitton.name/tech/code/git-remote-gcrypt;
+ description = "A git remote helper for GPG-encrypted remotes";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ ellis montag451 ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 9c44d420c136..cd737cdf4e6b 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -93,6 +93,7 @@ stdenv.mkDerivation {
# Install contrib stuff.
mkdir -p $out/share/git
mv contrib $out/share/git/
+ ln -s "$out/share/git/contrib/credential/netrc/git-credential-netrc" $out/bin/
mkdir -p $out/share/emacs/site-lisp
ln -s "$out/share/git/contrib/emacs/"*.el $out/share/emacs/site-lisp/
mkdir -p $out/etc/bash_completion.d
diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix
index 8dc2fc037e6d..9e36f790c782 100644
--- a/pkgs/applications/video/mpv/scripts/convert.nix
+++ b/pkgs/applications/video/mpv/scripts/convert.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
meta = {
description = "Convert parts of a video while you are watching it in mpv";
homepage = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0";
- maintainers = lib.maintainers.profpatsch;
+ maintainers = [ lib.maintainers.profpatsch ];
longDescription = ''
When this script is loaded into mpv, you can hit Alt+W to mark the beginning
and Alt+W again to mark the end of the clip. Then a settings window opens.
diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/applications/video/w_scan/default.nix
new file mode 100644
index 000000000000..59ba63b32eeb
--- /dev/null
+++ b/pkgs/applications/video/w_scan/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "w_scan-${version}";
+ version = "20161022";
+
+ src = fetchurl {
+ url = "http://wirbel.htpc-forum.de/w_scan/${name}.tar.bz2";
+ sha256 = "0y8dq2sm13xn2r2lrqf5pdhr9xcnbxbg1aw3iq1szds2idzsyxr0";
+ };
+
+ meta = {
+ description = "Small CLI utility to scan DVB and ATSC transmissions";
+ homepage = http://wirbel.htpc-forum.de/w_scan/index_en.html;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.nico202 ] ;
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index f81781987ccc..ad8f94b52af2 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -113,6 +113,16 @@ stdenv.mkDerivation rec {
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=fdfcc9aeea1492f4b819a24c94dfb678145b1bf9";
sha256 = "0npi3fag52icq7xr799h5zi11xscbakdhqmdab0kyl6q331cc32z";
})
+ (fetchpatch {
+ name = "qemu-CVE-2016-7994.patch";
+ url = "http://git.qemu.org/?p=qemu.git;a=patch;h=cb3a0522b694cc5bb6424497b3f828ccd28fd1dd";
+ sha256 = "1zhmbqlj0hc69ia4s6h59pi1z3nmijkryxwmf4bzp9gahx8x4xm3";
+ })
+ (fetchpatch {
+ name = "qemu-CVE-2016-8668.patch";
+ url = "http://git.qemu.org/?p=qemu.git;a=patch;h=8caed3d564672e8bc6d2e4c6a35228afd01f4723";
+ sha256 = "19sq6fh7nh8wrk52skky4vwm80029lhm093g11f539krmzjgipik";
+ })
# FIXME: Fix for CVE-2016-9101 not yet ready: https://lists.gnu.org/archive/html/qemu-devel/2016-10/msg03024.html
diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix
index 61b356311785..159468f79047 100644
--- a/pkgs/applications/window-managers/compton/git.nix
+++ b/pkgs/applications/window-managers/compton/git.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
additional features, such as additional effects, and a fork at a
well-defined and proper place.
'';
- maintainers = maintainers.ertes;
+ maintainers = [ maintainers.ertes ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 59e06c95ebba..982229cf8a5f 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -26,7 +26,7 @@ in
Cloning branches will make the hash check fail when there is an update.
But not all patches we want can be accessed by tags.
- The workaround is getting the last n commits so that it's likly that they
+ The workaround is getting the last n commits so that it's likely that they
still contain the hash we want.
for now : increase depth iteratively (TODO)
diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix
new file mode 100644
index 000000000000..df96241542de
--- /dev/null
+++ b/pkgs/data/fonts/go-font/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation rec {
+ name = "go-font-${version}";
+ version = "2016-11-17";
+
+ src = fetchgit {
+ url = "https://go.googlesource.com/image";
+ rev = "d2f07f8aaaa906f1a64eee0e327fc681cdb2944f";
+ sha256 = "1kmsipa4cyrwx86acc695c281hchrz9k9ni8r7giyggvdi577iga";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/truetype
+ mkdir -p $out/share/doc/go-font
+ cp font/gofont/ttfs/* $out/share/fonts/truetype
+ mv $out/share/fonts/truetype/README $out/share/doc/go-font/LICENSE
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://blog.golang.org/go-fonts;
+ description = "The Go font family";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ sternenseemann ];
+ platforms = stdenv.lib.platforms.all;
+ hydraPlatforms = [];
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix
index 1927585fd321..a827831c801c 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix
@@ -1,6 +1,7 @@
{ stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme
, telepathy_glib, gjs, itstool, telepathy_idle, libxml2
-, pkgconfig, gtk3, glib, librsvg, gnome3, wrapGAppsHook }:
+, pkgconfig, gtk3, glib, librsvg, libsecret, libsoup
+, gnome3, wrapGAppsHook }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@@ -8,7 +9,7 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ telepathy_idle ];
buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook
- telepathy_glib gjs gdk_pixbuf librsvg libxml2 ];
+ telepathy_glib gjs gdk_pixbuf librsvg libxml2 libsecret libsoup ];
enableParallelBuilding = true;
@@ -18,5 +19,6 @@ stdenv.mkDerivation rec {
maintainers = gnome3.maintainers;
license = licenses.gpl2;
platforms = platforms.linux;
+ broken = true;
};
}
diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix
index 942bd5eb9779..91f43545b310 100644
--- a/pkgs/desktops/kde-5/applications/default.nix
+++ b/pkgs/desktops/kde-5/applications/default.nix
@@ -67,6 +67,8 @@ let
# External packages
kipi-plugins = callPackage ../../../applications/graphics/kipi-plugins/5.x.nix {};
+ ktorrent = callPackage ../../../applications/networking/p2p/ktorrent/5.nix { };
+ libktorrent = callPackage ../../../development/libraries/libktorrent/5.nix { };
};
in packages
diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix
index bb123fcdab44..36850824d63c 100644
--- a/pkgs/desktops/kde-5/plasma/default.nix
+++ b/pkgs/desktops/kde-5/plasma/default.nix
@@ -44,14 +44,6 @@ let
inherit (srcs.breeze) src version;
};
breeze-qt5 = callPackage ./breeze-qt5.nix {};
- breeze =
- let
- version = (builtins.parseDrvName breeze-qt5.name).version;
- in
- symlinkJoin {
- name = "breeze-${version}";
- paths = map (pkg: pkg.out or pkg) [ breeze-gtk breeze-qt4 breeze-qt5 ];
- };
breeze-grub = callPackage ./breeze-grub.nix {};
breeze-plymouth = callPackage ./breeze-plymouth {};
kactivitymanagerd = callPackage ./kactivitymanagerd.nix {};
diff --git a/pkgs/desktops/kde-5/plasma/fetch.sh b/pkgs/desktops/kde-5/plasma/fetch.sh
index 0809f2d66930..60928c3900d0 100644
--- a/pkgs/desktops/kde-5/plasma/fetch.sh
+++ b/pkgs/desktops/kde-5/plasma/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.3/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.4/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/kde-5/plasma/oxygen.nix b/pkgs/desktops/kde-5/plasma/oxygen.nix
index 44a7575526f1..f880f2e3ab23 100644
--- a/pkgs/desktops/kde-5/plasma/oxygen.nix
+++ b/pkgs/desktops/kde-5/plasma/oxygen.nix
@@ -1,19 +1,20 @@
{
- plasmaPackage,
- ecm, makeQtWrapper,
+ plasmaPackage, kdeWrapper,
+ ecm,
frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons,
ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras
}:
-plasmaPackage {
- name = "oxygen";
- nativeBuildInputs = [ ecm makeQtWrapper ];
- propagatedBuildInputs = [
- frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons
- ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras
- ];
- postInstall = ''
- wrapQtProgram "$out/bin/oxygen-demo5"
- wrapQtProgram "$out/bin/oxygen-settings5"
- '';
+let
+ unwrapped = plasmaPackage {
+ name = "oxygen";
+ nativeBuildInputs = [ ecm ];
+ propagatedBuildInputs = [
+ frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons
+ ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras
+ ];
+ };
+in
+kdeWrapper unwrapped {
+ targets = [ "bin/oxygen-demo5" "bin/oxygen-settings5" ];
}
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix
index 7e8823e2db96..8d4098ca31f2 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix
+++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix
@@ -38,4 +38,9 @@ plasmaPackage rec {
"-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg"
"-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics.dev}/include/xorg"
];
+ postInstall = ''
+ # Display ~/Desktop contents on the desktop by default.
+ sed -i "$out/share/plasma/shells/org.kde.plasma.desktop/contents/defaults" \
+ -e 's/Containment=org.kde.desktopcontainment/Containment=org.kde.plasma.folder/'
+ '';
}
diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix
index 08daf740183d..75f44f47becf 100644
--- a/pkgs/desktops/kde-5/plasma/srcs.nix
+++ b/pkgs/desktops/kde-5/plasma/srcs.nix
@@ -3,323 +3,323 @@
{
bluedevil = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/bluedevil-5.8.3.tar.xz";
- sha256 = "1d05bzy1za7s9mlsh1drhlgjbb7z78jayhqml3zym05igs517la6";
- name = "bluedevil-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/bluedevil-5.8.4.tar.xz";
+ sha256 = "1c49f35574948q541q25wsalhdz0yji9x18hpg7lc9mb117114fq";
+ name = "bluedevil-5.8.4.tar.xz";
};
};
breeze = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/breeze-5.8.3.tar.xz";
- sha256 = "0apim1byibkbqkxb1f5ra53wfr4cwmrkdsx4ls7mph4iknr5wdwp";
- name = "breeze-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/breeze-5.8.4.tar.xz";
+ sha256 = "0jxlvr9yf7pilwjvzzhhx8di6a2gx8812hl08fh4lszbkdia69yw";
+ name = "breeze-5.8.4.tar.xz";
};
};
breeze-grub = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/breeze-grub-5.8.3.tar.xz";
- sha256 = "01yyhwccxrkmxi95rsg9645fd0i2ca97j425q0pxci9fg93bwl8k";
- name = "breeze-grub-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/breeze-grub-5.8.4.tar.xz";
+ sha256 = "1sysdw3agm568l8mc6bv7g2vhxny34h1b4k9wm36c1x1xyac72cm";
+ name = "breeze-grub-5.8.4.tar.xz";
};
};
breeze-gtk = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/breeze-gtk-5.8.3.tar.xz";
- sha256 = "1wm8v4fav9crk3wn3azsylymvcg67cgncv4zx1fy8rmblikp080g";
- name = "breeze-gtk-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/breeze-gtk-5.8.4.tar.xz";
+ sha256 = "127hhlxicc3rsxxi9cwcqj32w3yyi20p1sfmfk7gjnklm6zv8b0a";
+ name = "breeze-gtk-5.8.4.tar.xz";
};
};
breeze-plymouth = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/breeze-plymouth-5.8.3.tar.xz";
- sha256 = "0gdl603kjxfrvcardinfq710j5gzzc6ky8ypzmr7myk5kl4i9gf3";
- name = "breeze-plymouth-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/breeze-plymouth-5.8.4.tar.xz";
+ sha256 = "0lsdincygh75yib1nfyqnwghnpi3pwjyjvkgyza142s49vynkdkj";
+ name = "breeze-plymouth-5.8.4.tar.xz";
};
};
discover = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/discover-5.8.3.tar.xz";
- sha256 = "18fqr15jw3hfbpq6ma3md89lqzmlilfbic6zd0pm9mvpmwawbjxh";
- name = "discover-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/discover-5.8.4.tar.xz";
+ sha256 = "1wkwkk0cqyz9d68d9s651cjahimb9phwr7k55g6mkigdkljd18fx";
+ name = "discover-5.8.4.tar.xz";
};
};
kactivitymanagerd = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/kactivitymanagerd-5.8.3.tar.xz";
- sha256 = "18nkg64i7znyk29km8clcmpg5wrd60a0nbgdb6n0cnjjyra2ljfj";
- name = "kactivitymanagerd-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/kactivitymanagerd-5.8.4.tar.xz";
+ sha256 = "0rb9gc584lhbqfn9q31rl1h0aqiv90b1cb5pd5rcsq6s2yz0g8i2";
+ name = "kactivitymanagerd-5.8.4.tar.xz";
};
};
kde-cli-tools = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/kde-cli-tools-5.8.3.tar.xz";
- sha256 = "02sa4l6mx6bfys44wcaf9mpfk3vrw65zzd1jx466xy0dda43kw9b";
- name = "kde-cli-tools-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/kde-cli-tools-5.8.4.tar.xz";
+ sha256 = "0vzb5gq94hwyzz32z5gvdrpzj3ysvsqb6k25cfc3sy93hwla3a14";
+ name = "kde-cli-tools-5.8.4.tar.xz";
};
};
kdecoration = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/kdecoration-5.8.3.tar.xz";
- sha256 = "0d7q16ms3vrsrwc7fql3ly7hmbyx0v35llj9z8h1k642j3ci8jca";
- name = "kdecoration-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/kdecoration-5.8.4.tar.xz";
+ sha256 = "06ch3871yifkimqs67z3j7rv673qw6wa01x6qnc6899rckg1kdl4";
+ name = "kdecoration-5.8.4.tar.xz";
};
};
kde-gtk-config = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/kde-gtk-config-5.8.3.tar.xz";
- sha256 = "0y3xykz8db3y92mnhbwld2wcsh4sqxacnmx899ig5xy08chqym3d";
- name = "kde-gtk-config-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/kde-gtk-config-5.8.4.tar.xz";
+ sha256 = "15jw7wvk3jl9rbcm2f3vx6i5mjqzibj87l85r9cr33cxaq06wdn4";
+ name = "kde-gtk-config-5.8.4.tar.xz";
};
};
kdeplasma-addons = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/kdeplasma-addons-5.8.3.tar.xz";
- sha256 = "1ssk70rvfzi3a9mx514qsh5hld2v12kz3m4n7vpl9sq1fc5hq8k3";
- name = "kdeplasma-addons-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/kdeplasma-addons-5.8.4.tar.xz";
+ sha256 = "0f1956dppgyx313ihjv8f21lql387rzzkvmg9y9lh7yidl75gfz4";
+ name = "kdeplasma-addons-5.8.4.tar.xz";
};
};
kgamma5 = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/kgamma5-5.8.3.tar.xz";
- sha256 = "038i3dm6lxvlb5s6faxr5h6cw6xhymq71fnbphhbcbc1v08sa065";
- name = "kgamma5-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/kgamma5-5.8.4.tar.xz";
+ sha256 = "1r5mzdk2givjmq5j374hgbf17jni4n7836pli2vka4qbjbrlzfg1";
+ name = "kgamma5-5.8.4.tar.xz";
};
};
khotkeys = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/khotkeys-5.8.3.tar.xz";
- sha256 = "0lqwsdbr38qhz79sgdg3m3wx70f6ys4bv8mhnczfs06mchzm6zy9";
- name = "khotkeys-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/khotkeys-5.8.4.tar.xz";
+ sha256 = "1q766aaq1l6ihgvjxlw69kpm91ai8nbcc9qc6xnz1924p9957nl3";
+ name = "khotkeys-5.8.4.tar.xz";
};
};
kinfocenter = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/kinfocenter-5.8.3.tar.xz";
- sha256 = "1hs9yg15rhhm2lra472wq9f1ca7aj6wsd6drb538mdma53mz21pv";
- name = "kinfocenter-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/kinfocenter-5.8.4.tar.xz";
+ sha256 = "1mnvp4bkhvmpqfqjag46fcx0kr7w8mq29djqlfd9akypqmzszbvd";
+ name = "kinfocenter-5.8.4.tar.xz";
};
};
kmenuedit = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/kmenuedit-5.8.3.tar.xz";
- sha256 = "06zji52iw8d18nda87xh54d7q94aqddrfgp3i9lsir50bgabqnc7";
- name = "kmenuedit-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/kmenuedit-5.8.4.tar.xz";
+ sha256 = "0wm40swxarnzv7hs11r1wmj6b0yjby3sxk8n59z6s2zza64n6n8h";
+ name = "kmenuedit-5.8.4.tar.xz";
};
};
kscreen = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/kscreen-5.8.3.tar.xz";
- sha256 = "07mldxxxna1y8ngam8l2h3bs1plvfgqhzj95ryprsfypls7pj1ny";
- name = "kscreen-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/kscreen-5.8.4.tar.xz";
+ sha256 = "1j43gzxv9j4fjszc839968vmlsrqg7bapwvjnwfc3mc8z2w7a6hl";
+ name = "kscreen-5.8.4.tar.xz";
};
};
kscreenlocker = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/kscreenlocker-5.8.3.tar.xz";
- sha256 = "039i01c48g3grfm6vn5zmgaazlv4lln8w3rx8d107rlfqslfq4gv";
- name = "kscreenlocker-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/kscreenlocker-5.8.4.tar.xz";
+ sha256 = "1n4wbzfi2h9lxj8g1qii43q205by1bqv48xxyr871mmmikxrk6qv";
+ name = "kscreenlocker-5.8.4.tar.xz";
};
};
ksshaskpass = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/ksshaskpass-5.8.3.tar.xz";
- sha256 = "0kvfnzbq6y9vs1a9yn3hf0cxbwdfs0mw440gsgjgbpmamnv4xpkj";
- name = "ksshaskpass-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/ksshaskpass-5.8.4.tar.xz";
+ sha256 = "033mjmry0hbz2daa9w0i2drxrdjyraynxhlnq0b331b6klxhzczc";
+ name = "ksshaskpass-5.8.4.tar.xz";
};
};
ksysguard = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/ksysguard-5.8.3.tar.xz";
- sha256 = "0a1mfm0gfsi1b79c7m62rk8pp6fsbvrqhv5b07rasapn53zwr6zd";
- name = "ksysguard-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/ksysguard-5.8.4.tar.xz";
+ sha256 = "1hmj32c2jzvk6fwbvdh3ij1651bfslfqhy52y79mc6q816wm7fv3";
+ name = "ksysguard-5.8.4.tar.xz";
};
};
kwallet-pam = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/kwallet-pam-5.8.3.tar.xz";
- sha256 = "1lbmzi0pimp2pw4g0dmrw0vpb2mmm64akzjzv0l72i6f4sylsqpd";
- name = "kwallet-pam-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/kwallet-pam-5.8.4.tar.xz";
+ sha256 = "149qwri47yjv85abfv48232ldvl464df4id9gz0kwjp3cd5n12cn";
+ name = "kwallet-pam-5.8.4.tar.xz";
};
};
kwayland-integration = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/kwayland-integration-5.8.3.tar.xz";
- sha256 = "1w717601ivpnfvjprlyh0qvcj61m8nh9qpsqmhsy7993jvm8wal4";
- name = "kwayland-integration-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/kwayland-integration-5.8.4.tar.xz";
+ sha256 = "1s3jy3bb15v49w9ym5d9x352lf57dsg72xqmw3w2jbvmmyacg2a7";
+ name = "kwayland-integration-5.8.4.tar.xz";
};
};
kwin = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/kwin-5.8.3.tar.xz";
- sha256 = "0a3z17f1ma6yspbs4wyj1cp17hglf4xj1pmwya6nbf08d6gbxq1w";
- name = "kwin-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/kwin-5.8.4.tar.xz";
+ sha256 = "1zglmz2c2aiw46vm813m5hznqjx1phs90djlva9vcvv5rvz7y3fn";
+ name = "kwin-5.8.4.tar.xz";
};
};
kwrited = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/kwrited-5.8.3.tar.xz";
- sha256 = "0s2fsxyw6x664pirbvkd5zf0zazhx9yxzv2xk8d8cb8gfbj32cc9";
- name = "kwrited-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/kwrited-5.8.4.tar.xz";
+ sha256 = "055054i96yxi2pb5lg42d6yjhvwqc5vgqnrczh8f5g6j3ykl6p7s";
+ name = "kwrited-5.8.4.tar.xz";
};
};
libkscreen = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/libkscreen-5.8.3.tar.xz";
- sha256 = "09jakk3yrnp0vf2dihalm08lndcvp18c6c4qjr1bg65cjij9fvx7";
- name = "libkscreen-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/libkscreen-5.8.4.tar.xz";
+ sha256 = "1vrh4ympdgnvnrl7c4l3hizxza05y0dr4ii6h109r8iqfhbis56p";
+ name = "libkscreen-5.8.4.tar.xz";
};
};
libksysguard = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/libksysguard-5.8.3.tar.xz";
- sha256 = "11601hlrm6lm0vrw2icx2778g6yzd9fsgpa8s8rdwr0qw9i0wacy";
- name = "libksysguard-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/libksysguard-5.8.4.tar.xz";
+ sha256 = "0mc045qvkzsk1rhvasysbjcqvsm9nvmgha6ljsfn61gnwpb3fjzq";
+ name = "libksysguard-5.8.4.tar.xz";
};
};
milou = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/milou-5.8.3.tar.xz";
- sha256 = "03vr8ndr14ak111gq0hwlq4b5g1hwhbh3vk5b3xrk13bhxg6nfsl";
- name = "milou-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/milou-5.8.4.tar.xz";
+ sha256 = "169bcdgbqddmfzz39wdy5cbqqm8djayr3bxn8j28pjkc4l8i93c8";
+ name = "milou-5.8.4.tar.xz";
};
};
oxygen = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/oxygen-5.8.3.tar.xz";
- sha256 = "0ircd8v5khgmpigazxy7pykiqk8maah28ypsh3z66aim0ni4h3jg";
- name = "oxygen-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/oxygen-5.8.4.tar.xz";
+ sha256 = "1g8zm71k31smyzxc1kmvcl889ljfv6l0ks6g9888qyyzhbqps2p4";
+ name = "oxygen-5.8.4.tar.xz";
};
};
plasma-desktop = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/plasma-desktop-5.8.3.tar.xz";
- sha256 = "0pkjkhwqgin203dkl5clnvc9l9jnk7dqaxh7h7rbc8d5bfjiwzg7";
- name = "plasma-desktop-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/plasma-desktop-5.8.4.tar.xz";
+ sha256 = "07dw8x74j0am52rxvig0jcwhlk3kx762hfw3vk6innjfcrkjx43q";
+ name = "plasma-desktop-5.8.4.tar.xz";
};
};
plasma-integration = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/plasma-integration-5.8.3.tar.xz";
- sha256 = "196gxymfbrdjravgqk2ia2fpanim4l08a0vh5r13ppm7q7vzwz23";
- name = "plasma-integration-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/plasma-integration-5.8.4.tar.xz";
+ sha256 = "18w4ws0ydqf0lfd16svgs1sbf2q6rc1zkzfhxwj2jzdhqjqwdikn";
+ name = "plasma-integration-5.8.4.tar.xz";
};
};
plasma-nm = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/plasma-nm-5.8.3.tar.xz";
- sha256 = "1rsj0gl9plza7ykkp161ipvxlax67vdvns0fnq34sk9hg7s5ckb7";
- name = "plasma-nm-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/plasma-nm-5.8.4.tar.xz";
+ sha256 = "0dzk6wa6dsw9mlwxvhyhq8dmk88ia9paavcnw0am165ahpmkpzjq";
+ name = "plasma-nm-5.8.4.tar.xz";
};
};
plasma-pa = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/plasma-pa-5.8.3.tar.xz";
- sha256 = "1l3xdcrkvjpmmbzvyhqrs6y8xhkz5k1xkxlm3d3bx4x0mn24qmq4";
- name = "plasma-pa-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/plasma-pa-5.8.4.tar.xz";
+ sha256 = "1p7f7ahr4xc50cn9iawkpq0xna7s7zar8vlkvizgji566sp1yf4i";
+ name = "plasma-pa-5.8.4.tar.xz";
};
};
plasma-sdk = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/plasma-sdk-5.8.3.tar.xz";
- sha256 = "1jgv6yf7m9x2869cprbg2r9ka56ypmprvvznagb4zrjnjfdnqrm7";
- name = "plasma-sdk-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/plasma-sdk-5.8.4.tar.xz";
+ sha256 = "0nkrppv15l4v2f9g3ihixmgya1ky2zrih1ynak7kqkv43d4827s9";
+ name = "plasma-sdk-5.8.4.tar.xz";
};
};
plasma-tests = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/plasma-tests-5.8.3.tar.xz";
- sha256 = "1aidrc3wi3z7lap5m193xqcahl0p2pdg9hddygzq6dr46r1ipbi4";
- name = "plasma-tests-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/plasma-tests-5.8.4.tar.xz";
+ sha256 = "0hh8rp7sw8lyc61pizhc64138sv41iv9gnn0flbblvd912990i6k";
+ name = "plasma-tests-5.8.4.tar.xz";
};
};
plasma-workspace = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/plasma-workspace-5.8.3.tar.xz";
- sha256 = "16h5flf346lwrdl35clkq0qv3i0fa4clxyyn3dvpsp9mvxdlabwb";
- name = "plasma-workspace-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/plasma-workspace-5.8.4.tar.xz";
+ sha256 = "1hwdrwc43s0mfy86ywws2myr1byf4d1j7x685z05cvyg3ha2wwwd";
+ name = "plasma-workspace-5.8.4.tar.xz";
};
};
plasma-workspace-wallpapers = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/plasma-workspace-wallpapers-5.8.3.tar.xz";
- sha256 = "0dy3w60d4wbm571kbv6qshmrqf6r30j53hz92kkyiwgqja18ysg2";
- name = "plasma-workspace-wallpapers-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/plasma-workspace-wallpapers-5.8.4.tar.xz";
+ sha256 = "088vmni3krybg5j6bd0amfqn806pxqjnyb0pvlwbakw53yjbsva3";
+ name = "plasma-workspace-wallpapers-5.8.4.tar.xz";
};
};
polkit-kde-agent = {
- version = "1-5.8.3";
+ version = "1-5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/polkit-kde-agent-1-5.8.3.tar.xz";
- sha256 = "04llryjkjzkzccfjwdhwcbkvp8wfgjfw4yabbq4kl1i2girimw0z";
- name = "polkit-kde-agent-1-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/polkit-kde-agent-1-5.8.4.tar.xz";
+ sha256 = "0jh1msiaig47114ccdpxf3zl77vgs5wvbsl2vibc05i19alr99jg";
+ name = "polkit-kde-agent-1-5.8.4.tar.xz";
};
};
powerdevil = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/powerdevil-5.8.3.tar.xz";
- sha256 = "1im9sxzb4c3cplplzizfxdlyg1knm94y2hj9ssllxfggy5d38ps1";
- name = "powerdevil-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/powerdevil-5.8.4.tar.xz";
+ sha256 = "1b1cy98zjdc9w8jd0hqrzmvmvfxg5v6imd4pvnlgfix9bm0gcmcy";
+ name = "powerdevil-5.8.4.tar.xz";
};
};
sddm-kcm = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/sddm-kcm-5.8.3.tar.xz";
- sha256 = "1cs29rb259zz06qwfhnjxzy2xzzqvfwpphz4whbyl5kn07bzah8d";
- name = "sddm-kcm-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/sddm-kcm-5.8.4.tar.xz";
+ sha256 = "03d2x6hvjvwdmpcs04vs7jqp4nnvw1gmiwfra5xk432argf0nxyx";
+ name = "sddm-kcm-5.8.4.tar.xz";
};
};
systemsettings = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/systemsettings-5.8.3.tar.xz";
- sha256 = "0shac5659h928p2kq053kllw66j3sw6a06kczgck5lq28kxwh3mm";
- name = "systemsettings-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/systemsettings-5.8.4.tar.xz";
+ sha256 = "1j45yvvm8lx1nvwzq2x979s5x3k4i3phjcw73hxyqv9x7y0pnchv";
+ name = "systemsettings-5.8.4.tar.xz";
};
};
user-manager = {
- version = "5.8.3";
+ version = "5.8.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.3/user-manager-5.8.3.tar.xz";
- sha256 = "0kh9knr2rfrhakzdyf94cap19v21ciglammdp4svyql7drwfvq8v";
- name = "user-manager-5.8.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.8.4/user-manager-5.8.4.tar.xz";
+ sha256 = "0m2yv7qlj0y95z5x3f008aww3jzrs5lf32k9czqia3fyy9szpa1d";
+ name = "user-manager-5.8.4.tar.xz";
};
};
}
diff --git a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh
index 256f9949e834..63c62f12321e 100755
--- a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh
+++ b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh
@@ -6,6 +6,36 @@ export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}@QT_PLUGIN_PATH@"
export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}@QML_IMPORT_PATH@"
export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}@QML2_IMPORT_PATH@"
+# Set the default GTK 2 theme
+if ! [ -e $HOME/.gtkrc-2.0 ] \
+ && [ -e /run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc ]; then
+ cat >$HOME/.gtkrc-2.0 <$HOME/.config/gtk-3.0/settings.ini <$configDir/kcminputrc < "0.17.1",
- "elm-package" => "0.17.1",
- "elm-make" => "0.17.1",
- "elm-reactor" => "0.17.1",
- "elm-repl" => "0.17.1"
+$elm_version = "0.18.0"
+$elm_packages = { "elm-compiler" => "0.18.0",
+ "elm-package" => "0.18.0",
+ "elm-make" => "0.18.0",
+ "elm-reactor" => "0.18.0",
+ "elm-repl" => "0.18.0"
}
for pkg, ver in $elm_packages
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index aec6faed585e..23a1b2821492 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
-, autoconf, automake, happy, alex, cross ? null
+, autoconf, automake, happy, alex, crossSystem, selfPkgs, cross ? null
}:
let
@@ -66,6 +66,11 @@ in stdenv.mkDerivation (rec {
passthru = {
inherit bootPkgs;
+ } // stdenv.lib.optionalAttrs (crossSystem != null) {
+ crossCompiler = selfPkgs.ghc.override {
+ cross = crossSystem;
+ bootPkgs = selfPkgs;
+ };
};
meta = {
@@ -86,11 +91,24 @@ in stdenv.mkDerivation (rec {
'';
configureFlags = [
- "CC=${cross.config}-cc"
+ "CC=${stdenv.ccCross}/bin/${cross.config}-cc"
+ "LD=${stdenv.binutilsCross}/bin/${cross.config}-ld"
+ "AR=${stdenv.binutilsCross}/bin/${cross.config}-ar"
+ "NM=${stdenv.binutilsCross}/bin/${cross.config}-nm"
+ "RANLIB=${stdenv.binutilsCross}/bin/${cross.config}-ranlib"
"--target=${cross.config}"
+ "--enable-bootstrap-with-devel-snapshot"
];
buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutilsCross ];
dontSetConfigureCross = true;
+
+ passthru = {
+ inherit bootPkgs cross;
+
+ cc = "${stdenv.ccCross}/bin/${cross.config}-cc";
+
+ ld = "${stdenv.binutilsCross}/bin/${cross.config}-ld";
+ };
})
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
new file mode 100644
index 000000000000..f8b861311d60
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs/base.nix
@@ -0,0 +1,186 @@
+{ mkDerivation
+, test-framework
+, test-framework-hunit
+, test-framework-quickcheck2
+, data-default
+, ghc-paths
+, haskell-src-exts
+, haskell-src-meta
+, optparse-applicative
+, system-fileio
+, system-filepath
+, text-binary
+, unordered-containers
+, cabal-install
+, wl-pprint-text
+, base16-bytestring
+, executable-path
+, transformers-compat
+, haddock-api
+, ghcjs-prim
+, regex-posix
+, callPackage
+
+, bootPkgs, gmp
+, jailbreak-cabal
+
+, runCommand
+, nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm
+, time
+, zlib, aeson, attoparsec, bzlib, hashable
+, lens
+, parallel, safe, shelly, split, stringsearch, syb
+, tar, terminfo
+, vector, yaml, fetchgit, fetchFromGitHub, Cabal
+, alex, happy, git, gnumake, autoconf, patch
+, automake, libtool
+, cryptohash
+, haddock, hspec, xhtml, primitive, cacert, pkgs
+, coreutils
+, libiconv
+
+, version ? "0.2.0"
+, ghcjsSrc ? fetchFromGitHub {
+ owner = "ghcjs";
+ repo = "ghcjs";
+ rev = "689c7753f50353dd05606ed79c51cd5a94d3922a";
+ sha256 = "076020a9gjv8ldj5ckm43sbzq9s6c5xj6lpd8v28ybpiama3m6b4";
+ }
+, ghcjsBootSrc ? fetchgit {
+ url = git://github.com/ghcjs/ghcjs-boot.git;
+ rev = "8c549931da27ba9e607f77195208ec156c840c8a";
+ sha256 = "0yg9bnabja39qysh9pg1335qbvbc0r2mdw6cky94p7kavacndfdv";
+ fetchSubmodules = true;
+ }
+, ghcjsBoot ? import ./ghcjs-boot.nix {
+ inherit runCommand;
+ src = ghcjsBootSrc;
+ }
+, shims ? import ./shims.nix { inherit fetchFromGitHub; }
+
+# This is the list of the Stage 1 packages that are built into a booted ghcjs installation
+# It can be generated with the command:
+# nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/^\([^_]*\)\(.*\)$/ \"\1\"/'"
+, stage1Packages ? [
+ "array"
+ "base"
+ "binary"
+ "bytestring"
+ "containers"
+ "deepseq"
+ "directory"
+ "filepath"
+ "ghc-boot"
+ "ghc-boot-th"
+ "ghc-prim"
+ "ghci"
+ "ghcjs-prim"
+ "ghcjs-th"
+ "integer-gmp"
+ "pretty"
+ "primitive"
+ "process"
+ "rts"
+ "template-haskell"
+ "time"
+ "transformers"
+ "unix"
+ ]
+
+, stage2 ? import ./stage2.nix
+}:
+let
+ inherit (bootPkgs) ghc;
+
+in mkDerivation (rec {
+ pname = "ghcjs";
+ inherit version;
+ src = ghcjsSrc;
+ isLibrary = true;
+ isExecutable = true;
+ jailbreak = true;
+ doHaddock = false;
+ doCheck = false;
+ buildDepends = [
+ filepath HTTP mtl network random stm time zlib aeson attoparsec
+ bzlib data-default ghc-paths hashable haskell-src-exts haskell-src-meta
+ lens optparse-applicative parallel safe shelly split
+ stringsearch syb system-fileio system-filepath tar terminfo text-binary
+ unordered-containers vector wl-pprint-text yaml
+ alex happy git gnumake autoconf automake libtool patch gmp
+ base16-bytestring cryptohash executable-path haddock-api
+ transformers-compat QuickCheck haddock hspec xhtml
+ ghcjs-prim regex-posix libiconv
+ ];
+ buildTools = [ nodejs git ];
+ testDepends = [
+ HUnit test-framework test-framework-hunit
+ ];
+ patches = [ ./ghcjs.patch ];
+ postPatch = ''
+ substituteInPlace Setup.hs \
+ --replace "/usr/bin/env" "${coreutils}/bin/env"
+
+ substituteInPlace src/Compiler/Info.hs \
+ --replace "@PREFIX@" "$out" \
+ --replace "@VERSION@" "${version}"
+
+ substituteInPlace src-bin/Boot.hs \
+ --replace "@PREFIX@" "$out" \
+ --replace "@CC@" "${stdenv.cc}/bin/cc"
+ '';
+ preBuild = ''
+ export HOME="$TMP"
+
+ local topDir=$out/lib/ghcjs-${version}
+ mkdir -p $topDir
+
+ cp -r ${ghcjsBoot} $topDir/ghcjs-boot
+ chmod -R u+w $topDir/ghcjs-boot
+
+ cp -r ${shims} $topDir/shims
+ chmod -R u+w $topDir/shims
+
+ # Make the patches be relative their corresponding package's directory.
+ # See: https://github.com/ghcjs/ghcjs-boot/pull/12
+ for patch in "$topDir/ghcjs-boot/patches/"*.patch; do
+ echo "fixing patch: $patch"
+ sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch
+ done
+ '';
+ # We build with --quick so we can build stage 2 packages separately.
+ # This is necessary due to: https://github.com/haskell/cabal/commit/af19fb2c2d231d8deff1cb24164a2bf7efb8905a
+ # Cabal otherwise fails to build: http://hydra.nixos.org/build/31824079/nixlog/1/raw
+ postInstall = ''
+ PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp.out}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \
+ env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \
+ --dev \
+ --quick \
+ --with-cabal ${cabal-install}/bin/cabal \
+ --with-gmp-includes ${gmp.dev}/include \
+ --with-gmp-libraries ${gmp.out}/lib
+ '';
+ passthru = let
+ ghcjsNodePkgs = callPackage ../../../top-level/node-packages.nix {
+ generated = ./node-packages-generated.nix;
+ self = ghcjsNodePkgs;
+ };
+ in {
+ inherit bootPkgs;
+ isCross = true;
+ isGhcjs = true;
+ inherit nodejs ghcjsBoot;
+ inherit (ghcjsNodePkgs) "socket.io";
+
+ inherit stage1Packages;
+ mkStage2 = stage2 {
+ inherit ghcjsBoot;
+ };
+ };
+
+ homepage = "https://github.com/ghcjs/ghcjs";
+ description = "A Haskell to JavaScript compiler that uses the GHC API";
+ license = stdenv.lib.licenses.bsd3;
+ platforms = ghc.meta.platforms;
+ maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
+})
diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 565215f474ea..7400057b128f 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -1,179 +1,3 @@
-{ mkDerivation
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
-, data-default
-, ghc-paths
-, haskell-src-exts
-, haskell-src-meta
-, optparse-applicative
-, system-fileio
-, system-filepath
-, text-binary
-, unordered-containers
-, cabal-install
-, wl-pprint-text
-, base16-bytestring
-, executable-path
-, transformers-compat
-, haddock-api
-, ghcjs-prim
-, regex-posix
-, callPackage
+{ bootPkgs }:
-, bootPkgs, gmp
-, jailbreak-cabal
-
-, runCommand
-, nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm
-, time
-, zlib, aeson, attoparsec, bzlib, hashable
-, lens
-, parallel, safe, shelly, split, stringsearch, syb
-, tar, terminfo
-, vector, yaml, fetchgit, fetchFromGitHub, Cabal
-, alex, happy, git, gnumake, autoconf, patch
-, automake, libtool
-, cryptohash
-, haddock, hspec, xhtml, primitive, cacert, pkgs
-, coreutils
-, libiconv
-
-, ghcjsBootSrc ? fetchgit {
- url = git://github.com/ghcjs/ghcjs-boot.git;
- rev = "8c549931da27ba9e607f77195208ec156c840c8a";
- sha256 = "0yg9bnabja39qysh9pg1335qbvbc0r2mdw6cky94p7kavacndfdv";
- fetchSubmodules = true;
- }
-, ghcjsBoot ? import ./ghcjs-boot.nix {
- inherit runCommand;
- src = ghcjsBootSrc;
- }
-, shims ? import ./shims.nix { inherit fetchFromGitHub; }
-}:
-let
- inherit (bootPkgs) ghc;
- version = "0.2.0";
-
-in mkDerivation (rec {
- pname = "ghcjs";
- inherit version;
- src = fetchFromGitHub {
- owner = "ghcjs";
- repo = "ghcjs";
- rev = "689c7753f50353dd05606ed79c51cd5a94d3922a";
- sha256 = "076020a9gjv8ldj5ckm43sbzq9s6c5xj6lpd8v28ybpiama3m6b4";
- };
- isLibrary = true;
- isExecutable = true;
- jailbreak = true;
- doHaddock = false;
- doCheck = false;
- buildDepends = [
- filepath HTTP mtl network random stm time zlib aeson attoparsec
- bzlib data-default ghc-paths hashable haskell-src-exts haskell-src-meta
- lens optparse-applicative parallel safe shelly split
- stringsearch syb system-fileio system-filepath tar terminfo text-binary
- unordered-containers vector wl-pprint-text yaml
- alex happy git gnumake autoconf automake libtool patch gmp
- base16-bytestring cryptohash executable-path haddock-api
- transformers-compat QuickCheck haddock hspec xhtml
- ghcjs-prim regex-posix libiconv
- ];
- buildTools = [ nodejs git ];
- testDepends = [
- HUnit test-framework test-framework-hunit
- ];
- patches = [ ./ghcjs.patch ];
- postPatch = ''
- substituteInPlace Setup.hs \
- --replace "/usr/bin/env" "${coreutils}/bin/env"
-
- substituteInPlace src/Compiler/Info.hs \
- --replace "@PREFIX@" "$out" \
- --replace "@VERSION@" "${version}"
-
- substituteInPlace src-bin/Boot.hs \
- --replace "@PREFIX@" "$out" \
- --replace "@CC@" "${stdenv.cc}/bin/cc"
- '';
- preBuild = ''
- export HOME="$TMP"
-
- local topDir=$out/lib/ghcjs-${version}
- mkdir -p $topDir
-
- cp -r ${ghcjsBoot} $topDir/ghcjs-boot
- chmod -R u+w $topDir/ghcjs-boot
-
- cp -r ${shims} $topDir/shims
- chmod -R u+w $topDir/shims
-
- # Make the patches be relative their corresponding package's directory.
- # See: https://github.com/ghcjs/ghcjs-boot/pull/12
- for patch in "$topDir/ghcjs-boot/patches/"*.patch; do
- echo "fixing patch: $patch"
- sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch
- done
- '';
- # We build with --quick so we can build stage 2 packages separately.
- # This is necessary due to: https://github.com/haskell/cabal/commit/af19fb2c2d231d8deff1cb24164a2bf7efb8905a
- # Cabal otherwise fails to build: http://hydra.nixos.org/build/31824079/nixlog/1/raw
- postInstall = ''
- PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp.out}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \
- env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \
- --dev \
- --quick \
- --with-cabal ${cabal-install}/bin/cabal \
- --with-gmp-includes ${gmp.dev}/include \
- --with-gmp-libraries ${gmp.out}/lib
- '';
- passthru = let
- ghcjsNodePkgs = callPackage ../../../top-level/node-packages.nix {
- generated = ./node-packages-generated.nix;
- self = ghcjsNodePkgs;
- };
- in {
- inherit bootPkgs;
- isCross = true;
- isGhcjs = true;
- inherit nodejs ghcjsBoot;
- inherit (ghcjsNodePkgs) "socket.io";
-
- # This is the list of the Stage 1 packages that are built into a booted ghcjs installation
- # It can be generated with the command:
- # nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/^\([^_]*\)\(.*\)$/ \"\1\"/'"
- stage1Packages = [
- "array"
- "base"
- "binary"
- "rts"
- "bytestring"
- "containers"
- "deepseq"
- "directory"
- "filepath"
- "ghc-prim"
- "ghcjs-prim"
- "integer-gmp"
- "old-locale"
- "pretty"
- "primitive"
- "process"
- "template-haskell"
- "time"
- "transformers"
- "unix"
- ];
-
- mkStage2 = import ./stage2.nix {
- inherit ghcjsBoot;
- };
- };
-
- homepage = "https://github.com/ghcjs/ghcjs";
- description = "A Haskell to JavaScript compiler that uses the GHC API";
- license = stdenv.lib.licenses.bsd3;
- platforms = ghc.meta.platforms;
- maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
-})
+bootPkgs.callPackage ./base.nix { inherit bootPkgs; }
diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix
index 2bf13cb895f5..b191f9655d2a 100644
--- a/pkgs/development/compilers/ghcjs/head.nix
+++ b/pkgs/development/compilers/ghcjs/head.nix
@@ -1,178 +1,50 @@
-{ mkDerivation
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
-, data-default
-, ghc-paths
-, haskell-src-exts
-, haskell-src-meta
-, optparse-applicative
-, system-fileio
-, system-filepath
-, text-binary
-, unordered-containers
-, cabal-install
-, wl-pprint-text
-, base16-bytestring
-, executable-path
-, transformers-compat
-, haddock-api
-, regex-posix
-, callPackage
+{ fetchgit, fetchFromGitHub, bootPkgs }:
-, bootPkgs, gmp
-, jailbreak-cabal
-
-, runCommand
-, nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm
-, time
-, zlib, aeson, attoparsec, bzlib, hashable
-, lens
-, parallel, safe, shelly, split, stringsearch, syb
-, tar, terminfo
-, vector, yaml, fetchgit, fetchFromGitHub, Cabal
-, alex, happy, git, gnumake, autoconf, patch
-, automake, libtool
-, cryptohash
-, haddock, hspec, xhtml, primitive, cacert, pkgs
-, coreutils
-, libiconv
-
-, ghcjsBootSrc ? fetchgit {
- url = git://github.com/ghcjs/ghcjs-boot.git;
- rev = "b000a4f4619b850bf3f9a45c9058f7a51e7709c8";
- sha256 = "164v0xf33r6mnympp6s70v8j6g7ccyg7z95gjp43bq150ppvisbq";
- fetchSubmodules = true;
- }
-, ghcjsBoot ? import ./ghcjs-boot.nix {
- inherit runCommand;
- src = ghcjsBootSrc;
- }
-, shims ? import ./head_shims.nix { inherit fetchFromGitHub; }
-}:
-let
- inherit (bootPkgs) ghc;
+bootPkgs.callPackage ./base.nix {
version = "0.2.020161101";
-in mkDerivation (rec {
- pname = "ghcjs";
- inherit version;
- src = fetchFromGitHub {
+ # deprecated on HEAD, directly included in the distribution
+ ghcjs-prim = null;
+ inherit bootPkgs;
+
+ ghcjsSrc = fetchFromGitHub {
owner = "ghcjs";
repo = "ghcjs";
rev = "899c834a36692bbbde9b9d16fe5b92ce55a623c4";
sha256 = "024yj4k0dxy7nvyq19n3xbhh4b4csdrgj19a3l4bmm1zn84gmpl6";
};
- isLibrary = true;
- isExecutable = true;
- jailbreak = true;
- doHaddock = false;
- doCheck = false;
- buildDepends = [
- filepath HTTP mtl network random stm time zlib aeson attoparsec
- bzlib data-default ghc-paths hashable haskell-src-exts haskell-src-meta
- lens optparse-applicative parallel safe shelly split
- stringsearch syb system-fileio system-filepath tar terminfo text-binary
- unordered-containers vector wl-pprint-text yaml
- alex happy git gnumake autoconf automake libtool patch gmp
- base16-bytestring cryptohash executable-path haddock-api
- transformers-compat QuickCheck haddock hspec xhtml
- regex-posix libiconv
- ];
- buildTools = [ nodejs git ];
- testDepends = [
- HUnit test-framework test-framework-hunit
- ];
- patches = [ ./ghcjs.patch ];
- postPatch = ''
- substituteInPlace Setup.hs \
- --replace "/usr/bin/env" "${coreutils}/bin/env"
-
- substituteInPlace src/Compiler/Info.hs \
- --replace "@PREFIX@" "$out" \
- --replace "@VERSION@" "${version}"
-
- substituteInPlace src-bin/Boot.hs \
- --replace "@PREFIX@" "$out" \
- --replace "@CC@" "${stdenv.cc}/bin/cc"
- '';
- preBuild = ''
- export HOME="$TMP"
-
- local topDir=$out/lib/ghcjs-${version}
- mkdir -p $topDir
-
- cp -r ${ghcjsBoot} $topDir/ghcjs-boot
- chmod -R u+w $topDir/ghcjs-boot
-
- cp -r ${shims} $topDir/shims
- chmod -R u+w $topDir/shims
-
- # Make the patches be relative their corresponding package's directory.
- # See: https://github.com/ghcjs/ghcjs-boot/pull/12
- for patch in "$topDir/ghcjs-boot/patches/"*.patch; do
- echo "fixing patch: $patch"
- sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch
- done
- '';
- # We build with --quick so we can build stage 2 packages separately.
- # This is necessary due to: https://github.com/haskell/cabal/commit/af19fb2c2d231d8deff1cb24164a2bf7efb8905a
- # Cabal otherwise fails to build: http://hydra.nixos.org/build/31824079/nixlog/1/raw
- postInstall = ''
- PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp.out}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \
- env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \
- --dev \
- --quick \
- --with-cabal ${cabal-install}/bin/cabal \
- --with-gmp-includes ${gmp.dev}/include \
- --with-gmp-libraries ${gmp.out}/lib
- '';
- passthru = let
- ghcjsNodePkgs = callPackage ../../../top-level/node-packages.nix {
- generated = ./node-packages-generated.nix;
- self = ghcjsNodePkgs;
- };
- in {
- inherit bootPkgs;
- isCross = true;
- isGhcjs = true;
- inherit nodejs ghcjsBoot;
- inherit (ghcjsNodePkgs) "socket.io";
-
- # This is the list of the Stage 1 packages that are built into a booted ghcjs installation
- # It can be generated with the command:
- # nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/^\([^_]*\)\(.*\)$/ \"\1\"/'"
- stage1Packages = [
- "array"
- "base"
- "binary"
- "rts"
- "bytestring"
- "containers"
- "deepseq"
- "directory"
- "filepath"
- "ghc-prim"
- "ghcjs-prim"
- "integer-gmp"
- "old-locale"
- "pretty"
- "primitive"
- "process"
- "template-haskell"
- "time"
- "transformers"
- "unix"
- ];
-
- mkStage2 = import ./stage2.nix {
- inherit ghcjsBoot;
- };
+ ghcjsBootSrc = fetchgit {
+ url = git://github.com/ghcjs/ghcjs-boot.git;
+ rev = "b000a4f4619b850bf3f9a45c9058f7a51e7709c8";
+ sha256 = "164v0xf33r6mnympp6s70v8j6g7ccyg7z95gjp43bq150ppvisbq";
+ fetchSubmodules = true;
};
- homepage = "https://github.com/ghcjs/ghcjs";
- description = "A Haskell to JavaScript compiler that uses the GHC API";
- license = stdenv.lib.licenses.bsd3;
- platforms = ghc.meta.platforms;
- maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
-})
+ shims = import ./head_shims.nix { inherit fetchFromGitHub; };
+ stage1Packages = [
+ "array"
+ "base"
+ "binary"
+ "bytestring"
+ "containers"
+ "deepseq"
+ "directory"
+ "filepath"
+ "ghc-boot"
+ "ghc-boot-th"
+ "ghc-prim"
+ "ghci"
+ "ghcjs-prim"
+ "ghcjs-th"
+ "integer-gmp"
+ "pretty"
+ "primitive"
+ "process"
+ "rts"
+ "template-haskell"
+ "time"
+ "transformers"
+ "unix"
+ ];
+ stage2 = import ./head_stage2.nix;
+}
diff --git a/pkgs/development/compilers/ghcjs/head_shims.nix b/pkgs/development/compilers/ghcjs/head_shims.nix
index e321978f0bdc..68b03d057397 100644
--- a/pkgs/development/compilers/ghcjs/head_shims.nix
+++ b/pkgs/development/compilers/ghcjs/head_shims.nix
@@ -2,6 +2,6 @@
fetchFromGitHub {
owner = "ghcjs";
repo = "shims";
- rev = "1f555d3ca072c61862cc35f92f5ac05f3b938a37";
- sha256 = "1pciyrlrp5i9s4s8ai4dvhihcahazva6fg0graxxxkjdvnl789ws";
+ rev = "f67394c559ac921a768b12f141499119563b8bf3";
+ sha256 = "1lz86qmkxkfch1yk9a62admw7jsd34sqcrskgpq28hbhjpgzf1lv";
}
diff --git a/pkgs/development/compilers/ghcjs/head_stage2.nix b/pkgs/development/compilers/ghcjs/head_stage2.nix
new file mode 100644
index 000000000000..765a384bf634
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs/head_stage2.nix
@@ -0,0 +1,345 @@
+{ ghcjsBoot }: { callPackage }:
+
+{
+ async = callPackage
+ ({ mkDerivation, base, HUnit, stdenv, stm, test-framework
+ , test-framework-hunit
+ }:
+ mkDerivation {
+ pname = "async";
+ version = "2.1.0";
+ src = "${ghcjsBoot}/boot/async";
+ doCheck = false;
+ libraryHaskellDepends = [ base stm ];
+ testHaskellDepends = [
+ base HUnit test-framework test-framework-hunit
+ ];
+ jailbreak = true;
+ homepage = "https://github.com/simonmar/async";
+ description = "Run IO operations asynchronously and wait for their results";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+ aeson = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
+ , dlist, fail, ghc-prim, hashable, HUnit, mtl, QuickCheck, scientific
+ , stdenv, syb, tagged, template-haskell, test-framework
+ , test-framework-hunit, test-framework-quickcheck2, text, time
+ , transformers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "aeson";
+ version = "0.11.2.0";
+ src = "${ghcjsBoot}/boot/aeson";
+ doCheck = false;
+ libraryHaskellDepends = [
+ attoparsec base bytestring containers deepseq dlist fail ghc-prim
+ hashable mtl scientific syb tagged template-haskell text time transformers
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ attoparsec base bytestring containers ghc-prim HUnit QuickCheck
+ template-haskell test-framework test-framework-hunit
+ test-framework-quickcheck2 text time unordered-containers vector
+ ];
+ jailbreak = true;
+ homepage = "https://github.com/bos/aeson";
+ description = "Fast JSON parsing and encoding";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+ attoparsec = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, deepseq
+ , QuickCheck, quickcheck-unicode, scientific, stdenv
+ , test-framework, test-framework-quickcheck2, text, transformers
+ , vector
+ }:
+ mkDerivation {
+ pname = "attoparsec";
+ version = "0.13.0.2";
+ src = "${ghcjsBoot}/boot/attoparsec";
+ doCheck = false;
+ libraryHaskellDepends = [
+ array base bytestring containers deepseq scientific text
+ transformers
+ ];
+ testHaskellDepends = [
+ array base bytestring containers deepseq QuickCheck
+ quickcheck-unicode scientific test-framework
+ test-framework-quickcheck2 text transformers vector
+ ];
+ jailbreak = true;
+ homepage = "https://github.com/bos/attoparsec";
+ description = "Fast combinator parsing for bytestrings and text";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+ case-insensitive = callPackage
+ ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit, stdenv
+ , test-framework, test-framework-hunit, text
+ }:
+ mkDerivation {
+ pname = "case-insensitive";
+ version = "1.2.0.6";
+ src = "${ghcjsBoot}/boot/case-insensitive";
+ doCheck = false;
+ libraryHaskellDepends = [ base bytestring deepseq hashable text ];
+ testHaskellDepends = [
+ base bytestring HUnit test-framework test-framework-hunit text
+ ];
+ jailbreak = true;
+ homepage = "https://github.com/basvandijk/case-insensitive";
+ description = "Case insensitive string comparison";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+ dlist = callPackage
+ ({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }:
+ mkDerivation {
+ pname = "dlist";
+ version = "0.7.1.2";
+ src = "${ghcjsBoot}/boot/dlist";
+ doCheck = false;
+ libraryHaskellDepends = [ base deepseq ];
+ testHaskellDepends = [ base Cabal QuickCheck ];
+ jailbreak = true;
+ homepage = "https://github.com/spl/dlist";
+ description = "Difference lists";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+ extensible-exceptions = callPackage
+ ({ mkDerivation, base, stdenv }:
+ mkDerivation {
+ pname = "extensible-exceptions";
+ version = "0.1.1.4";
+ src = "${ghcjsBoot}/boot/extensible-exceptions";
+ doCheck = false;
+ libraryHaskellDepends = [ base ];
+ jailbreak = true;
+ description = "Extensible exceptions";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+ hashable = callPackage
+ ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp
+ , QuickCheck, random, stdenv, test-framework, test-framework-hunit
+ , test-framework-quickcheck2, text, unix
+ }:
+ mkDerivation {
+ pname = "hashable";
+ version = "1.2.4.0";
+ src = "${ghcjsBoot}/boot/hashable";
+ doCheck = false;
+ libraryHaskellDepends = [
+ base bytestring ghc-prim integer-gmp text
+ ];
+ testHaskellDepends = [
+ base bytestring ghc-prim HUnit QuickCheck random test-framework
+ test-framework-hunit test-framework-quickcheck2 text unix
+ ];
+ jailbreak = true;
+ homepage = "http://github.com/tibbe/hashable";
+ description = "A class for types that can be converted to a hash value";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+ mtl = callPackage
+ ({ mkDerivation, base, stdenv, transformers }:
+ mkDerivation {
+ pname = "mtl";
+ version = "2.2.2";
+ src = "${ghcjsBoot}/boot/mtl";
+ doCheck = false;
+ libraryHaskellDepends = [ base transformers ];
+ jailbreak = true;
+ homepage = "http://github.com/ekmett/mtl";
+ description = "Monad classes, using functional dependencies";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+ old-time = callPackage
+ ({ mkDerivation, base, old-locale, stdenv }:
+ mkDerivation {
+ pname = "old-time";
+ version = "1.1.0.3";
+ src = "${ghcjsBoot}/boot/old-time";
+ doCheck = false;
+ libraryHaskellDepends = [ base old-locale ];
+ jailbreak = true;
+ description = "Time library";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+ parallel = callPackage
+ ({ mkDerivation, array, base, containers, deepseq, stdenv }:
+ mkDerivation {
+ pname = "parallel";
+ version = "3.2.1.0";
+ src = "${ghcjsBoot}/boot/parallel";
+ doCheck = false;
+ libraryHaskellDepends = [ array base containers deepseq ];
+ jailbreak = true;
+ description = "Parallel programming library";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+ scientific = callPackage
+ ({ mkDerivation, base, binary, bytestring, containers, deepseq, ghc-prim
+ , hashable, integer-gmp, QuickCheck, smallcheck, stdenv, tasty
+ , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck
+ , text, vector
+ }:
+ mkDerivation {
+ pname = "scientific";
+ version = "0.3.4.7";
+ src = "${ghcjsBoot}/boot/scientific";
+ doCheck = false;
+ libraryHaskellDepends = [
+ base binary bytestring containers deepseq ghc-prim hashable
+ integer-gmp text vector
+ ];
+ testHaskellDepends = [
+ base bytestring QuickCheck smallcheck tasty tasty-ant-xml
+ tasty-hunit tasty-quickcheck tasty-smallcheck text
+ ];
+ jailbreak = true;
+ homepage = "https://github.com/basvandijk/scientific";
+ description = "Numbers represented using scientific notation";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+ stm = callPackage
+ ({ mkDerivation, array, base, stdenv }:
+ mkDerivation {
+ pname = "stm";
+ version = "2.4.4.1";
+ src = "${ghcjsBoot}/boot/stm";
+ doCheck = false;
+ libraryHaskellDepends = [ array base ];
+ jailbreak = true;
+ description = "Software Transactional Memory";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+ syb = callPackage
+ ({ mkDerivation, base, containers, HUnit, mtl, stdenv }:
+ mkDerivation {
+ pname = "syb";
+ version = "0.6";
+ src = "${ghcjsBoot}/boot/syb";
+ doCheck = false;
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base containers HUnit mtl ];
+ jailbreak = true;
+ homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
+ description = "Scrap Your Boilerplate";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+ text = callPackage
+ ({ mkDerivation, array, base, binary, bytestring, deepseq, directory
+ , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode
+ , random, stdenv, test-framework, test-framework-hunit
+ , test-framework-quickcheck2
+ }:
+ mkDerivation {
+ pname = "text";
+ version = "1.2.2.1";
+ src = "${ghcjsBoot}/boot/text";
+ doCheck = false;
+ libraryHaskellDepends = [
+ array base binary bytestring deepseq ghc-prim integer-gmp
+ ];
+ testHaskellDepends = [
+ array base binary bytestring deepseq directory ghc-prim HUnit
+ integer-gmp QuickCheck quickcheck-unicode random test-framework
+ test-framework-hunit test-framework-quickcheck2
+ ];
+ jailbreak = true;
+ homepage = "https://github.com/bos/text";
+ description = "An efficient packed Unicode text type";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+ unordered-containers = callPackage
+ ({ mkDerivation, base, ChasingBottoms, containers, deepseq, hashable
+ , HUnit, QuickCheck, stdenv, test-framework, test-framework-hunit
+ , test-framework-quickcheck2
+ }:
+ mkDerivation {
+ pname = "unordered-containers";
+ version = "0.2.7.0";
+ src = "${ghcjsBoot}/boot/unordered-containers";
+ doCheck = false;
+ libraryHaskellDepends = [ base deepseq hashable ];
+ testHaskellDepends = [
+ base ChasingBottoms containers hashable HUnit QuickCheck
+ test-framework test-framework-hunit test-framework-quickcheck2
+ ];
+ jailbreak = true;
+ homepage = "https://github.com/tibbe/unordered-containers";
+ description = "Efficient hashing-based container types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+ vector = callPackage
+ ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck
+ , random, stdenv, template-haskell, test-framework
+ , test-framework-quickcheck2, transformers
+ }:
+ mkDerivation {
+ pname = "vector";
+ version = "0.11.0.0";
+ src = "${ghcjsBoot}/boot/vector";
+ doCheck = false;
+ libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
+ testHaskellDepends = [
+ base QuickCheck random template-haskell test-framework
+ test-framework-quickcheck2 transformers
+ ];
+ jailbreak = true;
+ homepage = "https://github.com/haskell/vector";
+ description = "Efficient Arrays";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+ ghcjs-base = callPackage
+ ({ mkDerivation, aeson, array, attoparsec, base, bytestring
+ , containers, deepseq, directory, dlist, ghc-prim, ghcjs-prim
+ , hashable, HUnit, integer-gmp, primitive, QuickCheck
+ , quickcheck-unicode, random, scientific, stdenv, test-framework
+ , test-framework-hunit, test-framework-quickcheck2, text, time
+ , transformers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "ghcjs-base";
+ version = "0.2.0.0";
+ src = "${ghcjsBoot}/ghcjs/ghcjs-base";
+ doCheck = false;
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring containers deepseq dlist ghc-prim
+ ghcjs-prim hashable integer-gmp primitive scientific text time
+ transformers unordered-containers vector
+ ];
+ testHaskellDepends = [
+ array base bytestring deepseq directory ghc-prim ghcjs-prim HUnit
+ primitive QuickCheck quickcheck-unicode random test-framework
+ test-framework-hunit test-framework-quickcheck2 text
+ ];
+ jailbreak = true;
+ homepage = "http://github.com/ghcjs/ghcjs-base";
+ description = "Base library for GHCJS";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+ Cabal = callPackage
+ ({ mkDerivation, array, base, binary, bytestring, containers
+ , deepseq, directory, extensible-exceptions, filepath, HUnit
+ , old-time, pretty, process, QuickCheck, regex-posix, stdenv
+ , test-framework, test-framework-hunit, test-framework-quickcheck2
+ , time, unix
+ }:
+ mkDerivation {
+ pname = "Cabal";
+ version = "1.24.0.0";
+ src = "${ghcjsBoot}/boot/cabal/Cabal";
+ doCheck = false;
+ libraryHaskellDepends = [
+ array base binary bytestring containers deepseq directory filepath
+ pretty process time unix
+ ];
+ testHaskellDepends = [
+ base bytestring containers directory extensible-exceptions filepath
+ HUnit old-time process QuickCheck regex-posix test-framework
+ test-framework-hunit test-framework-quickcheck2 unix
+ ];
+ jailbreak = true;
+ homepage = "http://www.haskell.org/cabal/";
+ description = "A framework for packaging Haskell software";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+}
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index e1bff12f398e..57480974a3f1 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -93,6 +93,10 @@ stdenv.mkDerivation {
# Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835
rm -vr src/test/run-pass/issue-36023.rs
+ # Disable test getting stuck on hydra - possible fix:
+ # https://reviews.llvm.org/rL281650
+ rm -vr src/test/run-pass/issue-36474.rs
+
# Useful debugging parameter
# export VERBOSE=1
'' +
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 095555bfec40..f46735e55511 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -4,6 +4,11 @@ with import ./lib.nix { inherit pkgs; };
self: super: {
+ # Some Hackage packages reference this attribute, which exists only in the
+ # GHCJS package set. We provide a dummy version here to fix potential
+ # evaluation errors.
+ ghcjs-base = null;
+
# Some packages need a non-core version of Cabal.
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_1_0; });
@@ -43,7 +48,7 @@ self: super: {
src = pkgs.fetchFromGitHub {
owner = "joeyh";
repo = "git-annex";
- sha256 = "0bi4ynhjx265yaryx7yd5wmwf44hav8bmhkj0knwynb6kpl92qp8";
+ sha256 = "0yy4fdk0sp19hc838j82sls68l5wnrhr55zzs0gbqnagna77cxhd";
rev = drv.version;
};
})).overrideScope (self: super: {
@@ -984,6 +989,25 @@ self: super: {
# The latest Hoogle needs versions not yet in LTS Haskell 7.x.
hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_18_2; };
+ # To be in sync with Hoogle.
+ lambdabot-haskell-plugins = (overrideCabal super.lambdabot-haskell-plugins (drv: {
+ patches = [
+ (pkgs.fetchpatch {
+ url = "https://github.com/lambdabot/lambdabot/commit/78a2361024724acb70bc1c12c42f3a16015bb373.patch";
+ sha256 = "0aw0jpw07idkrg8pdn3y3qzhjfrxsvmx3plg51m1aqgbzs000yxf";
+ stripLen = 2;
+ addPrefixes = true;
+ })
+ ];
+
+ jailbreak = true;
+ })).override {
+ haskell-src-exts = self.haskell-src-exts-simple;
+ };
+
+ # Needs new version.
+ haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_18_2; };
+
# Test suite fails a QuickCheck property.
optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0;
@@ -1077,4 +1101,21 @@ self: super: {
# https://github.com/josefs/STMonadTrans/issues/4
STMonadTrans = dontCheck super.STMonadTrans;
+ socket_0_7_0_0 = super.socket_0_7_0_0.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_9_2; });
+
+ # 0.5.6 invokes $PAGER in a way that crashes if there are args such as $PAGER="less -R"
+ ghc-core = overrideCabal super.ghc-core (drv: {
+ src = pkgs.fetchFromGitHub {
+ owner = "shachaf";
+ repo = "ghc-core";
+ rev = "630196adf0bebf073328325302453ef1c409fd9a";
+ sha256 = "05jzpjy5zkri2faw5jnq5vh12mx58lrb0zfzz4h598miq2vc8848";
+ };
+ version = "2012-12-15";
+ });
+
+ # Encountered missing dependencies: hspec >=1.3 && <2.1
+ # https://github.com/rampion/ReadArgs/issues/8
+ ReadArgs = doJailbreak super.ReadArgs;
+
}
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index c97296cd5bad..894022c176be 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -1,3 +1,7 @@
+# GHCJS package fixes
+#
+# Please insert new packages *alphabetically*
+# in the OTHER PACKAGES section.
{ pkgs }:
let
@@ -9,6 +13,8 @@ with import ./lib.nix { inherit pkgs; };
self: super:
+## GENERAL SETUP BASE PACKAGES
+
let # The stage 1 packages
stage1 = pkgs.lib.genAttrs super.ghc.stage1Packages (pkg: null);
# The stage 2 packages. Regenerate with ../compilers/ghcjs/gen-stage2.rb
@@ -47,24 +53,26 @@ self: super:
terminfo = self.terminfo_0_4_0_1;
xhtml = self.xhtml_3000_2_1;
- pqueue = overrideCabal super.pqueue (drv: {
- postPatch = ''
- sed -i -e '12s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs
- sed -i -e '64s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs
- sed -i -e '32s|null|Data.PQueue.Internals.null|' Data/PQueue/Min.hs
- sed -i -e '32s|null|Data.PQueue.Max.null|' Data/PQueue/Max.hs
- sed -i -e '42s|null|Data.PQueue.Prio.Internals.null|' Data/PQueue/Prio/Min.hs
- sed -i -e '42s|null|Data.PQueue.Prio.Max.null|' Data/PQueue/Prio/Max.hs
+
+## OTHER PACKAGES
+
+ cereal = addBuildDepend super.cereal [ self.fail ];
+
+ entropy = overrideCabal super.entropy (old: {
+ postPatch = old.postPatch or "" + ''
+ # cabal doesn’t find ghc in this script, since it’s in the bootPkgs
+ sed -e '/Simple.Program/a import Distribution.Simple.Program.Types' \
+ -e 's|mConf.*=.*$|mConf = Just $ simpleConfiguredProgram "ghc" (FoundOnSystem "${self.ghc.bootPkgs.ghc}/bin/ghc")|g' -i Setup.hs
'';
});
- transformers-compat = overrideCabal super.transformers-compat (drv: {
- configureFlags = [];
- });
-
- profunctors = overrideCabal super.profunctors (drv: {
- preConfigure = ''
- sed -i 's/^{-# ANN .* #-}//' src/Data/Profunctor/Unsafe.hs
+ # https://github.com/kazu-yamamoto/logger/issues/97
+ fast-logger = overrideCabal super.fast-logger (old: {
+ postPatch = old.postPatch or "" + ''
+ # remove the Safe extensions, since ghcjs-boot directory
+ # doesn’t provide Trustworthy
+ sed -ie '/LANGUAGE Safe/d' System/Log/FastLogger/*.hs
+ cat System/Log/FastLogger/Date.hs
'';
});
@@ -88,16 +96,43 @@ self: super:
}) {};
ghcjs-dom = overrideCabal super.ghcjs-dom (drv: {
- libraryHaskellDepends = [ self.ghcjs-base ] ++
- removeLibraryHaskellDepends [
- "glib" "gtk" "gtk3" "webkitgtk" "webkitgtk3"
- ] drv.libraryHaskellDepends;
+ libraryHaskellDepends = with self; [
+ ghcjs-base ghcjs-dom-jsffi text transformers
+ ];
+ configureFlags = [ "-fjsffi" "-f-webkit" ];
+ });
+
+ ghcjs-dom-jsffi = overrideCabal super.ghcjs-dom-jsffi (drv: {
+ libraryHaskellDepends = [ self.ghcjs-base self.text ];
+ isLibrary = true;
});
ghc-paths = overrideCabal super.ghc-paths (drv: {
patches = [ ./patches/ghc-paths-nix-ghcjs.patch ];
});
+ http2 = addBuildDepends super.http2 [ self.aeson self.aeson-pretty self.hex self.unordered-containers self.vector self.word8 ];
+ # ghcjsBoot uses async 2.0.1.6, protolude wants 2.1.*
+
+ pqueue = overrideCabal super.pqueue (drv: {
+ postPatch = ''
+ sed -i -e '12s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs
+ sed -i -e '64s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs
+ sed -i -e '32s|null|Data.PQueue.Internals.null|' Data/PQueue/Min.hs
+ sed -i -e '32s|null|Data.PQueue.Max.null|' Data/PQueue/Max.hs
+ sed -i -e '42s|null|Data.PQueue.Prio.Internals.null|' Data/PQueue/Prio/Min.hs
+ sed -i -e '42s|null|Data.PQueue.Prio.Max.null|' Data/PQueue/Prio/Max.hs
+ '';
+ });
+
+ profunctors = overrideCabal super.profunctors (drv: {
+ preConfigure = ''
+ sed -i 's/^{-# ANN .* #-}//' src/Data/Profunctor/Unsafe.hs
+ '';
+ });
+
+ protolude = doJailbreak super.protolude;
+
# reflex 0.3, made compatible with the newest GHCJS.
reflex = overrideCabal super.reflex (drv: {
src = pkgs.fetchFromGitHub {
@@ -122,12 +157,13 @@ self: super:
] drv.libraryHaskellDepends;
});
- http2 = addBuildDepends super.http2 [ self.aeson self.aeson-pretty self.hex self.unordered-containers self.vector self.word8 ];
- # ghcjsBoot uses async 2.0.1.6, protolude wants 2.1.*
- protolude = doJailbreak super.protolude;
semigroups = addBuildDepends super.semigroups [ self.hashable self.unordered-containers self.text self.tagged ];
+
+ transformers-compat = overrideCabal super.transformers-compat (drv: {
+ configureFlags = [];
+ });
+
# triggers an internal pattern match failure in haddock
# https://github.com/haskell/haddock/issues/553
wai = dontHaddock super.wai;
- cereal = addBuildDepend super.cereal [ self.fail ];
}
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 1ccdbecc8d81..1958c7cc4f72 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -31,6 +31,11 @@ core-packages:
- unix-2.7.2.0
- xhtml-3000.2.1
+ # Hack: The following package is a core package of GHCJS. If we don't declare
+ # it, then hackage2nix will generate a Hackage database where all dependants
+ # if this library are maked as "broken".
+ - ghcjs-base-0
+
default-package-overrides:
# LTS Haskell 7.9
- abstract-deque ==0.3
@@ -2071,7 +2076,6 @@ package-maintainers:
- shakespeare
abbradar:
- Agda
- - lambdabot
dont-distribute-packages:
# hard restrictions that really belong into meta.platforms
@@ -2584,6 +2588,7 @@ dont-distribute-packages:
breakout: [ i686-linux, x86_64-linux, x86_64-darwin ]
breve: [ i686-linux, x86_64-linux, x86_64-darwin ]
brians-brain: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ brick: [ i686-linux, x86_64-linux, x86_64-darwin ]
brillig: [ i686-linux, x86_64-linux, x86_64-darwin ]
broccoli: [ i686-linux, x86_64-linux, x86_64-darwin ]
broker-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2672,6 +2677,7 @@ dont-distribute-packages:
car-pool: [ i686-linux, x86_64-linux, x86_64-darwin ]
carboncopy: [ i686-linux, x86_64-linux, x86_64-darwin ]
carettah: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ carte: [ i686-linux, x86_64-linux, x86_64-darwin ]
Cartesian: [ i686-linux, x86_64-linux, x86_64-darwin ]
casadi-bindings-control: [ i686-linux, x86_64-linux, x86_64-darwin ]
casadi-bindings-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2945,6 +2951,7 @@ dont-distribute-packages:
Control-Monad-ST2: [ i686-linux, x86_64-linux, x86_64-darwin ]
contstuff-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ]
contstuff-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ convert-annotation: [ i686-linux, x86_64-linux, x86_64-darwin ]
convert: [ i686-linux, x86_64-linux, x86_64-darwin ]
convertible-ascii: [ i686-linux, x86_64-linux, x86_64-darwin ]
convertible-text: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3206,11 +3213,9 @@ dont-distribute-packages:
dicom: [ i686-linux, x86_64-linux, x86_64-darwin ]
dictionaries: [ i686-linux, x86_64-linux, x86_64-darwin ]
dictparser: [ i686-linux, x86_64-linux, x86_64-darwin ]
- diff-parse: [ i686-linux, x86_64-linux, x86_64-darwin ]
diffcabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
DifferenceLogic: [ i686-linux, x86_64-linux, x86_64-darwin ]
DifferentialEvolution: [ i686-linux, x86_64-linux, x86_64-darwin ]
- difftodo: [ i686-linux, x86_64-linux, x86_64-darwin ]
digestive-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ]
digestive-foundation-lucid: [ i686-linux, x86_64-linux, x86_64-darwin ]
digestive-functors-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3843,6 +3848,14 @@ dont-distribute-packages:
goal-probability: [ i686-linux, x86_64-linux, x86_64-darwin ]
goal-simulation: [ i686-linux, x86_64-linux, x86_64-darwin ]
gofer-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ gogol-containerbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ gogol-firebase-dynamiclinks: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ gogol-iam: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ gogol-ml: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ gogol-runtimeconfig: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ gogol-safebrowsing: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ gogol-servicecontrol: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ gogol-servicemanagement: [ i686-linux, x86_64-linux, x86_64-darwin ]
gooey: [ i686-linux, x86_64-linux, x86_64-darwin ]
google-drive: [ i686-linux, x86_64-linux, x86_64-darwin ]
google-html5-slide: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3929,6 +3942,8 @@ dont-distribute-packages:
gsl-random-fu: [ i686-linux, x86_64-linux, x86_64-darwin ]
gsl-random: [ i686-linux, x86_64-linux, x86_64-darwin ]
gsmenu: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ gssapi-wai: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ gssapi: [ i686-linux, x86_64-linux, x86_64-darwin ]
GTALib: [ i686-linux, x86_64-linux, x86_64-darwin ]
gtfs: [ i686-linux, x86_64-linux, x86_64-darwin ]
gtk-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4138,10 +4153,12 @@ dont-distribute-packages:
haskell-tools-ast-gen: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tools-ast-trf: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tools-ast: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ haskell-tools-backend-ghc: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tools-cli: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tools-demo: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tools-prettyprint: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tools-refactor: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ haskell-tools-rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tor: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-type-exts: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4357,6 +4374,7 @@ dont-distribute-packages:
HGamer3D-Wire: [ i686-linux, x86_64-linux, x86_64-darwin ]
HGamer3D: [ i686-linux, x86_64-linux, x86_64-darwin ]
hgdbmi: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ HGE2D: [ i686-linux, x86_64-linux, x86_64-darwin ]
hgearman: [ i686-linux, x86_64-linux, x86_64-darwin ]
hgen: [ i686-linux, x86_64-linux, x86_64-darwin ]
hgeometric: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4420,6 +4438,10 @@ dont-distribute-packages:
HLearn-classification: [ i686-linux, x86_64-linux, x86_64-darwin ]
HLearn-datastructures: [ i686-linux, x86_64-linux, x86_64-darwin ]
HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hledger-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hledger-ui: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ]
hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ]
hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ]
hlibfam: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4432,6 +4454,7 @@ dont-distribute-packages:
hmark: [ i686-linux, x86_64-linux, x86_64-darwin ]
hmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ]
hmatrix-banded: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hmatrix-glpk: [ i686-linux, x86_64-linux, x86_64-darwin ]
hmatrix-mmap: [ i686-linux, x86_64-linux, x86_64-darwin ]
hmatrix-nipals: [ i686-linux, x86_64-linux, x86_64-darwin ]
hmatrix-quadprogpp: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4439,6 +4462,7 @@ dont-distribute-packages:
hmatrix-special: [ i686-linux, x86_64-linux, x86_64-darwin ]
hmatrix-static: [ i686-linux, x86_64-linux, x86_64-darwin ]
hmatrix-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hmatrix-tests: [ i686-linux, x86_64-linux, x86_64-darwin ]
hmeap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
hmeap: [ i686-linux, x86_64-linux, x86_64-darwin ]
hmenu: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4637,6 +4661,7 @@ dont-distribute-packages:
hsparklines: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsparql: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspear: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hspec-expectations-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspec-expectations-pretty-diff: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspec-expectations-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspec-experimental: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4669,6 +4694,7 @@ dont-distribute-packages:
hstyle: [ i686-linux, x86_64-linux, x86_64-darwin ]
hstzaar: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsubconvert: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hsverilog: [ i686-linux, x86_64-linux, x86_64-darwin ]
HSvm: [ i686-linux, x86_64-linux, x86_64-darwin ]
hswip: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsx-xhtml: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4692,6 +4718,7 @@ dont-distribute-packages:
http-client-streams: [ i686-linux, x86_64-linux, x86_64-darwin ]
http-conduit-browser: [ i686-linux, x86_64-linux, x86_64-darwin ]
http-conduit-downloader: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ http-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ]
http-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ]
http-kinder: [ i686-linux, x86_64-linux, x86_64-darwin ]
http-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4901,6 +4928,7 @@ dont-distribute-packages:
ismtp: [ i686-linux, x86_64-linux, x86_64-darwin ]
IsNull: [ i686-linux, x86_64-linux, x86_64-darwin ]
iso8583-bitmaps: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ isobmff-builder: [ i686-linux, x86_64-linux, x86_64-darwin ]
isohunt: [ i686-linux, x86_64-linux, x86_64-darwin ]
isotope: [ i686-linux, x86_64-linux, x86_64-darwin ]
iter-stats: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4935,6 +4963,7 @@ dont-distribute-packages:
jalaali: [ i686-linux, x86_64-linux, x86_64-darwin ]
jalla: [ i686-linux, x86_64-linux, x86_64-darwin ]
jarfind: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ jason: [ i686-linux, x86_64-linux, x86_64-darwin ]
java-bridge-extras: [ i686-linux, x86_64-linux, x86_64-darwin ]
java-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ]
java-reflect: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4955,6 +4984,8 @@ dont-distribute-packages:
js-good-parts: [ i686-linux, x86_64-linux, x86_64-darwin ]
jsaddle-dom: [ i686-linux, x86_64-linux, x86_64-darwin ]
jsaddle-hello: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ jsaddle-warp: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ jsaddle-wkwebview: [ i686-linux, x86_64-linux, x86_64-darwin ]
jsaddle: [ i686-linux, x86_64-linux, x86_64-darwin ]
jsc: [ i686-linux, x86_64-linux, x86_64-darwin ]
JsContracts: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5074,7 +5105,9 @@ dont-distribute-packages:
lambda-toolbox: [ i686-linux, x86_64-linux, x86_64-darwin ]
lambda2js: [ i686-linux, x86_64-linux, x86_64-darwin ]
lambdaBase: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ lambdabot-haskell-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ]
lambdabot-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ lambdabot: [ i686-linux, x86_64-linux, x86_64-darwin ]
lambdacat: [ i686-linux, x86_64-linux, x86_64-darwin ]
lambdacms-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
lambdacms-media: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5277,6 +5310,7 @@ dont-distribute-packages:
loch: [ i686-linux, x86_64-linux, x86_64-darwin ]
locked-poll: [ i686-linux, x86_64-linux, x86_64-darwin ]
log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ log-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
log2json: [ i686-linux, x86_64-linux, x86_64-darwin ]
log: [ i686-linux, x86_64-linux, x86_64-darwin ]
logentries: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5401,6 +5435,7 @@ dont-distribute-packages:
MaybeT-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ]
MaybeT: [ i686-linux, x86_64-linux, x86_64-darwin ]
MazesOfMonad: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ MBot: [ i686-linux, x86_64-linux, x86_64-darwin ]
mbox-tools: [ i686-linux, x86_64-linux, x86_64-darwin ]
MC-Fold-DP: [ i686-linux, x86_64-linux, x86_64-darwin ]
mcmaster-gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5622,6 +5657,7 @@ dont-distribute-packages:
mysnapsession-example: [ i686-linux, x86_64-linux, x86_64-darwin ]
mysnapsession: [ i686-linux, x86_64-linux, x86_64-darwin ]
mysql-effect: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ mysql-haskell-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ]
mysql-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
mysql-simple-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ]
mysql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5823,6 +5859,7 @@ dont-distribute-packages:
openssl-createkey: [ i686-linux, x86_64-linux, x86_64-darwin ]
openssl-streams: [ i686-linux, x86_64-linux, x86_64-darwin ]
opentheory-char: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ opentype: [ i686-linux, x86_64-linux, x86_64-darwin ]
OpenVG: [ i686-linux, x86_64-linux, x86_64-darwin ]
OpenVGRaw: [ i686-linux, x86_64-linux, x86_64-darwin ]
Operads: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6294,6 +6331,7 @@ dont-distribute-packages:
recursion-schemes: [ i686-linux, x86_64-linux, x86_64-darwin ]
redHandlers: [ i686-linux, x86_64-linux, x86_64-darwin ]
Redmine: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ reduce-equations: [ i686-linux, x86_64-linux, x86_64-darwin ]
reedsolomon: [ i686-linux, x86_64-linux, x86_64-darwin ]
ref-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ]
Ref: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6375,6 +6413,8 @@ dont-distribute-packages:
repr: [ i686-linux, x86_64-linux, x86_64-darwin ]
representable-functors: [ i686-linux, x86_64-linux, x86_64-darwin ]
representable-tries: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ req-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ req: [ i686-linux, x86_64-linux, x86_64-darwin ]
reqcatcher: [ i686-linux, x86_64-linux, x86_64-darwin ]
request-monad: [ i686-linux, x86_64-linux, x86_64-darwin ]
resistor-cube: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6460,6 +6500,7 @@ dont-distribute-packages:
ruler-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
ruler: [ i686-linux, x86_64-linux, x86_64-darwin ]
rungekutta: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ runtime-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ]
rws: [ i686-linux, x86_64-linux, x86_64-darwin ]
RxHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
s-cargot: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6666,6 +6707,7 @@ dont-distribute-packages:
simple-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
simple-config: [ i686-linux, x86_64-linux, x86_64-darwin ]
simple-css: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ simple-effects: [ i686-linux, x86_64-linux, x86_64-darwin ]
simple-eval: [ i686-linux, x86_64-linux, x86_64-darwin ]
simple-firewire: [ i686-linux, x86_64-linux, x86_64-darwin ]
simple-form: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7027,6 +7069,7 @@ dont-distribute-packages:
target: [ i686-linux, x86_64-linux, x86_64-darwin ]
task-distribution: [ i686-linux, x86_64-linux, x86_64-darwin ]
task: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ tasty-discover: [ i686-linux, x86_64-linux, x86_64-darwin ]
tasty-fail-fast: [ i686-linux, x86_64-linux, x86_64-darwin ]
tasty-groundhog-converters: [ i686-linux, x86_64-linux, x86_64-darwin ]
tasty-integrate: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7038,6 +7081,7 @@ dont-distribute-packages:
TBit: [ i686-linux, x86_64-linux, x86_64-darwin ]
tbox: [ i686-linux, x86_64-linux, x86_64-darwin ]
tccli: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ tcp-streams-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ]
tcp-streams: [ i686-linux, x86_64-linux, x86_64-darwin ]
tcp: [ i686-linux, x86_64-linux, x86_64-darwin ]
tdd-util: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7151,6 +7195,7 @@ dont-distribute-packages:
time-recurrence: [ i686-linux, x86_64-linux, x86_64-darwin ]
time-series: [ i686-linux, x86_64-linux, x86_64-darwin ]
time-w3c: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ time-warp: [ i686-linux, x86_64-linux, x86_64-darwin ]
timecalc: [ i686-linux, x86_64-linux, x86_64-darwin ]
timeconsole: [ i686-linux, x86_64-linux, x86_64-darwin ]
timeout: [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index f9da4757696b..168558424641 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused
, jailbreak-cabal, hscolour, cpphs, nodePackages
-}:
+}: let isCross = (ghc.cross or null) != null; in
{ pname
, dontStrip ? (ghc.isGhcjs or false)
@@ -12,13 +12,14 @@
, buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? []
, configureFlags ? []
, description ? ""
-, doCheck ? stdenv.lib.versionOlder "7.4" ghc.version
+, doCheck ? !isCross && (stdenv.lib.versionOlder "7.4" ghc.version)
, doHoogle ? true
, editedCabalFile ? null
, enableLibraryProfiling ? false
, enableExecutableProfiling ? false
-, enableSharedExecutables ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
-, enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
+# TODO enable shared libs for cross-compiling
+, enableSharedExecutables ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version))
+, enableSharedLibraries ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version))
, enableSplitObjs ? !stdenv.isDarwin # http://hackage.haskell.org/trac/ghc/ticket/4013
, enableStaticLibraries ? true
, extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
@@ -30,7 +31,8 @@
, jailbreak ? false
, license
, maintainers ? []
-, doHaddock ? !stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8"
+# TODO Do we care about haddock when cross-compiling?
+, doHaddock ? !isCross && (!stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8")
, passthru ? {}
, pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? []
, testDepends ? [], testHaskellDepends ? [], testSystemDepends ? []
@@ -57,14 +59,12 @@ let
inherit (stdenv.lib) optional optionals optionalString versionOlder
concatStringsSep enableFeature optionalAttrs toUpper;
- isCross = ghc.isCross or false;
isGhcjs = ghc.isGhcjs or false;
packageDbFlag = if isGhcjs || versionOlder "7.6" ghc.version
then "package-db"
else "package-conf";
- nativeGhc = if isCross then ghc.bootPkgs.ghc else ghc;
- nativeIsCross = nativeGhc.isCross or false;
+ nativeGhc = if isCross || isGhcjs then ghc.bootPkgs.ghc else ghc;
nativePackageDbFlag = if versionOlder "7.6" nativeGhc.version
then "package-db"
else "package-conf";
@@ -88,6 +88,17 @@ let
# details are at .
enableParallelBuilding = versionOlder "7.8" ghc.version && !hasActiveLibrary;
+ crossCabalFlags = [
+ "--with-ghc=${ghc.cross.config}-ghc"
+ "--with-ghc-pkg=${ghc.cross.config}-ghc-pkg"
+ "--with-gcc=${ghc.cc}"
+ "--with-ld=${ghc.ld}"
+ "--hsc2hs-options=--cross-compile"
+ ];
+
+ crossCabalFlagsString =
+ stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags);
+
defaultConfigureFlags = [
"--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid"
"--with-gcc=$CC" # Clang won't work without that extra information.
@@ -106,7 +117,9 @@ let
] ++ optionals isGhcjs [
"--with-hsc2hs=${nativeGhc}/bin/hsc2hs"
"--ghcjs"
- ];
+ ] ++ optionals isCross ([
+ "--configure-option=--host=${ghc.cross.config}"
+ ] ++ crossCabalFlags);
setupCompileFlags = [
(optionalString (!coreSetup) "-${packageDbFlag}=$packageConfDir")
@@ -132,9 +145,9 @@ let
ghcEnv = ghc.withPackages (p: haskellBuildInputs);
- setupBuilder = if isCross then "${nativeGhc}/bin/ghc" else ghcCommand;
+ setupBuilder = if isCross || isGhcjs then "${nativeGhc}/bin/ghc" else ghcCommand;
setupCommand = "./Setup";
- ghcCommand = if isGhcjs then "ghcjs" else "ghc";
+ ghcCommand = if isGhcjs then "ghcjs" else if isCross then "${ghc.cross.config}-ghc" else "ghc";
ghcCommandCaps = toUpper ghcCommand;
in
@@ -233,7 +246,7 @@ stdenv.mkDerivation ({
buildPhase = ''
runHook preBuild
- ${setupCommand} build ${buildTarget}
+ ${setupCommand} build ${buildTarget}${crossCabalFlagsString}
runHook postBuild
'';
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 56c84c2a7c53..e585dd64a3d0 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1697,8 +1697,8 @@ self: {
}:
mkDerivation {
pname = "BlogLiterately";
- version = "0.8.4.1";
- sha256 = "58b1f32660e20f13b6b6ce6b0668099a8ed4acc7939468108dcde283d2fe4429";
+ version = "0.8.4.2";
+ sha256 = "f1d7a0e67ee04bc5c76596800369a9dc8d187b8b9d34081859d2d245fbd2b2f1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -6062,17 +6062,20 @@ self: {
}) {};
"Gifcurry" = callPackage
- ({ mkDerivation, base, cmdargs, directory, gtk3, process, temporary
+ ({ mkDerivation, base, cmdargs, directory, filepath, gtk3, process
+ , temporary, text
}:
mkDerivation {
pname = "Gifcurry";
- version = "2.0.0.2";
- sha256 = "1a7f269eda348fa34fe57f9a35cc810b304acc646f5146c4db2d72eb738c8b32";
+ version = "2.1.0.0";
+ sha256 = "51cf0949e4ea0ae9503887c0c8613d4bfee0b4bdce1d641cf0b2fd016124170c";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [ base directory process temporary ];
+ libraryHaskellDepends = [
+ base directory filepath process temporary text
+ ];
executableHaskellDepends = [
- base cmdargs directory gtk3 process temporary
+ base cmdargs directory filepath gtk3 process temporary text
];
homepage = "https://github.com/lettier/gifcurry";
description = "Create animated GIFs, overlaid with optional text, from video files";
@@ -6886,6 +6889,7 @@ self: {
homepage = "https://github.com/I3ck/HGE2D";
description = "2D game engine written in Haskell";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"HGL" = callPackage
@@ -10561,8 +10565,8 @@ self: {
}:
mkDerivation {
pname = "Lazy-Pbkdf2";
- version = "2.1.0";
- sha256 = "b431835541f5c22467b58862ffe4fe27a046e215fff8440cd0dbea331a3c7f82";
+ version = "2.1.1";
+ sha256 = "a79a0282997dfc4905314bded417f7631c6665802c9fa5103aad999e1832daa9";
libraryHaskellDepends = [ base binary bytestring ];
testHaskellDepends = [
base base16-bytestring binary bytestring cryptonite memory
@@ -10967,6 +10971,7 @@ self: {
libraryHaskellDepends = [ base bytestring hidapi mtl ];
description = "Haskell interface for controlling the mBot educational robot";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"MC-Fold-DP" = callPackage
@@ -14325,15 +14330,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "Rasterific_0_7" = callPackage
+ "Rasterific_0_7_1" = callPackage
({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
, free, JuicyPixels, mtl, primitive, transformers, vector
, vector-algorithms
}:
mkDerivation {
pname = "Rasterific";
- version = "0.7";
- sha256 = "96c466c40237643354cf4aa29cc6694b716009a825e61af8263da96011c7bda1";
+ version = "0.7.1";
+ sha256 = "a3614c5d87c6aacbbd2aabc16d1258f559b03bf46537f47c375949438e7eb5ef";
+ revision = "1";
+ editedCabalFile = "6d38b54477eb7392b57e8082cc442a44ec34534a58f61bd09cf4d0b9cee7d089";
libraryHaskellDepends = [
base bytestring containers dlist FontyFruity free JuicyPixels mtl
primitive transformers vector vector-algorithms
@@ -15741,8 +15748,7 @@ self: {
homepage = "https://www.spock.li";
description = "Another Haskell web framework for rapid development";
license = stdenv.lib.licenses.bsd3;
- broken = true;
- }) {ghcjs-base = null;};
+ }) {};
"Spock-api-server" = callPackage
({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }:
@@ -17956,20 +17962,20 @@ self: {
}) {};
"XSaiga" = callPackage
- ({ mkDerivation, base, cgi, containers, hsparql, pretty, rdf4h
- , text
+ ({ mkDerivation, base, cgi, containers, hsparql, network, pretty
+ , rdf4h, text
}:
mkDerivation {
pname = "XSaiga";
- version = "1.4.0.1";
- sha256 = "f9eae0f1298cf4ab340b9a2761a1b4f80cffdf25a73ef8679c750008ba4316d2";
+ version = "1.5.0.0";
+ sha256 = "395e8e9710edac5a9c9355d52fc08cc293d76a6fbda12b7cc1d173d8d10f8e6c";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base containers hsparql pretty rdf4h text
+ base containers hsparql network pretty rdf4h text
];
executableHaskellDepends = [
- base cgi containers hsparql pretty rdf4h text
+ base cgi containers hsparql network pretty rdf4h text
];
homepage = "http://hafiz.myweb.cs.uwindsor.ca/proHome.html";
description = "An implementation of a polynomial-time top-down parser suitable for NLP";
@@ -20129,8 +20135,8 @@ self: {
({ mkDerivation, aeson, base, json-ast }:
mkDerivation {
pname = "aeson-json-ast";
- version = "0.1";
- sha256 = "fac988efb621e4ac75269138df140dc1e1e8287c206416f2a81cd3d3b3716d9a";
+ version = "0.1.1";
+ sha256 = "ff45897bfecd8cd29c7464a60c97829361569285300bb5d30a01c97519512d5d";
libraryHaskellDepends = [ aeson base json-ast ];
homepage = "https://github.com/sannsyn/aeson-json-ast";
description = "Integration layer for \"json-ast\" and \"aeson\"";
@@ -20406,8 +20412,8 @@ self: {
}:
mkDerivation {
pname = "aeson-value-parser";
- version = "0.11.3.1";
- sha256 = "8d7555500b9b267eee568b04e7d1ffd58dbfd4033256347d4cc82f3a8f50a116";
+ version = "0.11.4";
+ sha256 = "f5a31e1aa81eaf7eed3b1a5ad3e793478f51043792435e537ff6649f4cad3c8e";
libraryHaskellDepends = [
aeson base-prelude mtl-prelude scientific success text
unordered-containers vector
@@ -21471,8 +21477,8 @@ self: {
}:
mkDerivation {
pname = "alsa-seq";
- version = "0.6.0.6";
- sha256 = "f5e58660f07943f0cc33eb2e1ada5e111c43d4114eeb4e0ac0251d72c43b7144";
+ version = "0.6.0.7";
+ sha256 = "06cda1e24993aaf0c3592b51a613cf1e187eea603dd77ad3a129a8a7b1e0b778";
libraryHaskellDepends = [
alsa-core array base bytestring data-accessor enumset
extensible-exceptions poll transformers utility-ht
@@ -24400,6 +24406,32 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "amby" = callPackage
+ ({ mkDerivation, base, Chart, Chart-cairo, Chart-diagrams, colour
+ , data-default, data-default-class, either, exceptions, microlens
+ , mtl, pretty-display, process, safe, scientific, statistics
+ , vector
+ }:
+ mkDerivation {
+ pname = "amby";
+ version = "0.2.1";
+ sha256 = "2430c8d5657af53a4bcc6d7856882375f0ffbcb7c360a2b8fd23cda6e2d33ffa";
+ revision = "1";
+ editedCabalFile = "0cf317eee0251e20650218b1f54fa76513536336ad033385510b9641837ad7be";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base Chart Chart-cairo Chart-diagrams colour data-default
+ data-default-class either exceptions microlens mtl pretty-display
+ process safe scientific statistics vector
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/jsermeno/amby#readme";
+ description = "Statistical data visualization";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"ampersand" = callPackage
({ mkDerivation, base, bytestring, conduit, containers, csv
, directory, filepath, graphviz, hashable, HStringTemplate, lens
@@ -26988,6 +27020,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "async_2_1_1" = callPackage
+ ({ mkDerivation, base, HUnit, stm, test-framework
+ , test-framework-hunit
+ }:
+ mkDerivation {
+ pname = "async";
+ version = "2.1.1";
+ sha256 = "24134b36921f9874abb73be90886b4c23a67a9b4990f2d8e32d08dbfa5f74f90";
+ libraryHaskellDepends = [ base stm ];
+ testHaskellDepends = [
+ base HUnit test-framework test-framework-hunit
+ ];
+ homepage = "https://github.com/simonmar/async";
+ description = "Run IO operations asynchronously and wait for their results";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"async-ajax" = callPackage
({ mkDerivation, async, base, ghcjs-ajax, text }:
mkDerivation {
@@ -30069,14 +30119,18 @@ self: {
}) {};
"bench" = callPackage
- ({ mkDerivation, base, criterion, silently, text, turtle }:
+ ({ mkDerivation, base, criterion, optparse-applicative, silently
+ , text, turtle
+ }:
mkDerivation {
pname = "bench";
- version = "1.0.1";
- sha256 = "b90b0789604d351aa97d736492c4b10be9bebaa369efc4145579f9f6d2eeb019";
+ version = "1.0.2";
+ sha256 = "9fac082305cc27d9ec7ee351ae1d301fc0a434c77cf1b121f51f2ca46d3a462e";
isLibrary = false;
isExecutable = true;
- executableHaskellDepends = [ base criterion silently text turtle ];
+ executableHaskellDepends = [
+ base criterion optparse-applicative silently text turtle
+ ];
homepage = "http://github.com/Gabriel439/bench";
description = "Command-line benchmark tool";
license = stdenv.lib.licenses.bsd3;
@@ -30329,8 +30383,8 @@ self: {
({ mkDerivation, attoparsec, base, bytestring, time }:
mkDerivation {
pname = "bgmax";
- version = "0.1.0.1";
- sha256 = "ba68978e53d15d069ac31064069d641a89bfee1d5133c05670848112076ce271";
+ version = "0.2.0.0";
+ sha256 = "439458c5caab3657ce8ba8dc075097a905b4cb83f07c4a6846a248f9432ff7b8";
libraryHaskellDepends = [ attoparsec base bytestring time ];
homepage = "http://github.com/jonpetterbergman/bgmax";
description = "Parse BgMax-files";
@@ -30362,8 +30416,8 @@ self: {
}:
mkDerivation {
pname = "bibdb";
- version = "0.5.2";
- sha256 = "afe2b25a3544994f32c62975f7eddeec5a690562e7ed234b9fb851aef0f7bc80";
+ version = "0.5.3";
+ sha256 = "8dcac183199d1bbfc7cd835f6d965ea9fedcc7874c9db458c221cede246ead12";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -34406,6 +34460,7 @@ self: {
homepage = "https://github.com/jtdaugherty/brick/";
description = "A declarative terminal user interface library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"brillig" = callPackage
@@ -37429,6 +37484,7 @@ self: {
homepage = "https://github.com/m1dnight/carte";
description = "Carte: A commandline pastebin server";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"cartel" = callPackage
@@ -37486,13 +37542,13 @@ self: {
}:
mkDerivation {
pname = "casadi-bindings";
- version = "3.0.0.5";
- sha256 = "338690af83dd423a118f00fdf7dba3b6a4b49875f7e9e685bc2a68f5284853a9";
+ version = "3.1.0.1";
+ sha256 = "d1ea0a6ebb07b3bdc7ac50ccf3300888b0c4d48d53640593e2748e3e1433ead4";
libraryHaskellDepends = [
base binary casadi-bindings-core casadi-bindings-internal cereal
containers linear spatial-math vector vector-binary-instances
];
- libraryPkgconfigDepends = [ casadi ];
+ librarySystemDepends = [ casadi ];
testHaskellDepends = [
base containers doctest HUnit QuickCheck test-framework
test-framework-hunit test-framework-quickcheck2 vector
@@ -37526,12 +37582,12 @@ self: {
}:
mkDerivation {
pname = "casadi-bindings-core";
- version = "3.0.0.0";
- sha256 = "8cd59ae975cc1de7db78ac59f6212f2523bdf723a782a9ce0c0b47922fdf31be";
+ version = "3.1.0.0";
+ sha256 = "360f2cd21f2cb418b56b9a487333b1d18dbc86def6ab659a3061080b1194e623";
libraryHaskellDepends = [
base casadi-bindings-internal containers vector
];
- libraryPkgconfigDepends = [ casadi ];
+ librarySystemDepends = [ casadi ];
description = "autogenerated low level bindings to casadi";
license = stdenv.lib.licenses.lgpl3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -37541,10 +37597,10 @@ self: {
({ mkDerivation, base, casadi, containers, vector }:
mkDerivation {
pname = "casadi-bindings-internal";
- version = "0.1.4.0";
- sha256 = "c5a48653c1f893618287adad1979ee684064daeb9b060294d65a0bea6e378976";
+ version = "0.1.5.0";
+ sha256 = "c24100f6de46d5a6ba21af67fca017ac67a7da2c945863b5d2879012c05bf35c";
libraryHaskellDepends = [ base containers vector ];
- libraryPkgconfigDepends = [ casadi ];
+ librarySystemDepends = [ casadi ];
homepage = "http://github.com/ghorn/casadi-bindings";
description = "low level bindings to CasADi";
license = stdenv.lib.licenses.lgpl3;
@@ -37968,14 +38024,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "cassava-conduit_0_3_5" = callPackage
+ "cassava-conduit_0_3_5_1" = callPackage
({ mkDerivation, array, base, bifunctors, bytestring, cassava
, conduit, conduit-extra, containers, mtl, QuickCheck, text
}:
mkDerivation {
pname = "cassava-conduit";
- version = "0.3.5";
- sha256 = "0162887a9ca16d8828ac31f7c5aa409129de4e1cd3e199cd158302d3775f9e89";
+ version = "0.3.5.1";
+ sha256 = "45853e32dbac212d41d800c539c7d9184e05d0b7b48df458a7963138449a75d5";
libraryHaskellDepends = [
array base bifunctors bytestring cassava conduit conduit-extra
containers mtl text
@@ -39622,6 +39678,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "cielo" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, convertible, data-default
+ , hspec, http-client, http-types, lens, mtl, pretty-show
+ , QuickCheck, template-haskell, text, uuid, wreq
+ }:
+ mkDerivation {
+ pname = "cielo";
+ version = "0.1.2.0";
+ sha256 = "9c7df3e4d019a625c143f6ace77e282389651197b5d7b5fd9d502dec0ca24020";
+ libraryHaskellDepends = [
+ aeson base bytestring convertible data-default http-client
+ http-types lens mtl template-haskell text uuid wreq
+ ];
+ testHaskellDepends = [
+ aeson base bytestring convertible data-default hspec http-client
+ http-types lens mtl pretty-show QuickCheck template-haskell text
+ uuid wreq
+ ];
+ homepage = "https://github.com/beijaflor-io/haskell-cielo";
+ description = "Cielo API v3 Bindings for Haskell";
+ license = stdenv.lib.licenses.agpl3;
+ }) {};
+
"cil" = callPackage
({ mkDerivation, base, bytestring, language-c }:
mkDerivation {
@@ -40345,6 +40424,38 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "classy-prelude_1_0_1" = callPackage
+ ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
+ , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim
+ , hashable, hspec, lifted-async, lifted-base, monad-unlift
+ , mono-traversable, mono-traversable-instances, mtl
+ , mutable-containers, primitive, QuickCheck, safe-exceptions, say
+ , semigroups, stm, stm-chans, text, time, time-locale-compat
+ , transformers, transformers-base, unordered-containers, vector
+ , vector-instances
+ }:
+ mkDerivation {
+ pname = "classy-prelude";
+ version = "1.0.1";
+ sha256 = "a27cb14f5b8dfde02da08a2e7cce0d0f9ae59d7a42cdb838ef10584e5a42c993";
+ libraryHaskellDepends = [
+ async base basic-prelude bifunctors bytestring chunked-data
+ containers deepseq dlist exceptions ghc-prim hashable lifted-async
+ lifted-base monad-unlift mono-traversable
+ mono-traversable-instances mtl mutable-containers primitive
+ safe-exceptions say semigroups stm stm-chans text time
+ time-locale-compat transformers transformers-base
+ unordered-containers vector vector-instances
+ ];
+ testHaskellDepends = [
+ base containers hspec QuickCheck transformers unordered-containers
+ ];
+ homepage = "https://github.com/snoyberg/mono-traversable";
+ description = "A typeclass-based Prelude";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"classy-prelude-conduit" = callPackage
({ mkDerivation, base, bytestring, classy-prelude, conduit
, conduit-combinators, hspec, monad-control, QuickCheck, resourcet
@@ -40367,6 +40478,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "classy-prelude-conduit_1_0_1" = callPackage
+ ({ mkDerivation, base, bytestring, classy-prelude, conduit
+ , conduit-combinators, hspec, monad-control, QuickCheck, resourcet
+ , transformers, void
+ }:
+ mkDerivation {
+ pname = "classy-prelude-conduit";
+ version = "1.0.1";
+ sha256 = "1307d30366f8827f9226db01895db0b5aa0712aa07abb41754c992ac1fc0006c";
+ libraryHaskellDepends = [
+ base bytestring classy-prelude conduit conduit-combinators
+ monad-control resourcet transformers void
+ ];
+ testHaskellDepends = [
+ base bytestring conduit hspec QuickCheck transformers
+ ];
+ homepage = "https://github.com/snoyberg/mono-traversable";
+ description = "classy-prelude together with conduit functions";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"classy-prelude-yesod" = callPackage
({ mkDerivation, aeson, base, classy-prelude
, classy-prelude-conduit, data-default, http-conduit, http-types
@@ -40387,6 +40520,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "classy-prelude-yesod_1_0_1" = callPackage
+ ({ mkDerivation, aeson, base, classy-prelude
+ , classy-prelude-conduit, data-default, http-conduit, http-types
+ , persistent, yesod, yesod-newsfeed, yesod-static
+ }:
+ mkDerivation {
+ pname = "classy-prelude-yesod";
+ version = "1.0.1";
+ sha256 = "b7a0b195b9647fa49664dbaab4128c0e8f8b1a26f62063c0b6ed273c55e93b53";
+ libraryHaskellDepends = [
+ aeson base classy-prelude classy-prelude-conduit data-default
+ http-conduit http-types persistent yesod yesod-newsfeed
+ yesod-static
+ ];
+ homepage = "https://github.com/snoyberg/mono-traversable";
+ description = "Provide a classy prelude including common Yesod functionality";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"classyplate" = callPackage
({ mkDerivation, base, template-haskell, type-list }:
mkDerivation {
@@ -41248,6 +41401,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "cmark_0_5_4" = callPackage
+ ({ mkDerivation, base, bytestring, HUnit, text }:
+ mkDerivation {
+ pname = "cmark";
+ version = "0.5.4";
+ sha256 = "06f62f52870103be29c92eabfed84be96b4b38a12c3c0b96dffe61b3a0dfa807";
+ libraryHaskellDepends = [ base bytestring text ];
+ testHaskellDepends = [ base HUnit text ];
+ homepage = "https://github.com/jgm/cmark-hs";
+ description = "Fast, accurate CommonMark (Markdown) parser and renderer";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"cmark-highlight" = callPackage
({ mkDerivation, base, blaze-html, cmark, highlighting-kate, text
}:
@@ -41281,8 +41448,8 @@ self: {
}:
mkDerivation {
pname = "cmark-sections";
- version = "0.1.0.1";
- sha256 = "4df6ea052023b545da67a38311b69c751e1372515799b6ff88163b12f38ddf00";
+ version = "0.1.0.2";
+ sha256 = "3617bb05d899ead54e1f58faa97fd30f6a9ec152112b6b962e26cdd02c34da57";
libraryHaskellDepends = [
base base-prelude cmark containers microlens split text
];
@@ -43438,6 +43605,35 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "conduit-combinators_1_0_8_2" = callPackage
+ ({ mkDerivation, base, base16-bytestring, base64-bytestring
+ , bytestring, chunked-data, conduit, conduit-extra, containers
+ , directory, filepath, hspec, monad-control, mono-traversable, mtl
+ , mwc-random, primitive, QuickCheck, resourcet, safe, silently
+ , text, transformers, transformers-base, unix, unix-compat, vector
+ , void
+ }:
+ mkDerivation {
+ pname = "conduit-combinators";
+ version = "1.0.8.2";
+ sha256 = "561cd11eef07fd400528e79186c1c57e43583d19e47b4f45216e154687cf5382";
+ libraryHaskellDepends = [
+ base base16-bytestring base64-bytestring bytestring chunked-data
+ conduit conduit-extra filepath monad-control mono-traversable
+ mwc-random primitive resourcet text transformers transformers-base
+ unix unix-compat vector void
+ ];
+ testHaskellDepends = [
+ base base16-bytestring base64-bytestring bytestring chunked-data
+ conduit containers directory filepath hspec mono-traversable mtl
+ mwc-random QuickCheck safe silently text transformers vector
+ ];
+ homepage = "https://github.com/snoyberg/mono-traversable";
+ description = "Commonly used conduit functions, for both chunked and unchunked data";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"conduit-connection" = callPackage
({ mkDerivation, base, bytestring, conduit, connection, HUnit
, network, resourcet, test-framework, test-framework-hunit
@@ -43999,13 +44195,13 @@ self: {
}:
mkDerivation {
pname = "console-program";
- version = "0.4.1.0";
- sha256 = "688cbecb6288c5e12c48c2bafaf27f470fe1b9d61c293b529581799cf95c7146";
+ version = "0.4.2.0";
+ sha256 = "a5476673bb36c25d7103aacffb9748dacf03f4cbafe94e3f16bc8950eececb7a";
libraryHaskellDepends = [
ansi-terminal ansi-wl-pprint base containers directory haskeline
parsec parsec-extra split transformers unix utility-ht
];
- description = "Interpret the command line and settings in a config file as commands and options";
+ description = "Interpret the command line and a config file as commands and options";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -44779,6 +44975,7 @@ self: {
homepage = "http://github.com/GregorySchwartz/convert-annotation#readme";
description = "Convert the annotation of a gene to another in a delimited file using a variety of different databases";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"convertible" = callPackage
@@ -46231,6 +46428,8 @@ self: {
pname = "criterion";
version = "1.1.4.0";
sha256 = "53a243fc759ed3100e71f96a5f6649658d076d91d52ce2853a6f8587aa3cfa76";
+ revision = "1";
+ editedCabalFile = "61a5386463efe3da9c0bc5d14f6074e500dc76fc62e2dda40eaf81955716fe41";
libraryHaskellDepends = [
aeson ansi-wl-pprint base binary bytestring cassava code-page
containers deepseq directory filepath Glob hastache js-flot
@@ -53012,7 +53211,6 @@ self: {
testHaskellDepends = [ attoparsec base hspec text ];
description = "A parser for diff file formats";
license = stdenv.lib.licenses.agpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"diff3" = callPackage
@@ -53106,7 +53304,6 @@ self: {
homepage = "https://github.com/jml/difftodo#readme";
description = "Generate todo lists from source code";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"digamma" = callPackage
@@ -54675,6 +54872,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "dmenu" = callPackage
+ ({ mkDerivation, base, containers, directory, lens, mtl, process
+ , transformers
+ }:
+ mkDerivation {
+ pname = "dmenu";
+ version = "0.3.0.0";
+ sha256 = "dee250a81b5ba065cec749cb260c0945b5f57cf13ef99b7b5b9d1dda189077fb";
+ libraryHaskellDepends = [
+ base containers directory lens mtl process transformers
+ ];
+ homepage = "https://github.com/m0rphism/haskell-dmenu";
+ description = "Complete bindings to the dmenu and dmenu2 command line tools";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"dns" = callPackage
({ mkDerivation, attoparsec, base, binary, bytestring
, bytestring-builder, conduit, conduit-extra, containers, doctest
@@ -57428,6 +57641,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ekg-influxdb" = callPackage
+ ({ mkDerivation, base, clock, containers, ekg-core, libinfluxdb
+ , text, time, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "ekg-influxdb";
+ version = "0.1.0.0";
+ sha256 = "8512eb20523c3b21811a3f61ab53ff91bfefdc8edea223bb9d9969a59c3935a4";
+ libraryHaskellDepends = [
+ base clock containers ekg-core libinfluxdb text time
+ unordered-containers vector
+ ];
+ homepage = "https://github.com/angerman/ekg-influxdb";
+ description = "An EKG backend to send statistics to influxdb";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"ekg-json" = callPackage
({ mkDerivation, aeson, base, ekg-core, text, unordered-containers
}:
@@ -63191,8 +63421,8 @@ self: {
}:
mkDerivation {
pname = "flaccuraterip";
- version = "0.3.6";
- sha256 = "7e7904030c86963c8a2a129a5d0f50a7872b80feaf26fea54f1508a0615469da";
+ version = "0.3.7";
+ sha256 = "b0cd908d8fe4cddc01e93cae85748717c41b183be5ce1a620ea6b4c776d4ba8f";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -65414,8 +65644,8 @@ self: {
({ mkDerivation, base, doctest, Glob, mtl }:
mkDerivation {
pname = "from-sum";
- version = "0.2.0.0";
- sha256 = "9ab7657f3da6ccc4d22a1ebf7ad2b35f6040d9a5013ed47a4e56d71a52008aa4";
+ version = "0.2.1.0";
+ sha256 = "a1ed8a433b98df8a70be2f9199abae3e5ed7fb4c2f2b3fb1268b6b588f326667";
libraryHaskellDepends = [ base mtl ];
testHaskellDepends = [ base doctest Glob ];
homepage = "https://github.com/cdepillabout/from-sum";
@@ -66299,8 +66529,7 @@ self: {
homepage = "https://github.com/ziocroc/FWGL";
description = "FWGL GHCJS backend";
license = stdenv.lib.licenses.bsd3;
- broken = true;
- }) {ghcjs-base = null;};
+ }) {};
"g-npm" = callPackage
({ mkDerivation, base, HTTP, json }:
@@ -67411,15 +67640,15 @@ self: {
}) {};
"geo-uk" = callPackage
- ({ mkDerivation, array, base, binary, bytestring, template-haskell
- , th-lift
+ ({ mkDerivation, array, base, binary, bytestring, bzlib
+ , template-haskell, th-lift
}:
mkDerivation {
pname = "geo-uk";
- version = "0.1.0.1";
- sha256 = "a92648834307b9ac6dde2a581fbf291b36cbd8d005965e7e64512f8bdfb01e70";
+ version = "0.1.0.2";
+ sha256 = "feb2d70452d160a342670c56eebd8f6b135d83661dfa6860cd528248fa9f27ad";
libraryHaskellDepends = [
- array base binary bytestring template-haskell th-lift
+ array base binary bytestring bzlib template-haskell th-lift
];
homepage = "https://github.com/tolysz/geo-uk";
description = "High precision conversion between GPS and UK Grid";
@@ -68723,11 +68952,11 @@ self: {
homepage = "https://github.com/vwwv/ghcjs-promise";
description = "Bidirectional bidings to javascript's promise";
license = stdenv.lib.licenses.bsd3;
- broken = true;
- }) {ghcjs-base = null;};
+ }) {};
"ghcjs-websockets" = callPackage
- ({ mkDerivation, base, base64-bytestring, binary, bytestring, text
+ ({ mkDerivation, base, base64-bytestring, binary, bytestring
+ , ghcjs-base, text
}:
mkDerivation {
pname = "ghcjs-websockets";
@@ -68736,7 +68965,7 @@ self: {
revision = "1";
editedCabalFile = "1901cc0693c96bc77c6484ac202ce8e6302c2eb2eb6b986a054aaaad9901b2ff";
libraryHaskellDepends = [
- base base64-bytestring binary bytestring text
+ base base64-bytestring binary bytestring ghcjs-base text
];
homepage = "http://github.com/mstksg/ghcjs-websockets";
description = "Deprecated: use ghcjs-base's native websockets";
@@ -69717,8 +69946,8 @@ self: {
}:
mkDerivation {
pname = "ginger";
- version = "0.3.7.1";
- sha256 = "6e30c1fff6bd5ebc5bea71307e3cc6e726d96487d1b66894e754dc90afe76831";
+ version = "0.3.7.2";
+ sha256 = "53b18bf7146c4d46347eb74a64add43167220377d75fb572afe5bb1e0ac173dd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -69940,8 +70169,8 @@ self: {
}:
mkDerivation {
pname = "git-annex";
- version = "6.20161111";
- sha256 = "d6ea2566b5883fce8cdbd498d5b6fc22c4ed042de6514622b8b4a59ea4564f45";
+ version = "6.20161118";
+ sha256 = "84d83b41ce671b29f7c718979bb06d2bb3e3a3f3a3536257f3c6a3da993e47ba";
configureFlags = [
"-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
"-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -70175,13 +70404,13 @@ self: {
}:
mkDerivation {
pname = "git-repair";
- version = "1.20161111";
- sha256 = "4ce6447c2a2b678b7fd3f677aa29b8f1b018d5d11822bf5488df83e6c9cbaf54";
+ version = "1.20161118";
+ sha256 = "d24c576c4a033f051d1f7a76a0e203ba00c9844bad1236d86974a136ebd25a6e";
isLibrary = false;
isExecutable = true;
setupHaskellDepends = [
base bytestring Cabal data-default directory exceptions filepath
- hslogger IfElse MissingH process unix unix-compat
+ hslogger IfElse MissingH mtl process unix unix-compat
];
executableHaskellDepends = [
async base bytestring containers directory exceptions filepath
@@ -70339,7 +70568,7 @@ self: {
}) {};
"github-backup" = callPackage
- ({ mkDerivation, base, bytestring, containers, directory
+ ({ mkDerivation, base, bytestring, Cabal, containers, directory
, exceptions, filepath, git, github, hslogger, IfElse, MissingH
, mtl, network, network-uri, optparse-applicative, pretty-show
, process, text, transformers, unix, unix-compat, utf8-string
@@ -70347,11 +70576,14 @@ self: {
}:
mkDerivation {
pname = "github-backup";
- version = "1.20161110";
- sha256 = "a6d0e48a3e6300f6633106ce28e8a7140856e924d78ef5330675410a10dcc245";
+ version = "1.20161118";
+ sha256 = "5278f8f3502721cb677b4ac0de4df8c2954ddb0335ceb9e63c4b29e77912a21b";
isLibrary = false;
isExecutable = true;
- setupHaskellDepends = [ base hslogger MissingH ];
+ setupHaskellDepends = [
+ base bytestring Cabal directory exceptions filepath hslogger IfElse
+ MissingH mtl process unix unix-compat
+ ];
executableHaskellDepends = [
base bytestring containers directory exceptions filepath github
hslogger IfElse MissingH mtl network network-uri
@@ -70986,8 +71218,8 @@ self: {
pname = "glirc";
version = "2.20.1.1";
sha256 = "63f0f8d82ea8d2f90103faf9ccd9fa301275b9400bbf1c3db62f8c51cbfa40fe";
- revision = "1";
- editedCabalFile = "883328945d2ac7c7e02b70aaeb3afbe1a23032d3ba073227a56411966d3afb0b";
+ revision = "2";
+ editedCabalFile = "1ffce4f6773283058717e61b7544579d002d258e904ca7e4d97b10a65e1b97a5";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath ];
@@ -72604,6 +72836,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Cloud Container Builder SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-core" = callPackage
@@ -72965,6 +73198,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Firebase Dynamic Links SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-firebase-rules" = callPackage
@@ -73277,6 +73511,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Identity and Access Management (IAM) SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-identity-toolkit" = callPackage
@@ -73464,6 +73699,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Cloud Machine Learning SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-monitoring" = callPackage
@@ -73876,6 +74112,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Cloud RuntimeConfig SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-safebrowsing" = callPackage
@@ -73888,6 +74125,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Safe Browsing APIs SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-script" = callPackage
@@ -73925,6 +74163,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Service Control SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-servicemanagement" = callPackage
@@ -73937,6 +74176,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Service Management SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-sheets" = callPackage
@@ -74471,8 +74711,8 @@ self: {
}:
mkDerivation {
pname = "google-oauth2";
- version = "0.2.1";
- sha256 = "ff16b3d74d6b1d4b81dcabc07f40020d19d39c04956d0067c1fe111e9b8d14ca";
+ version = "0.2.2";
+ sha256 = "3230c41fc67242671c517e4483dfd9612f58495389ff2413f0f33444e0448058";
libraryHaskellDepends = [
aeson base bytestring HTTP http-conduit
];
@@ -74594,8 +74834,8 @@ self: {
}:
mkDerivation {
pname = "gore-and-ash";
- version = "1.2.1.0";
- sha256 = "216c58cf971d991aedcdda7100da3dfda433371c6fa47404df9431357cd84f82";
+ version = "1.2.2.0";
+ sha256 = "4192efc2afac62ba0fb5d1b591a387e8bc4c346fdcd6ceb1f0d568cd8027cace";
libraryHaskellDepends = [
base containers deepseq exceptions hashable linear mtl parallel
profunctors random semigroups time transformers
@@ -74613,8 +74853,8 @@ self: {
}:
mkDerivation {
pname = "gore-and-ash-actor";
- version = "1.2.1.0";
- sha256 = "7769718f402328fb3ae3ea268d8da5398f897cd7c3702372b8a9a1f560cc9360";
+ version = "1.2.2.0";
+ sha256 = "0de7d9391e0760193904ea91d6cc3f499a155923bc31bb9130d3fe694eda9a10";
libraryHaskellDepends = [
base containers deepseq exceptions gore-and-ash hashable mtl
resourcet transformers transformers-base unordered-containers
@@ -74632,8 +74872,8 @@ self: {
}:
mkDerivation {
pname = "gore-and-ash-async";
- version = "1.1.0.0";
- sha256 = "8ed161f2d598e3f84c1ee3a2abe2ed0b8d41f4bcb526467bfbe00ba3cf6edf74";
+ version = "1.1.1.0";
+ sha256 = "ed0c0ee1404d68675b03cf133d0af8ecb9553ba2ce279e32c353db55957ebd18";
libraryHaskellDepends = [
async base containers deepseq exceptions gore-and-ash hashable mtl
resourcet transformers transformers-base unordered-containers
@@ -74657,8 +74897,8 @@ self: {
}:
mkDerivation {
pname = "gore-and-ash-demo";
- version = "1.1.0.0";
- sha256 = "08d6fa2861a03281dee03e0baa5c23a54e7366f1d5cb1390e921b90fe8c7ab3b";
+ version = "1.2.0.0";
+ sha256 = "73bfb46b00664c92376e3c2ffff7df7e54552b077c9c8ae146117d31d2465309";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -74680,8 +74920,8 @@ self: {
}:
mkDerivation {
pname = "gore-and-ash-glfw";
- version = "1.1.1.0";
- sha256 = "b65482130fba543d369383ceb5b8033d72debba728ea848d07c9af02068d9d4c";
+ version = "1.1.2.0";
+ sha256 = "43fc8a90e985baa99334c11f48f87c166145bc9b597c7751cce0e18b282a483e";
libraryHaskellDepends = [
base deepseq exceptions extra GLFW-b gore-and-ash hashable mtl
transformers unordered-containers
@@ -74691,6 +74931,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "gore-and-ash-lambdacube" = callPackage
+ ({ mkDerivation, base, containers, deepseq, exceptions
+ , gore-and-ash, hashable, lambdacube-compiler, lambdacube-gl, mtl
+ , text, unordered-containers
+ }:
+ mkDerivation {
+ pname = "gore-and-ash-lambdacube";
+ version = "0.2.0.0";
+ sha256 = "62c2bd09408ecfc4f7140cb034b993822b4246c23df72bf17a708aa1b700407d";
+ libraryHaskellDepends = [
+ base containers deepseq exceptions gore-and-ash hashable
+ lambdacube-compiler lambdacube-gl mtl text unordered-containers
+ ];
+ homepage = "https://github.com/TeaspotStudio/gore-and-ash-lambdacube#readme";
+ description = "Core module for Gore&Ash engine that do something";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"gore-and-ash-logging" = callPackage
({ mkDerivation, base, containers, deepseq, exceptions, extra
, gore-and-ash, hashable, mtl, resourcet, text, text-show
@@ -74698,8 +74956,8 @@ self: {
}:
mkDerivation {
pname = "gore-and-ash-logging";
- version = "2.0.0.0";
- sha256 = "a01fa0ba3867c791462f17f4910a155e5d814c113789b2b5d12766c399d65b93";
+ version = "2.0.1.0";
+ sha256 = "6ce12cadec13514b91593dd9cc33d3deb1cdd9bd13fec92b98d985934fa72149";
libraryHaskellDepends = [
base containers deepseq exceptions extra gore-and-ash hashable mtl
resourcet text text-show transformers transformers-base
@@ -74720,8 +74978,8 @@ self: {
}:
mkDerivation {
pname = "gore-and-ash-network";
- version = "1.3.2.0";
- sha256 = "7093854a9ceb887bd7b58cad8d79d46ed632609f54bdfb2c7a2dcefe7296f4d2";
+ version = "1.4.0.0";
+ sha256 = "d1bea115605525454c300419c1860168fd38e414a3760b2f6e1ef2793f5bfece";
libraryHaskellDepends = [
base bytestring containers deepseq exceptions extra ghc-prim
gore-and-ash gore-and-ash-logging hashable integer-gmp mtl network
@@ -74741,8 +74999,8 @@ self: {
}:
mkDerivation {
pname = "gore-and-ash-sdl";
- version = "2.1.0.0";
- sha256 = "2c8ec109e234cbaef34ac6b72a7a5182437a0f0473006d033cd51102d868294d";
+ version = "2.1.1.0";
+ sha256 = "8bc3bac8c1297f9110481b4fe9b75e9817952521e12af6ccfde5cd1fd589618c";
libraryHaskellDepends = [
base containers deepseq exceptions gore-and-ash lens linear mtl
resourcet sdl2 text transformers transformers-base
@@ -74756,19 +75014,17 @@ self: {
"gore-and-ash-sync" = callPackage
({ mkDerivation, base, bytestring, cereal, containers, deepseq
, exceptions, gore-and-ash, gore-and-ash-actor
- , gore-and-ash-logging, gore-and-ash-network, hashable, mtl
- , resourcet, text, transformers, transformers-base
+ , gore-and-ash-logging, gore-and-ash-network, hashable, mtl, text
, unordered-containers
}:
mkDerivation {
pname = "gore-and-ash-sync";
- version = "1.2.0.0";
- sha256 = "719827da28924991b85d8d3aca1ca5fe1ebdb77d3d32154bdfc1790928015769";
+ version = "1.2.0.1";
+ sha256 = "e4c919188198e1c6740cd17f782ddb08bfac928448e84b77fba4987e94f262dc";
libraryHaskellDepends = [
base bytestring cereal containers deepseq exceptions gore-and-ash
gore-and-ash-actor gore-and-ash-logging gore-and-ash-network
- hashable mtl resourcet text transformers transformers-base
- unordered-containers
+ hashable mtl text unordered-containers
];
homepage = "https://github.com/Teaspot-Studio/gore-and-ash-sync";
description = "Gore&Ash module for high level network synchronization";
@@ -76131,6 +76387,7 @@ self: {
homepage = "https://github.com/ondrap/gssapi";
description = "libgssapi and libkrb5 bindings for haskell";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {gssapi_krb5 = null; krb5 = null;};
"gssapi-wai" = callPackage
@@ -76148,6 +76405,7 @@ self: {
homepage = "https://github.com/ondrap/gssapi-wai";
description = "WAI Middleware for SPNEGO authentiaction";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gstreamer" = callPackage
@@ -80699,8 +80957,10 @@ self: {
}:
mkDerivation {
pname = "hashabler";
- version = "1.3.0";
- sha256 = "6bbd711b75f9c8fe72a1471ed99709e382ce7a58595a0088228aa39e74bf74ab";
+ version = "2.0.0";
+ sha256 = "6a2bd750238fb73bbef9572fc553aee6d0cc82326970a8598d9eb8b6ef923cf3";
+ revision = "1";
+ editedCabalFile = "c86a0c3e2fbc461ab3e75631a456f416ec9c57b7d48558ae0ad76fb4c48c3284";
libraryHaskellDepends = [
array base bytestring ghc-prim integer-gmp primitive
template-haskell text
@@ -81073,6 +81333,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "haskelisp" = callPackage
+ ({ mkDerivation, base, containers, mtl, protolude, text }:
+ mkDerivation {
+ pname = "haskelisp";
+ version = "0.1.0.5";
+ sha256 = "bc35b968ed448582b13dad1b5364eecd2f2bae27c1c859ed14fa151a5c02b949";
+ libraryHaskellDepends = [ base containers mtl protolude text ];
+ homepage = "http://github.com/githubuser/haskelisp#readme";
+ description = "Write Emacs module in Haskell, using Emacs 25's Dynamic Module feature";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"haskell-aliyun" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, basic-prelude
, blaze-builder, bytestring, case-insensitive, conduit, Crypto
@@ -81999,8 +82271,8 @@ self: {
({ mkDerivation, base, haskell-src-exts }:
mkDerivation {
pname = "haskell-src-exts-simple";
- version = "1.18.0.1.1";
- sha256 = "f331ae82547ebc4ee1dfce9265e101117ff6951682d0eea79c03a2994b9c061b";
+ version = "1.19.0.0";
+ sha256 = "41bc9166e7d08bb18b5309eb2af00ce122c70eeffd047da47e9e2d9db89a2406";
libraryHaskellDepends = [ base haskell-src-exts ];
homepage = "https://github.com/int-e/haskell-src-exts-simple";
description = "A simplified view on the haskell-src-exts AST";
@@ -82168,6 +82440,7 @@ self: {
homepage = "https://github.com/nboldi/haskell-tools";
description = "Creating the Haskell-Tools AST from GHC's representations";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"haskell-tools-cli" = callPackage
@@ -82281,6 +82554,7 @@ self: {
homepage = "https://github.com/haskell-tools/haskell-tools";
description = "Facilities for generating new parts of the Haskell-Tools AST";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"haskell-tor" = callPackage
@@ -86077,8 +86351,8 @@ self: {
}:
mkDerivation {
pname = "heterocephalus";
- version = "0.1.0.0";
- sha256 = "fd9a5caaea40092400f6952e53cd0cda701e963732f434e14025daf683b8c4fd";
+ version = "1.0.0";
+ sha256 = "152db4b8297ed5eafb9c9f974806b39f790325b337d48e0a5724227360106b1b";
libraryHaskellDepends = [
base blaze-html blaze-markup containers parsec shakespeare
template-haskell text
@@ -88296,6 +88570,7 @@ self: {
homepage = "http://hledger.org";
description = "Web API server for the hledger accounting tool";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hledger-chart" = callPackage
@@ -88315,6 +88590,7 @@ self: {
homepage = "http://hledger.org";
description = "A pie chart image generator for the hledger accounting tool";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hledger-diff" = callPackage
@@ -88350,6 +88626,25 @@ self: {
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
+ "hledger-interest_1_5_1" = callPackage
+ ({ mkDerivation, base, Cabal, Decimal, hledger-lib, mtl, text, time
+ }:
+ mkDerivation {
+ pname = "hledger-interest";
+ version = "1.5.1";
+ sha256 = "0a02354f4e8d53e75817e05b140c4760220ac4e414fbf9772abe4f20a9f90da6";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base Cabal Decimal hledger-lib mtl text time
+ ];
+ homepage = "http://github.com/peti/hledger-interest";
+ description = "computes interest for a given account";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ maintainers = with stdenv.lib.maintainers; [ peti ];
+ }) {};
+
"hledger-irr" = callPackage
({ mkDerivation, base, Cabal, Decimal, hledger-lib, statistics
, text, time
@@ -88405,8 +88700,8 @@ self: {
}:
mkDerivation {
pname = "hledger-ui";
- version = "1.0.4";
- sha256 = "f45d4afe158924f59691885bb87e52816fe80525252400d2840761a2e0d4e64d";
+ version = "1.0.5";
+ sha256 = "ba859b4c1f8199413c30ddc0db2a7e11206d79ae235e6d9005de6d6cc1b98875";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -88418,6 +88713,7 @@ self: {
homepage = "http://hledger.org";
description = "Curses-style user interface for the hledger accounting tool";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hledger-vty" = callPackage
@@ -88436,6 +88732,7 @@ self: {
homepage = "http://hledger.org";
description = "A curses-style console interface for the hledger accounting tool";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hledger-web" = callPackage
@@ -88781,6 +89078,7 @@ self: {
homepage = "https://github.com/albertoruiz/hmatrix";
description = "Linear Programming based on GLPK";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) glpk;};
"hmatrix-gsl" = callPackage
@@ -88978,6 +89276,7 @@ self: {
homepage = "https://github.com/albertoruiz/hmatrix";
description = "Tests for hmatrix";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hmeap" = callPackage
@@ -92787,21 +93086,17 @@ self: {
}) {};
"hscrtmpl" = callPackage
- ({ mkDerivation, base, directory, process, regex-compat, time
- , time-locale-compat
- }:
+ ({ mkDerivation, base, directory, process, time }:
mkDerivation {
pname = "hscrtmpl";
- version = "1.4";
- sha256 = "31c642da0e9c90b961160214e4a91e6aba9acbd1253eec009f4d626e360be5ab";
+ version = "1.5";
+ sha256 = "808a80880f2880432fd6c27c99aeb841d325afdad36f0aae7a5a45f512206589";
isLibrary = false;
isExecutable = true;
- executableHaskellDepends = [
- base directory process regex-compat time time-locale-compat
- ];
+ executableHaskellDepends = [ base directory process time ];
homepage = "http://hub.darcs.net/dino/hscrtmpl";
description = "Haskell shell script template";
- license = stdenv.lib.licenses.bsd3;
+ license = stdenv.lib.licenses.isc;
}) {};
"hscuid" = callPackage
@@ -94002,6 +94297,7 @@ self: {
libraryHaskellDepends = [ base hspec-expectations transformers ];
description = "A version of hspec-expectations generalized to MonadIO";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hspec-expectations-pretty" = callPackage
@@ -95174,6 +95470,7 @@ self: {
];
description = "Synthesizable Verilog DSL supporting for multiple clock and reset";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hswip" = callPackage
@@ -96197,8 +96494,8 @@ self: {
}:
mkDerivation {
pname = "http-dispatch";
- version = "0.6.0.0";
- sha256 = "67a1cea38faec49d5e9708090e567b032e186e61fa391e15eb4b524ad14786e7";
+ version = "0.6.2.0";
+ sha256 = "8838082ba44fe02bda80830c74552e6f28093617ad75c6614e199168ea7677d3";
libraryHaskellDepends = [
base base64-bytestring bytestring case-insensitive http-client
http-client-tls http-types
@@ -96207,6 +96504,7 @@ self: {
homepage = "http://github.com/owainlewis/http-dispatch#readme";
description = "High level HTTP client for Haskell";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"http-encodings" = callPackage
@@ -96477,8 +96775,8 @@ self: {
}:
mkDerivation {
pname = "http-proxy";
- version = "0.1.0.4";
- sha256 = "e5e582a106ead5c3a4a96fa96f95891f67714483e83154a6a3228bba41e756f4";
+ version = "0.1.0.5";
+ sha256 = "4406e4f19ae08d4d281d15a76c19c0661fcb7c5b9bf93c0f279001ac761894d8";
libraryHaskellDepends = [
async base blaze-builder bytestring bytestring-lexing
case-insensitive conduit conduit-extra http-client http-conduit
@@ -99478,6 +99776,18 @@ self: {
license = "GPL";
}) {};
+ "if" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "if";
+ version = "0.1.0.0";
+ sha256 = "28f673e867dbe0f51324d97fcb7884673a34912593746520a470116b167a141d";
+ libraryHaskellDepends = [ base ];
+ homepage = "https://github.com/winterland1989/if";
+ description = "(?) and (?>) conditional operator";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"ifcxt" = callPackage
({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck
, template-haskell
@@ -102812,24 +103122,26 @@ self: {
}) {};
"isobmff-builder" = callPackage
- ({ mkDerivation, base, binary, bytestring, data-default, hspec
- , singletons, tagged, text, time, type-list, type-spec
- , vector-sized
+ ({ mkDerivation, base, binary, bytestring, data-default, hspec, mtl
+ , pretty-types, QuickCheck, singletons, tagged, template-haskell
+ , text, time, type-list, type-spec, vector
}:
mkDerivation {
pname = "isobmff-builder";
- version = "0.10.5.0";
- sha256 = "b7dfa97397a823beb2d327fd97ed57cc9cec6c615659eaaa238c86b9bd4c2bf1";
+ version = "0.11.2.0";
+ sha256 = "062397e266687379d99ebe4acb7dd21b6289df1fdad079c3fef7d9ec45b1d220";
libraryHaskellDepends = [
- base bytestring data-default singletons tagged text time type-list
- type-spec vector-sized
+ base bytestring data-default mtl pretty-types singletons tagged
+ template-haskell text time type-list type-spec vector
];
testHaskellDepends = [
- base binary bytestring hspec text type-spec
+ base binary bytestring hspec mtl pretty-types QuickCheck tagged
+ text type-spec
];
homepage = "https://github.com/sheyll/isobmff-builder#readme";
description = "A (bytestring-) builder for the ISO-14496-12 base media file format";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"isohunt" = callPackage
@@ -103439,8 +103751,8 @@ self: {
}:
mkDerivation {
pname = "jack";
- version = "0.7.1";
- sha256 = "9a92d0482acb2647e46955d6ad73ba7cd4a148cd9f6c5263a405296b87a5afd9";
+ version = "0.7.1.1";
+ sha256 = "d17b5d299154edf55f479b9fc4508b662f4852e545dc47afa60b166ca7306c40";
libraryHaskellDepends = [
array base bytestring enumset event-list explicit-exception midi
non-negative transformers
@@ -103622,6 +103934,7 @@ self: {
homepage = "https://github.com/Lupino/jason#readme";
description = "A fast JASONETTE-iOS JSON combinator library for haskell";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"java-bridge" = callPackage
@@ -104214,6 +104527,7 @@ self: {
];
description = "Interface for JavaScript that works with GHCJS and GHC";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"jsaddle-wkwebview" = callPackage
@@ -104225,6 +104539,7 @@ self: {
libraryHaskellDepends = [ aeson base bytestring jsaddle ];
description = "Interface for JavaScript that works with GHCJS and GHC";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"jsc" = callPackage
@@ -104586,8 +104901,8 @@ self: {
}:
mkDerivation {
pname = "json-pointer-aeson";
- version = "0.1";
- sha256 = "b291114509843bae81251ee517d1dad5d7c904809417b35e17cc47eec04764d4";
+ version = "0.1.1";
+ sha256 = "009a92279d7965bea1a8d57751cf27de1f1a30d5afb1e8f80a813b866eba03d1";
libraryHaskellDepends = [
aeson base-prelude json-pointer unordered-containers vector
];
@@ -104806,8 +105121,8 @@ self: {
}:
mkDerivation {
pname = "json-stream";
- version = "0.4.1.2";
- sha256 = "096be98bf0f8eb13a83388a455fc123d13c18c11a598fbde31506b610c78e976";
+ version = "0.4.1.3";
+ sha256 = "1e281cfddd1c71b40e8a4b8a75dbd0c1f16b1e349edcbc5e44e45c25241ff9dc";
libraryHaskellDepends = [
aeson base bytestring scientific text unordered-containers vector
];
@@ -105230,6 +105545,8 @@ self: {
pname = "jwt";
version = "0.7.2";
sha256 = "17967413d21399596a236bc8169d9e030bb85e2b1c349c6e470543767cc20a31";
+ revision = "1";
+ editedCabalFile = "b5858c05476741b4dc7f9f075bb8c8aca128ed25a9f325d937d370aa3d4910e1";
libraryHaskellDepends = [
aeson base bytestring containers cryptonite data-default http-types
memory network-uri scientific semigroups text time
@@ -107171,7 +107488,7 @@ self: {
homepage = "http://haskell.org/haskellwiki/Lambdabot";
description = "Lambdabot is a development tool and advanced IRC bot";
license = "GPL";
- maintainers = with stdenv.lib.maintainers; [ abbradar ];
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"lambdabot-core" = callPackage
@@ -107224,6 +107541,7 @@ self: {
homepage = "http://haskell.org/haskellwiki/Lambdabot";
description = "Lambdabot Haskell plugins";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"lambdabot-irc-plugins" = callPackage
@@ -107446,29 +107764,23 @@ self: {
}) {};
"lambdacube-compiler" = callPackage
- ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
- , containers, deepseq, directory, exceptions, filepath, JuicyPixels
- , lambdacube-ir, megaparsec, monad-control, mtl
- , optparse-applicative, patience, pretty-show, process, QuickCheck
- , tasty, tasty-quickcheck, text, time, vect, vector, websockets
- , wl-pprint
+ ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring
+ , containers, directory, exceptions, filepath, lambdacube-ir
+ , megaparsec, mtl, optparse-applicative, pretty-show, semigroups
+ , text, vector
}:
mkDerivation {
pname = "lambdacube-compiler";
- version = "0.5.0.1";
- sha256 = "d84cefdf1d21e12e6d9ca92f314e35881e5b911630709e36971337dda32ad564";
+ version = "0.6.0.0";
+ sha256 = "4fae3343d4bc733a759e97324d260a10f0b07d144664b29855c37f2ea1012423";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base containers deepseq directory exceptions filepath
- lambdacube-ir megaparsec mtl pretty-show text vector wl-pprint
+ aeson ansi-wl-pprint base containers directory exceptions filepath
+ lambdacube-ir megaparsec mtl pretty-show semigroups text vector
];
executableHaskellDepends = [
- aeson async base base64-bytestring bytestring containers deepseq
- directory exceptions filepath JuicyPixels lambdacube-ir megaparsec
- monad-control mtl optparse-applicative patience pretty-show process
- QuickCheck tasty tasty-quickcheck text time vect vector websockets
- wl-pprint
+ aeson base bytestring filepath optparse-applicative
];
homepage = "http://lambdacube3d.com";
description = "LambdaCube 3D is a DSL to program GPUs";
@@ -107555,8 +107867,8 @@ self: {
}:
mkDerivation {
pname = "lambdacube-gl";
- version = "0.5.1.1";
- sha256 = "44fcd8abfd86607a65702caac4894114632590473bc1701f8e082966b79c63c3";
+ version = "0.5.1.2";
+ sha256 = "2b71bfd829096f8ac59f4e37ebdf6d8bdc4c84bdfaa6cd2c83d5e41fd05ef9fe";
libraryHaskellDepends = [
base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw
vector vector-algorithms
@@ -107571,8 +107883,8 @@ self: {
({ mkDerivation, aeson, base, containers, mtl, text, vector }:
mkDerivation {
pname = "lambdacube-ir";
- version = "0.3.0.0";
- sha256 = "4a9c3f2193984bf36eb06d13db92de541c619502a89e956e1e3a2750a4b68dbc";
+ version = "0.3.0.1";
+ sha256 = "1f28588141a7f2b5ac9847f2f35c8129e68273a3804748a71f06cd728fa001f7";
libraryHaskellDepends = [ aeson base containers mtl text vector ];
description = "LambdaCube 3D intermediate representation of 3D graphics pipelines";
license = stdenv.lib.licenses.bsd3;
@@ -109188,6 +109500,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "leapseconds" = callPackage
+ ({ mkDerivation, base, tasty, tasty-hunit, time }:
+ mkDerivation {
+ pname = "leapseconds";
+ version = "1.0";
+ sha256 = "c69b5acaf60b610ac6bc68e45c1f96161b920547dc89821220b6836ba8dfd11e";
+ revision = "1";
+ editedCabalFile = "4ffceb9290e689f9b707270ab393d57dacc9c69fc880252bfed608830a0b79d8";
+ libraryHaskellDepends = [ base time ];
+ testHaskellDepends = [ base tasty tasty-hunit time ];
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"leapseconds-announced" = callPackage
({ mkDerivation, base, QuickCheck, time }:
mkDerivation {
@@ -112219,13 +112544,14 @@ self: {
, concurrent-split, containers, data-accessor
, data-accessor-transformers, directory, event-list
, explicit-exception, filepath, html, httpd-shed, midi, midi-alsa
- , network, non-empty, non-negative, parsec, pretty, process, stm
- , stm-split, strict, transformers, unix, utility-ht, wx, wxcore
+ , network, network-uri, non-empty, non-negative, parsec, pretty
+ , process, stm, stm-split, strict, transformers, unix, utility-ht
+ , wx, wxcore
}:
mkDerivation {
pname = "live-sequencer";
- version = "0.0.5.1";
- sha256 = "d4453e597c7804b14554b873b1b2d40c043d79b488868e7c1879e50346927ac1";
+ version = "0.0.5.2";
+ sha256 = "848f38148ffbe61b0799aa471db89ade287fb06061a9b3dfbec248574dd192e1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base event-list non-negative ];
@@ -112233,8 +112559,8 @@ self: {
alsa-core alsa-seq base bytestring cgi concurrent-split containers
data-accessor data-accessor-transformers directory
explicit-exception filepath html httpd-shed midi midi-alsa network
- non-empty parsec pretty process stm stm-split strict transformers
- unix utility-ht wx wxcore
+ network-uri non-empty parsec pretty process stm stm-split strict
+ transformers unix utility-ht wx wxcore
];
homepage = "http://www.haskell.org/haskellwiki/Live-Sequencer";
description = "Live coding of MIDI music";
@@ -113026,6 +113352,7 @@ self: {
homepage = "https://github.com/scrive/log-utils";
description = "Utils for working with logs";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"log2json" = callPackage
@@ -115524,6 +115851,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "markdown_0_1_16" = callPackage
+ ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
+ , conduit, conduit-extra, containers, data-default, directory
+ , filepath, hspec, text, transformers, xml-conduit, xml-types
+ , xss-sanitize
+ }:
+ mkDerivation {
+ pname = "markdown";
+ version = "0.1.16";
+ sha256 = "08b0b352e208316ddc99c6f161704c8ecaf248c2e51f506900e344c93757ed85";
+ libraryHaskellDepends = [
+ attoparsec base blaze-html blaze-markup conduit conduit-extra
+ containers data-default text transformers xml-conduit xml-types
+ xss-sanitize
+ ];
+ testHaskellDepends = [
+ base blaze-html conduit conduit-extra containers directory filepath
+ hspec text transformers
+ ];
+ homepage = "https://github.com/snoyberg/markdown";
+ description = "Convert Markdown to HTML, with XSS protection";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"markdown-kate" = callPackage
({ mkDerivation, attoparsec, attoparsec-conduit, base, blaze-html
, conduit, containers, data-default, highlighting-kate, hspec
@@ -116470,8 +116822,8 @@ self: {
({ mkDerivation, base, heap, QuickCheck }:
mkDerivation {
pname = "median-stream";
- version = "0.3.0.0";
- sha256 = "579c8c60b7376f78e02fa5cdd950c1116198126114c610a3561109d3b2dd2b74";
+ version = "0.6.0.0";
+ sha256 = "bae6347b85b0914dee5a8a7c146b8af937bf450ce2aa09c5f62cee0811ff9a1d";
libraryHaskellDepends = [ base heap ];
testHaskellDepends = [ base QuickCheck ];
homepage = "https://github.com/caneroj1/median-stream#readme";
@@ -118410,6 +118762,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "mmorph_1_0_9" = callPackage
+ ({ mkDerivation, base, mtl, transformers, transformers-compat }:
+ mkDerivation {
+ pname = "mmorph";
+ version = "1.0.9";
+ sha256 = "e1f27d3881b254e2a87ffb21f33e332404abb180361f9d29092a85e321554563";
+ libraryHaskellDepends = [
+ base mtl transformers transformers-compat
+ ];
+ description = "Monad morphisms";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mmtl" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -122437,6 +122803,7 @@ self: {
homepage = "https://github.com/winterland1989/mysql-haskell";
description = "TLS support for mysql-haskell package using openssl";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"mysql-simple" = callPackage
@@ -123806,8 +124173,7 @@ self: {
homepage = "https://github.com/ziocroc/netwire-input-javascript";
description = "JavaScript instance of netwire-input";
license = stdenv.lib.licenses.bsd3;
- broken = true;
- }) {ghcjs-base = null;};
+ }) {};
"netwire-vinylglfw-examples" = callPackage
({ mkDerivation, array, base, bytestring, containers, directory
@@ -126517,6 +126883,30 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "octane_0_17_0" = callPackage
+ ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers
+ , data-default-class, file-embed, http-client, http-client-tls
+ , overloaded-records, rattletrap, text
+ }:
+ mkDerivation {
+ pname = "octane";
+ version = "0.17.0";
+ sha256 = "deeb94a970a88397c37e00b9f3540a98984351cd81b03477339d4747d53c0288";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bimap binary bytestring containers data-default-class
+ file-embed overloaded-records rattletrap text
+ ];
+ executableHaskellDepends = [
+ aeson base binary bytestring http-client http-client-tls
+ ];
+ homepage = "https://github.com/tfausak/octane#readme";
+ description = "Parse Rocket League replays";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"octohat" = callPackage
({ mkDerivation, aeson, base, base-compat, base16-bytestring
, base64-bytestring, bytestring, containers, cryptohash, dotenv
@@ -126834,8 +127224,8 @@ self: {
}:
mkDerivation {
pname = "ombra";
- version = "0.2.0.0";
- sha256 = "d2b256d023b9124176fc132860ba2338556ad6757ad2703bcc853d0c8bc318d9";
+ version = "0.2.1.0";
+ sha256 = "46add5581e4f4588ee409646372d7adf3e9248ca314c5c7f3319470c1b404d5c";
libraryHaskellDepends = [
base gl hashable hashtables transformers unordered-containers vect
];
@@ -127285,8 +127675,8 @@ self: {
({ mkDerivation, atomspace-cwrapper, base, transformers }:
mkDerivation {
pname = "opencog-atomspace";
- version = "0.1.0.6";
- sha256 = "2925f1fe014f33e003558db6692354b12368ee9fcad835f669470b74b9daab1a";
+ version = "0.1.0.7";
+ sha256 = "24bcde8b587dc6864b0eb450aea3a246a51d3e540bc186e3ba6ac83158a37a1b";
libraryHaskellDepends = [ base transformers ];
librarySystemDepends = [ atomspace-cwrapper ];
homepage = "github.com/opencog/atomspace/tree/master/opencog/haskell";
@@ -127844,6 +128234,7 @@ self: {
];
description = "Opentype loading and writing";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"operate-do" = callPackage
@@ -127869,10 +128260,12 @@ self: {
pname = "operational";
version = "0.2.3.4";
sha256 = "51cc8751432201f4cbef15a187ee668bca13d774eb0ef28c8e3d36f633866810";
+ revision = "2";
+ editedCabalFile = "8cff8abd98ae819678745b9d6071c51acaa281f386a13c166ef3c27161e372f1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base mtl ];
- executableHaskellDepends = [ random ];
+ executableHaskellDepends = [ base random ];
homepage = "http://wiki.haskell.org/Operational";
description = "Implementation of difficult monads made easy with operational semantics";
license = stdenv.lib.licenses.bsd3;
@@ -130057,12 +130450,12 @@ self: {
}) {};
"parsec-extra" = callPackage
- ({ mkDerivation, base, monads-tf, parsec, transformers }:
+ ({ mkDerivation, base, monads-tf, parsec }:
mkDerivation {
pname = "parsec-extra";
- version = "0.1.0.5";
- sha256 = "c463e37a18a5f661a51e5b1b67b7b025bafa969fada109eef3467ce4e9bcb474";
- libraryHaskellDepends = [ base monads-tf parsec transformers ];
+ version = "0.2.0.0";
+ sha256 = "4936ab0b529d041524917304c45a140901482ba1d672d8a96c169c36e7dfc702";
+ libraryHaskellDepends = [ base monads-tf parsec ];
description = "Some miscellaneous basic string parsers";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -131957,8 +132350,8 @@ self: {
({ mkDerivation, attoparsec, base, hspec, text }:
mkDerivation {
pname = "persistent-parser";
- version = "0.1.0.1";
- sha256 = "9ec9dda9721c20aab99ff0414c08b552c4b8893ee896460c99ae7ef960017c27";
+ version = "0.1.0.2";
+ sha256 = "124eb0c33845a823f5196f895201fceb8a99e52abc5f6197fc76b5981ff6bf77";
libraryHaskellDepends = [ attoparsec base text ];
testHaskellDepends = [ attoparsec base hspec text ];
description = "Parse persistent model files";
@@ -134493,6 +134886,32 @@ self: {
license = "GPL";
}) {};
+ "plots" = callPackage
+ ({ mkDerivation, adjunctions, base, base-orphans, colour
+ , containers, data-default, diagrams-core, diagrams-lib, directory
+ , distributive, filepath, fingertree, hashable, intervals
+ , JuicyPixels, lens, linear, monoid-extras, mtl
+ , optparse-applicative, process, profunctors, semigroupoids
+ , semigroups, split, statistics, time, transformers, vector
+ }:
+ mkDerivation {
+ pname = "plots";
+ version = "0.1.0.2";
+ sha256 = "e5c1a5f858f2bbfb531d5d0af6a070ff8fa2bd936b3a4c30b6ca65838c16b64d";
+ revision = "1";
+ editedCabalFile = "3d45b5b973339a50d0686153d77b0f1e438c1a890e75c2274830e878e9fd78d8";
+ libraryHaskellDepends = [
+ adjunctions base base-orphans colour containers data-default
+ diagrams-core diagrams-lib directory distributive filepath
+ fingertree hashable intervals JuicyPixels lens linear monoid-extras
+ mtl optparse-applicative process profunctors semigroupoids
+ semigroups split statistics time transformers vector
+ ];
+ homepage = "http://github.com/cchalmers/plots";
+ description = "Diagrams based plotting library";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"plotserver-api" = callPackage
({ mkDerivation, base, curl, split }:
mkDerivation {
@@ -134801,6 +135220,8 @@ self: {
pname = "pointful";
version = "1.0.9";
sha256 = "6a1881236419751beb5b2e4e495bd9093ea2dec3f3cbd44e2a62aaabe53cacd6";
+ revision = "1";
+ editedCabalFile = "5a0ac6eb52c232cca59759b25a34eff0d89f614332b088baaa8b11e27fb19c8e";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -136863,6 +137284,22 @@ self: {
license = "GPL";
}) {};
+ "pretty-display" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, base, pretty-show, text }:
+ mkDerivation {
+ pname = "pretty-display";
+ version = "0.1.9";
+ sha256 = "3913780e6e3aace5cd63d9b8dd8454ab8c08f6bf10d44ac19c70dc059341909c";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base pretty-show text ];
+ executableHaskellDepends = [ ansi-wl-pprint base pretty-show ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/githubuser/pretty-display#readme";
+ description = "Typeclass for human-readable display";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"pretty-error" = callPackage
({ mkDerivation, base, basic-prelude, bytestring, pretty-show }:
mkDerivation {
@@ -137044,6 +137481,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "primitive_0_6_2_0" = callPackage
+ ({ mkDerivation, base, ghc-prim, transformers }:
+ mkDerivation {
+ pname = "primitive";
+ version = "0.6.2.0";
+ sha256 = "b8e8d70213e22b3fab0e0d11525c02627489618988fdc636052ca0adce282ae1";
+ libraryHaskellDepends = [ base ghc-prim transformers ];
+ testHaskellDepends = [ base ghc-prim ];
+ homepage = "https://github.com/haskell/primitive";
+ description = "Primitive memory-related operations";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"primitive-simd" = callPackage
({ mkDerivation, base, ghc-prim, primitive, vector }:
mkDerivation {
@@ -138092,10 +138543,8 @@ self: {
({ mkDerivation, alsaLib, base, c2hs }:
mkDerivation {
pname = "proteaaudio";
- version = "0.6.4";
- sha256 = "a0343bff81c0920c75cd24b8a5ff2d16ad0e3fdd4b285f65e611dcac0ced4f32";
- revision = "1";
- editedCabalFile = "44188158887c112fc181793db917e4ca4ffdb8f6889f25e36cc262aeba7877a3";
+ version = "0.6.5";
+ sha256 = "37c7d4272502afe08736bdbab192c95da578a71a6c1ae3ae7beea1fa797b342e";
libraryHaskellDepends = [ base ];
librarySystemDepends = [ alsaLib ];
libraryToolDepends = [ c2hs ];
@@ -138607,12 +139056,12 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "publicsuffix_0_20161104" = callPackage
+ "publicsuffix_0_20161116" = callPackage
({ mkDerivation, base, filepath, hspec, template-haskell }:
mkDerivation {
pname = "publicsuffix";
- version = "0.20161104";
- sha256 = "b80360a305ae44f92548195e699751a00df1c812546453c1b415058ac00e24f4";
+ version = "0.20161116";
+ sha256 = "615ad3cb9a0489403595c79979c3cc9820d03e02fc2a9481d646188f16f64ce8";
libraryHaskellDepends = [ base filepath template-haskell ];
testHaskellDepends = [ base hspec ];
homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
@@ -139082,6 +139531,7 @@ self: {
HUnit mtl optparse-applicative parsec process protolude silently
stm text time transformers transformers-compat utf8-string vector
];
+ doCheck = false;
homepage = "http://www.purescript.org/";
description = "PureScript Programming Language Compiler";
license = stdenv.lib.licenses.mit;
@@ -139132,6 +139582,7 @@ self: {
HUnit mtl optparse-applicative parsec process protolude silently
stm text time transformers transformers-compat utf8-string vector
];
+ doCheck = false;
homepage = "http://www.purescript.org/";
description = "PureScript Programming Language Compiler";
license = stdenv.lib.licenses.bsd3;
@@ -141422,7 +141873,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "rasterific-svg_0_3_2" = callPackage
+ "rasterific-svg_0_3_2_1" = callPackage
({ mkDerivation, base, binary, bytestring, containers, directory
, filepath, FontyFruity, JuicyPixels, lens, linear, mtl
, optparse-applicative, primitive, Rasterific, scientific, svg-tree
@@ -141430,8 +141881,8 @@ self: {
}:
mkDerivation {
pname = "rasterific-svg";
- version = "0.3.2";
- sha256 = "ab43e8e6d2800f88becc1c619691ce7b2b63f35ce6007a904c5119b8c1711d23";
+ version = "0.3.2.1";
+ sha256 = "717e87ea679f5fda726bfbbdbfafa40305bece2cce5ad137027e26eaeb57afdf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -141655,10 +142106,8 @@ self: {
({ mkDerivation, base, bytestring, template-haskell, text }:
mkDerivation {
pname = "rawstring-qm";
- version = "0.2.2.2";
- sha256 = "e62f4f9bbb7e67b2cf1bf39e1765cce6ede6b9669ed17447e7531364b5307a40";
- revision = "1";
- editedCabalFile = "d856c4c9407a2bf37aa5c129a34109bdbeec1cecbdcd91f84be9efcb972ab954";
+ version = "0.2.3.0";
+ sha256 = "11a177bb7d685fb6a98390630196bd544e877b7460648e61a2905c21a71268fe";
libraryHaskellDepends = [ base bytestring template-haskell text ];
homepage = "https://github.com/tolysz/rawstring-qm";
description = "Simple raw string quotation and dictionary interpolation";
@@ -141979,8 +142428,8 @@ self: {
}:
mkDerivation {
pname = "reactive-balsa";
- version = "0.2.0.1";
- sha256 = "42ea83a158dee24bbe3a031d4222e195cf0b1844cba5b63c82173b261bfc5a71";
+ version = "0.3";
+ sha256 = "40d188ec262613a445d7e2ac06fbbd281555c45985981efe7dae45a42b83fcc0";
libraryHaskellDepends = [
alsa-core alsa-seq base containers data-accessor
data-accessor-transformers event-list extensible-exceptions midi
@@ -142140,8 +142589,8 @@ self: {
}:
mkDerivation {
pname = "reactive-jack";
- version = "0.2.0.1";
- sha256 = "8facc607ec889c7a871cd61975d7e4e0760b0064583ad1a0da938fe4fcd702cd";
+ version = "0.3";
+ sha256 = "c94b9ceda912e859146267cb418afcea0428039bffb1f8ac0ede9f2027d2645c";
libraryHaskellDepends = [
base containers data-accessor event-list explicit-exception
extensible-exceptions jack midi non-negative random reactive-banana
@@ -142160,8 +142609,8 @@ self: {
}:
mkDerivation {
pname = "reactive-midyim";
- version = "0.2.1";
- sha256 = "3d8180f416b2efd948d067d9c5c1cdcb2c8b6933093435e55e02a7e63425669c";
+ version = "0.3";
+ sha256 = "dd1e2d69035249ff92d633a25d3c1393810fa5477b8e18731354be37ff558f25";
libraryHaskellDepends = [
base containers data-accessor data-accessor-transformers event-list
midi non-negative random reactive-banana transformers utility-ht
@@ -142419,6 +142868,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "rebindable" = callPackage
+ ({ mkDerivation, base, data-default-class, indexed }:
+ mkDerivation {
+ pname = "rebindable";
+ version = "0.1.2";
+ sha256 = "e752ad9aa91d4c96d43865c1e3eefd93c767b8765b82c77be58e4142ca8ca17d";
+ libraryHaskellDepends = [ base data-default-class indexed ];
+ homepage = "https://github.com/sleexyz/rebindable";
+ description = "A library to facilitate rebinding of Haskell syntax";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"recaptcha" = callPackage
({ mkDerivation, base, HTTP, network, network-uri, xhtml }:
mkDerivation {
@@ -142780,6 +143241,7 @@ self: {
homepage = "http://chriswarbo.net/projects/repos/reduce-equations.html";
description = "Simplify a set of equations by removing redundancies";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"reducers" = callPackage
@@ -144992,6 +145454,7 @@ self: {
homepage = "https://github.com/mrkkrp/req";
description = "Easy-to-use, type-safe, expandable, high-level HTTP library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"req-conduit" = callPackage
@@ -145012,6 +145475,7 @@ self: {
homepage = "https://github.com/mrkkrp/req-conduit";
description = "Conduit helpers for the req HTTP client library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"reqcatcher" = callPackage
@@ -147477,6 +147941,7 @@ self: {
homepage = "http://chriswarbo.net/projects/repos/runtime-arbitrary.html";
description = "Runtime generation of Arbitrary values";
license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"rvar" = callPackage
@@ -148358,6 +148823,21 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "say" = callPackage
+ ({ mkDerivation, base, bytestring, hspec, temporary, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "say";
+ version = "0.1.0.0";
+ sha256 = "f26fdb94ed81a2ae503beca0dcea74da7ee37408ba2e41ab3fdcaa9a7622fc40";
+ libraryHaskellDepends = [ base bytestring text transformers ];
+ testHaskellDepends = [ base bytestring hspec temporary text ];
+ homepage = "https://github.com/fpco/say#readme";
+ description = "Initial project template from stack";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"sbp" = callPackage
({ mkDerivation, aeson, array, base, base64-bytestring
, basic-prelude, binary, binary-conduit, bytestring, conduit
@@ -150250,8 +150730,8 @@ self: {
({ mkDerivation, base, containers, doctest, smallcheck }:
mkDerivation {
pname = "semiring-num";
- version = "0.3.0.0";
- sha256 = "75178637123f1d7bcef23346065aae3a4d57ac4a0aba7ad8fb9f78c98f0f08ec";
+ version = "0.5.3.1";
+ sha256 = "f61b090bad8407b1ba50a136a5f14fdac92e4eb69f1aa0ce2d67f318ab33df20";
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [ base containers doctest smallcheck ];
homepage = "https://github.com/oisdk/semiring-num";
@@ -150747,6 +151227,8 @@ self: {
pname = "serokell-util";
version = "0.1.1.1";
sha256 = "8411ea10fcff87ce1d2fbe177cf2b3d6d254dc66cded2f49867daeed8334e427";
+ revision = "1";
+ editedCabalFile = "34fcc8e8cd473bab43aec11ed13d068aebb6f22298268f038798a6c7fd7f2b85";
libraryHaskellDepends = [
acid-state aeson aeson-extra base base16-bytestring
base64-bytestring binary binary-orphans bytestring cereal
@@ -150999,29 +151481,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "servant-auth-cookie_0_4_1" = callPackage
+ "servant-auth-cookie_0_4" = callPackage
({ mkDerivation, base, base-compat, base64-bytestring
- , blaze-builder, blaze-html, blaze-markup, bytestring
- , bytestring-conversion, cereal, cookie, cryptonite, data-default
- , deepseq, exceptions, hspec, http-media, http-types, memory, mtl
- , QuickCheck, servant, servant-blaze, servant-server, tagged, text
- , time, transformers, wai, warp
+ , blaze-builder, blaze-html, blaze-markup, bytestring, cereal
+ , cookie, cryptonite, data-default, deepseq, exceptions, hspec
+ , http-api-data, http-media, http-types, memory, mtl, QuickCheck
+ , servant, servant-blaze, servant-server, tagged, text, time
+ , transformers, wai, warp
}:
mkDerivation {
pname = "servant-auth-cookie";
- version = "0.4.1";
- sha256 = "d9d59d1204c372068e2de7ccf352982ba17f2dc610f9b1f0bb21048dcf346222";
+ version = "0.4";
+ sha256 = "2b5144612cbf8835b5f069f885d9f32483a63884d5d008c7110dd9273756eef1";
libraryHaskellDepends = [
- base base64-bytestring blaze-builder bytestring
- bytestring-conversion cereal cookie cryptonite data-default
- exceptions http-types memory mtl servant servant-server tagged time
- transformers wai
+ base base64-bytestring blaze-builder bytestring cereal cookie
+ cryptonite data-default exceptions http-api-data http-types memory
+ mtl servant servant-server tagged time transformers wai
];
testHaskellDepends = [
- base base-compat blaze-html blaze-markup bytestring
- bytestring-conversion cereal cryptonite data-default deepseq hspec
- http-media mtl QuickCheck servant servant-blaze servant-server text
- time wai warp
+ base base-compat blaze-html blaze-markup bytestring cereal
+ cryptonite data-default deepseq hspec http-api-data http-media mtl
+ QuickCheck servant servant-blaze servant-server text time wai warp
];
description = "Authentication via encrypted cookies";
license = stdenv.lib.licenses.bsd3;
@@ -152979,6 +153459,33 @@ self: {
maintainers = with stdenv.lib.maintainers; [ psibi ];
}) {};
+ "shakespeare_2_0_11_2" = callPackage
+ ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
+ , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
+ , process, scientific, template-haskell, text, time, transformers
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "shakespeare";
+ version = "2.0.11.2";
+ sha256 = "536327335c60f144aa372e4e0f163097bb0b435e28438bf7c54f1f22271f71d4";
+ libraryHaskellDepends = [
+ aeson base blaze-html blaze-markup bytestring containers directory
+ exceptions ghc-prim parsec process scientific template-haskell text
+ time transformers unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base blaze-html blaze-markup bytestring containers directory
+ exceptions ghc-prim hspec HUnit parsec process template-haskell
+ text time transformers
+ ];
+ homepage = "http://www.yesodweb.com/book/shakespearean-templates";
+ description = "A toolkit for making compile-time interpolated templates";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ maintainers = with stdenv.lib.maintainers; [ psibi ];
+ }) {};
+
"shakespeare-babel" = callPackage
({ mkDerivation, base, classy-prelude, data-default, directory
, process, shakespeare, template-haskell
@@ -153434,6 +153941,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "shikensu" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, directory, filepath, flow
+ , Glob, tasty, tasty-hunit, text, unordered-containers
+ }:
+ mkDerivation {
+ pname = "shikensu";
+ version = "0.1.2";
+ sha256 = "ad596f07202898eff28471720a7784f4b70bce4eeea0b8b7a4c47390a4f4f817";
+ libraryHaskellDepends = [
+ aeson base bytestring directory filepath flow Glob
+ unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson base bytestring directory filepath flow tasty tasty-hunit
+ text unordered-containers
+ ];
+ homepage = "https://github.com/icidasset/shikensu#README";
+ description = "A small toolset for building static websites";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"shine" = callPackage
({ mkDerivation, base, ghcjs-dom, ghcjs-prim, keycode, mtl, time
, transformers
@@ -154094,6 +154622,7 @@ self: {
homepage = "https://gitlab.com/LukaHorvat/simple-effects";
description = "A simple effect system that integrates with MTL";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"simple-eval" = callPackage
@@ -154261,8 +154790,8 @@ self: {
({ mkDerivation, base, fast-logger, mtl, text }:
mkDerivation {
pname = "simple-logger";
- version = "0.0.1";
- sha256 = "01efbc3f3859deb175d157e983f3497a4db2eb00b7daf35da9431bcdf484f4eb";
+ version = "0.0.3";
+ sha256 = "5fb002bcf2eaf6aac949acea31d0ee65a08fc4d34f6baf222db4db05c8165ec1";
libraryHaskellDepends = [ base fast-logger mtl text ];
homepage = "https://github.com/agrafix/simple-logger#readme";
description = "A very simple but efficient logging framework";
@@ -156953,6 +157482,8 @@ self: {
pname = "snaplet-sqlite-simple";
version = "1.0.0.2";
sha256 = "2d12f405b1a796d587a43646aa136c4a0e9e5761212cbdb84014e226bed360d7";
+ revision = "1";
+ editedCabalFile = "9c49f31dc5e4b6b10942502f2d57755fc028ff2924f2c94a32030e172d19493e";
libraryHaskellDepends = [
aeson base bytestring clientsession configurator direct-sqlite lens
lifted-base monad-control mtl snap sqlite-simple text transformers
@@ -156970,6 +157501,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "snaplet-sqlite-simple-jwt-auth" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bcrypt, bytestring
+ , clientsession, containers, directory, either, errors, jwt, lens
+ , mtl, snap, snap-core, snaplet-sqlite-simple, sqlite-simple, text
+ , time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "snaplet-sqlite-simple-jwt-auth";
+ version = "0.1.1.0";
+ sha256 = "64afbefedfc6eda854c4b34e8bd8e69be84d2042aa81cfe0305d53ddf1b62fd2";
+ libraryHaskellDepends = [
+ aeson attoparsec base bcrypt bytestring clientsession containers
+ directory either errors jwt lens mtl snap snap-core
+ snaplet-sqlite-simple sqlite-simple text time unordered-containers
+ ];
+ homepage = "https://github.com/nurpax/snaplet-sqlite-simple-jwt-auth#readme";
+ description = "Snaplet for JWT authentication with snaplet-sqlite-simple";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"snaplet-stripe" = callPackage
({ mkDerivation, base, bytestring, configurator, heist
, lens-family-core, mtl, snap, stripe, text, text-format
@@ -157487,12 +158038,12 @@ self: {
({ mkDerivation, base, bytestring, lksctp-tools, socket }:
mkDerivation {
pname = "socket-sctp";
- version = "0.1.0.0";
- sha256 = "48ef7cae7ac4ed6674173716a598b611f704c38e14c1ac1006f1f730da60b9f5";
+ version = "0.2.0.1";
+ sha256 = "65944b69c49d176a9c542bb03a1762dae3428b97aab76825381e22dc37ada036";
libraryHaskellDepends = [ base bytestring socket ];
librarySystemDepends = [ lksctp-tools ];
testHaskellDepends = [ base bytestring socket ];
- homepage = "https://github.com/lpeterse/haskell-socket-sctp";
+ homepage = "https://github.com/shlevy/haskell-socket-sctp";
description = "STCP socket extensions library";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -158754,8 +159305,8 @@ self: {
}:
mkDerivation {
pname = "sproxy";
- version = "0.9.8";
- sha256 = "255f78f65439ad2e8e0f05fe9df5d07b07863b433bda486b67c3a6c4e0a0311a";
+ version = "0.9.9";
+ sha256 = "161ba53469bb2b9c331ff678125ec5917a28de8cdd30084628219f89fbb1fb08";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -158792,6 +159343,32 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "sproxy2" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
+ , bytestring, cereal, conduit, containers, cookie, docopt, entropy
+ , Glob, http-client, http-conduit, http-types
+ , interpolatedstring-perl6, network, postgresql-simple
+ , resource-pool, SHA, sqlite-simple, text, time, unix
+ , unordered-containers, wai, wai-conduit, warp, warp-tls, word8
+ , yaml
+ }:
+ mkDerivation {
+ pname = "sproxy2";
+ version = "1.90.0";
+ sha256 = "6df57f02d8002e4f80cf0531adef08b6dc112b51861c2d5dec38afefa5582ef7";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ aeson base base64-bytestring blaze-builder bytestring cereal
+ conduit containers cookie docopt entropy Glob http-client
+ http-conduit http-types interpolatedstring-perl6 network
+ postgresql-simple resource-pool SHA sqlite-simple text time unix
+ unordered-containers wai wai-conduit warp warp-tls word8 yaml
+ ];
+ description = "Secure HTTP proxy for authenticating users via OAuth2";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"spsa" = callPackage
({ mkDerivation, base, hmatrix, HUnit, mtl, QuickCheck, random
, test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -158972,6 +159549,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "sqlite-simple_0_4_10_0" = callPackage
+ ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
+ , blaze-textual, bytestring, containers, direct-sqlite, HUnit, text
+ , time, transformers
+ }:
+ mkDerivation {
+ pname = "sqlite-simple";
+ version = "0.4.10.0";
+ sha256 = "634a7c5728da62899b5b72c372e0da7571a7d26a1162f9490e44d79a2ff04df2";
+ libraryHaskellDepends = [
+ attoparsec base blaze-builder blaze-textual bytestring containers
+ direct-sqlite text time transformers
+ ];
+ testHaskellDepends = [
+ base base16-bytestring bytestring direct-sqlite HUnit text time
+ ];
+ homepage = "http://github.com/nurpax/sqlite-simple";
+ description = "Mid-Level SQLite client library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"sqlite-simple-errors" = callPackage
({ mkDerivation, base, mtl, parsec, sqlite-simple, text }:
mkDerivation {
@@ -159298,8 +159897,8 @@ self: {
({ mkDerivation, base, ghc-prim }:
mkDerivation {
pname = "stable-marriage";
- version = "0.1.1.0";
- sha256 = "12da2128ef67c7f30e9bf1fef0ccffc323bbdfc0699126945c422a52a25d09b2";
+ version = "0.1.2.0";
+ sha256 = "bf6e85899194446dc86b40cbfe9363dd5798a204d45f6911f98ab6ffda4fa9f6";
libraryHaskellDepends = [ base ghc-prim ];
homepage = "http://github.com/cutsea110/stable-marriage";
description = "algorithms around stable marriage";
@@ -160759,6 +161358,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "stm-supply" = callPackage
+ ({ mkDerivation, async, base, concurrent-supply, QuickCheck, random
+ , Unique
+ }:
+ mkDerivation {
+ pname = "stm-supply";
+ version = "0.2.0.0";
+ sha256 = "f839ada6e5ac9549731086ed13fcf4c9f03a6ff93d64c0a857148820864f388c";
+ libraryHaskellDepends = [ base concurrent-supply ];
+ testHaskellDepends = [ async base QuickCheck random Unique ];
+ homepage = "https://github.com/caneroj1/stm-supply#readme";
+ description = "STM wrapper around Control.Concurrent.Supply.";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"stm-tlist" = callPackage
({ mkDerivation, base, stm }:
mkDerivation {
@@ -163888,6 +164502,8 @@ self: {
pname = "system-locale";
version = "0.1.0.0";
sha256 = "0df7815525b55d875e8c0393f22c3595655a90a0701b5208799f97e653686fab";
+ revision = "1";
+ editedCabalFile = "3681691c486cb637328329037f5ccb6bc266310cc4db7bb04072a7084328cfa4";
libraryHaskellDepends = [ base megaparsec process time ];
testHaskellDepends = [ base hspec ];
homepage = "https://github.com/cocreature/system-locale";
@@ -164136,6 +164752,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "tabl" = callPackage
+ ({ mkDerivation, base, safe, text }:
+ mkDerivation {
+ pname = "tabl";
+ version = "0.1.0.0";
+ sha256 = "4adb4507af71badd8cb5f076d8c996f9e26e8102e4c2361a93bad1ae303c9b2e";
+ libraryHaskellDepends = [ base safe text ];
+ homepage = "https://github.com/lovasko/tabl";
+ description = "Table layout";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"table" = callPackage
({ mkDerivation, base, csv, optparse-applicative, process, split }:
mkDerivation {
@@ -165136,6 +165764,7 @@ self: {
homepage = "https://github.com/lwm/tasty-discover/";
description = "Test discovery for the tasty framework";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tasty-expected-failure" = callPackage
@@ -165656,6 +166285,7 @@ self: {
homepage = "https://github.com/winterland1989/tcp-streams";
description = "Tcp streams using openssl for tls support";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tdd-util" = callPackage
@@ -167588,6 +168218,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "text-utils" = callPackage
+ ({ mkDerivation, base, HTF, text }:
+ mkDerivation {
+ pname = "text-utils";
+ version = "0.1.0.0";
+ sha256 = "63b6e0bc28907593a5a98c5e27be3ab22b44cdb66c4095461fe4dd683f262662";
+ libraryHaskellDepends = [ base text ];
+ testHaskellDepends = [ base HTF text ];
+ homepage = "https://github.com/agrafix/text-utils#readme";
+ description = "Various text utilities";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"text-xml-generic" = callPackage
({ mkDerivation, base, bytestring, containers, haskell98, mtl
, not-in-base, split, syb, template-haskell, xml
@@ -167972,8 +168615,8 @@ self: {
({ mkDerivation, base, template-haskell }:
mkDerivation {
pname = "th-inline-io-action";
- version = "0.1.0.0";
- sha256 = "8f7fa350547913e30a26930cad3560044be1f440ad0159ff19d9291bec887dfb";
+ version = "0.1.0.1";
+ sha256 = "78dae84932b62a5dd487cbcc803d519bab4ba1bec867271a234898e2fd73bd27";
libraryHaskellDepends = [ base template-haskell ];
homepage = "https://github.com/tolysz/inline-io-action";
description = "Simple inline IO action into compiled code using TH";
@@ -168745,12 +169388,13 @@ self: {
, gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens
, mime-types, mtl, network, process, random, scientific, split
, tasty, tasty-quickcheck, text, transformers, unordered-containers
- , utf8-string, vector, xdg-basedir, xmonad, xmonad-contrib
+ , utf8-string, vector, webkit2gtk, xdg-basedir, xmonad
+ , xmonad-contrib
}:
mkDerivation {
pname = "tianbar";
- version = "1.2.3.0";
- sha256 = "d6f81bb178bf6a0f836269b13659b068c60c912f5a4d76e86be3228ca15168b3";
+ version = "1.2.4";
+ sha256 = "f0b09681dcdad8ba282d8572227401008175b326998b20a1391b720a3087db00";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -168762,7 +169406,7 @@ self: {
mime-types mtl network process random scientific split text
transformers unordered-containers utf8-string vector xdg-basedir
];
- executablePkgconfigDepends = [ gtk3 ];
+ executablePkgconfigDepends = [ gtk3 webkit2gtk ];
testHaskellDepends = [
aeson base bytestring containers dbus directory filepath gi-gdk
gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens
@@ -168774,7 +169418,7 @@ self: {
description = "A desktop bar based on WebKit";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {gtk3 = pkgs.gnome3.gtk;};
+ }) {gtk3 = pkgs.gnome3.gtk; webkit2gtk = null;};
"tic-tac-toe" = callPackage
({ mkDerivation, base, glade, gtk, haskell98 }:
@@ -169011,14 +169655,14 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "time_1_6_0_1" = callPackage
+ "time_1_7" = callPackage
({ mkDerivation, base, deepseq, QuickCheck, test-framework
, test-framework-quickcheck2, unix
}:
mkDerivation {
pname = "time";
- version = "1.6.0.1";
- sha256 = "ff69b46f38f4d226b171d078b200f8a5a1e8cfeadfa543eabade51355d7c7fcb";
+ version = "1.7";
+ sha256 = "a30e1ea20cc59f3bf6ee2d5fd0a0dfa58f1ec865681d762cf1bb1103562e2a7a";
libraryHaskellDepends = [ base deepseq ];
testHaskellDepends = [
base deepseq QuickCheck test-framework test-framework-quickcheck2
@@ -169307,8 +169951,8 @@ self: {
}:
mkDerivation {
pname = "time-warp";
- version = "0.1.1.1";
- sha256 = "52bdeb1608ee7a5688ffec46fda64437a8bbb8d9648ce4f0a523a15405c9ea18";
+ version = "0.1.1.2";
+ sha256 = "8a919958cbef95ff3960046f5854801b649b60c8e1fbd187ce1ae298c3c11187";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -169331,6 +169975,7 @@ self: {
homepage = "https://github.com/serokell/time-warp";
description = "Distributed systems execution emulation";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"timecalc" = callPackage
@@ -174601,6 +175246,8 @@ self: {
pname = "unix";
version = "2.7.2.1";
sha256 = "fc05365594367779122465eee132162267c319c3679ff801f050ed30d18d099c";
+ revision = "1";
+ editedCabalFile = "3db1b6e8de36a36fc4f979e1045e82554f16c736961fa0392e42b7b3f4decfd4";
libraryHaskellDepends = [ base bytestring time ];
homepage = "https://github.com/haskell/unix";
description = "POSIX functionality";
@@ -175550,6 +176197,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "users-mysql-haskell" = callPackage
+ ({ mkDerivation, base, bytestring, io-streams, mysql-haskell, tasty
+ , tasty-hunit, text, time, transformers, users, uuid
+ }:
+ mkDerivation {
+ pname = "users-mysql-haskell";
+ version = "0.5.2.0";
+ sha256 = "a7f7a2d91860e2dc4594639776aaff06c981f01aaa356553c397d50a0f367930";
+ libraryHaskellDepends = [
+ base io-streams mysql-haskell text time transformers users uuid
+ ];
+ testHaskellDepends = [
+ base bytestring io-streams mysql-haskell tasty tasty-hunit text
+ time transformers users uuid
+ ];
+ description = "A mysql-haskell backend for the users library";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"users-persistent" = callPackage
({ mkDerivation, base, bytestring, esqueleto, hspec, monad-logger
, mtl, persistent, persistent-sqlite, persistent-template
@@ -176727,8 +177393,8 @@ self: {
pname = "vector";
version = "0.11.0.0";
sha256 = "0a5320ed44c3f2b04b7f61e0f63f4fcd5b337524e601e01d5813ace3f5a432e4";
- revision = "1";
- editedCabalFile = "dfdf3252519ff35da59f977b7d37d6c5a6660673ce1234899af0111f7ece9c66";
+ revision = "2";
+ editedCabalFile = "2bfafd758ab4d80fa7a16b0a650aff60fb1be109728bed6ede144baf1f744ace";
libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
testHaskellDepends = [
base QuickCheck random template-haskell test-framework
@@ -177227,12 +177893,12 @@ self: {
({ mkDerivation, async, attoparsec, base, cabal-file-th, containers
, directory, doctest, fingertree, lens, lifted-base, mmorph, mtl
, pipes, pipes-concurrency, process, QuickCheck, stm, tasty
- , tasty-quickcheck, template-haskell, text, transformers, unix, vty
+ , tasty-quickcheck, text, transformers, unix, vty
}:
mkDerivation {
pname = "vgrep";
- version = "0.1.4.0";
- sha256 = "353bd92260e225c892d26d6926e9668016187d8ef50311b8f80ae55fc82ed29b";
+ version = "0.1.4.1";
+ sha256 = "5362e0a156df7e01be495da161d63d62e9e31d82e8290ca2d1b02c5ec9c24cd9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -177241,7 +177907,7 @@ self: {
];
executableHaskellDepends = [
async base cabal-file-th containers directory lens mtl pipes
- pipes-concurrency process template-haskell text unix vty
+ pipes-concurrency process text unix vty
];
testHaskellDepends = [
base containers doctest lens QuickCheck tasty tasty-quickcheck text
@@ -177841,7 +178507,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "vty_5_12" = callPackage
+ "vty_5_13" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
, data-default, deepseq, directory, filepath, hashable, HUnit
, microlens, microlens-mtl, microlens-th, mtl, parallel, parsec
@@ -177852,8 +178518,8 @@ self: {
}:
mkDerivation {
pname = "vty";
- version = "5.12";
- sha256 = "999cc0c66a6e08cada8810f91b0f08e33282361cc01182ea3774e96b13642a56";
+ version = "5.13";
+ sha256 = "1eabce0fa3ebfe22a4ff1324a5dc48d1fc1363bfe362b6df0b3801ca63b1f117";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -178286,8 +178952,8 @@ self: {
}:
mkDerivation {
pname = "wai-frontend-monadcgi";
- version = "3.0.0.2";
- sha256 = "c3e01b29a1a1c2a0934adc7e0c208454be525b2da1303a8b86391aa70c8ddc91";
+ version = "3.0.0.3";
+ sha256 = "b140ad372252e638dfa7a8d8d48ae84121b1b67dc6454801302a15bd8cf42729";
libraryHaskellDepends = [
base bytestring case-insensitive cgi containers http-types
transformers wai
@@ -181491,8 +182157,8 @@ self: {
({ mkDerivation, base, containers, doctest, hspec, time }:
mkDerivation {
pname = "workdays";
- version = "0.1.0";
- sha256 = "61c41d0b6257630ed2e9b484264a8f0c19595e6f0bf1c30dd35129951bd4a4de";
+ version = "0.1.1";
+ sha256 = "871cf67b17ca57f91ce73295311e4ffa5f6c8301908cbd182d6b7c50d48289e7";
libraryHaskellDepends = [ base containers time ];
testHaskellDepends = [ base containers doctest hspec ];
homepage = "https://github.com/stackbuilders/workdays";
@@ -182959,7 +183625,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "xml-conduit_1_4_0_1" = callPackage
+ "xml-conduit_1_4_0_2" = callPackage
({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
, blaze-markup, bytestring, conduit, conduit-extra, containers
, data-default, deepseq, hspec, HUnit, monad-control, resourcet
@@ -182967,8 +183633,8 @@ self: {
}:
mkDerivation {
pname = "xml-conduit";
- version = "1.4.0.1";
- sha256 = "7c9c171230bcb66b1ab6b0b201f6e5666c79ad4eb0747e68eb1d932591ab1700";
+ version = "1.4.0.2";
+ sha256 = "55f77ce489fd04a2602733a55e8b7487a565f9bbb877a7ce606f2fd6c1fbe318";
libraryHaskellDepends = [
attoparsec base blaze-builder blaze-html blaze-markup bytestring
conduit conduit-extra containers data-default deepseq monad-control
@@ -185782,8 +186448,8 @@ self: {
}:
mkDerivation {
pname = "yesod-markdown";
- version = "0.11.1";
- sha256 = "76ce2fbc55ed6e23c70fea32441c38a6466888695b8c48035471343c407efd2f";
+ version = "0.11.2";
+ sha256 = "28a1b1dbcc5a171ee88b8eb1850aef43cf17d03553b29116ca0934721c228ae3";
libraryHaskellDepends = [
base blaze-html blaze-markup bytestring directory pandoc persistent
shakespeare texmath text xss-sanitize yesod-core yesod-form
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 66e151aefe3c..7929d99de153 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -47,7 +47,10 @@ let
in
if paths == [] && !withLLVM then ghc else
buildEnv {
- inherit (ghc) name;
+ # this makes computing paths from the name attribute impossible;
+ # if such a feature is needed, the real compiler name should be saved
+ # as a dedicated drv attribute, like `compiler-name`
+ name = ghc.name + "-with-packages";
paths = paths ++ [ghc];
inherit ignoreCollisions;
postBuild = ''
diff --git a/pkgs/development/interpreters/erlang/R16B03-1-basho.nix b/pkgs/development/interpreters/erlang/R16B03-1-basho.nix
new file mode 100644
index 000000000000..cbb5f0789fa2
--- /dev/null
+++ b/pkgs/development/interpreters/erlang/R16B03-1-basho.nix
@@ -0,0 +1,98 @@
+{ stdenv, fetchurl, fetchgit, perl, gnum4, ncurses, openssl, autoconf264, gcc, erlang
+, gnused, gawk, makeWrapper
+, odbcSupport ? false, unixODBC ? null
+, wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null
+, enableDebugInfo ? false
+, Carbon ? null, Cocoa ? null }:
+
+assert wxSupport -> mesa != null && wxGTK != null && xorg != null;
+assert odbcSupport -> unixODBC != null;
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ name = "erlang-basho-" + version + "${optionalString odbcSupport "-odbc"}";
+ version = "16B03-1";
+
+ src = fetchgit {
+ url = "https://github.com/basho/otp";
+ rev = "cb3a485894e493ad172db2749129e613fe52713a";
+ sha256 = "0xn28cxlq0ya1aww9q14rg8jf3x2flwxrz6wdnpb0l2h2dasr655";
+ };
+
+ debugInfo = enableDebugInfo;
+
+ buildInputs =
+ [ perl gnum4 ncurses openssl makeWrapper autoconf264 gcc
+ ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ]
+ ++ optional odbcSupport [ unixODBC ];
+
+ patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure.in erts/configure.in '';
+
+ preConfigure = ''
+ export HOME=$PWD/../
+ export LANG=C
+ export ERL_TOP=$(pwd)
+ sed -e s@/bin/pwd@pwd@g -i otp_build
+ sed -e s@"/usr/bin/env escript"@${erlang}/bin/escript@g -i lib/diameter/bin/diameterc
+ '';
+
+ configureFlags= [
+ "--with-ssl=${openssl.dev}"
+ "--enable-smp-support"
+ "--enable-threads"
+ "--enable-kernel-poll"
+ "--disable-hipe"
+ "${optionalString odbcSupport "--with-odbc=${unixODBC}"}"
+ "${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"
+ "${optionalString stdenv.isLinux "--enable-m64-build"}"
+ ];
+
+ buildPhase = ''
+ ./otp_build autoconf
+ ./otp_build setup -a --prefix=$out $configureFlags
+ '';
+
+ postInstall = let
+ manpages = fetchurl {
+ url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz";
+ sha256 = "17f3k5j17rdsah18gywjngip6cbfgp6nb9di6il4pahmf9yvqc8g";
+ };
+ in ''
+ ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call
+ tar xf "${manpages}" -C "$out/lib/erlang"
+ for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do
+ prefix="''${i%/*}"
+ ensureDir "$out/share/man/''${prefix##*/}"
+ ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl"
+ done
+ '';
+
+ # Some erlang bin/ scripts run sed and awk
+ postFixup = ''
+ wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
+ wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
+ '';
+
+ setupHook = ./setup-hook.sh;
+
+ meta = {
+ homepage = "https://github.com/basho/otp/";
+ description = "Programming language used for massively scalable soft real-time systems, Basho fork";
+
+ longDescription = ''
+ Erlang is a programming language used to build massively scalable
+ soft real-time systems with requirements on high availability.
+ Some of its uses are in telecoms, banking, e-commerce, computer
+ telephony and instant messaging. Erlang's runtime system has
+ built-in support for concurrency, distribution and fault
+ tolerance.
+ This version of Erlang is Basho's version, forked from Ericsson's
+ repository.
+ '';
+
+ platforms = ["x86_64-linux" "x86_64-darwin"];
+ license = stdenv.lib.licenses.asl20;
+ maintainers = with maintainers; [ mdaiter ];
+ };
+}
diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix
index 56b4626a2127..57323a587f81 100644
--- a/pkgs/development/interpreters/erlang/R17.nix
+++ b/pkgs/development/interpreters/erlang/R17.nix
@@ -6,6 +6,7 @@
, javacSupport ? false, openjdk ? null
, enableHipe ? true
, enableDebugInfo ? false
+, enableDirtySchedulers ? false
}:
assert wxSupport -> (if stdenv.isDarwin
@@ -46,6 +47,7 @@ stdenv.mkDerivation rec {
configureFlags= [
"--with-ssl=${openssl.dev}"
] ++ optional enableHipe "--enable-hipe"
+ ++ optional enableDirtySchedulers "--enable-dirty-schedulers"
++ optional wxSupport "--enable-wx"
++ optional odbcSupport "--with-odbc=${unixODBC}"
++ optional javacSupport "--with-javac"
diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix
index 5d9c5dac3d8e..f9b6edc3fa4b 100644
--- a/pkgs/development/interpreters/erlang/R18.nix
+++ b/pkgs/development/interpreters/erlang/R18.nix
@@ -6,6 +6,7 @@
, javacSupport ? false, openjdk ? null
, enableHipe ? true
, enableDebugInfo ? false
+, enableDirtySchedulers ? false
}:
assert wxSupport -> (if stdenv.isDarwin
@@ -20,7 +21,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"
+ "${optionalString javacSupport "-javac"}";
- version = "18.3.4";
+ version = "18.3.4.4";
# Minor OTP releases are not always released as tarbals at
# http://erlang.org/download/ So we have to download from
@@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
owner = "erlang";
repo = "otp";
rev = "OTP-${version}";
- sha256 = "1f8nhybzsdmjvkmkzpjj3wj9jzx8mihlvi6gfp47fxkalansz39h";
+ sha256 = "0wilm21yi9m3v6j26vc04hsa58cxca5z4q9yxx71hm81cbm1xbwk";
};
buildInputs =
@@ -64,6 +65,7 @@ stdenv.mkDerivation rec {
configureFlags= [
"--with-ssl=${openssl.dev}"
] ++ optional enableHipe "--enable-hipe"
+ ++ optional enableDirtySchedulers "--enable-dirty-schedulers"
++ optional wxSupport "--enable-wx"
++ optional odbcSupport "--with-odbc=${unixODBC}"
++ optional javacSupport "--with-javac"
diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix
index ddeccb29b59d..824c68688803 100644
--- a/pkgs/development/interpreters/erlang/R19.nix
+++ b/pkgs/development/interpreters/erlang/R19.nix
@@ -6,6 +6,7 @@
, javacSupport ? false, openjdk ? null
, enableHipe ? true
, enableDebugInfo ? false
+, enableDirtySchedulers ? false
}:
assert wxSupport -> (if stdenv.isDarwin
@@ -20,7 +21,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"
+ "${optionalString javacSupport "-javac"}";
- version = "19.1";
+ version = "19.1.6";
# Minor OTP releases are not always released as tarbals at
# http://erlang.org/download/ So we have to download from
@@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
owner = "erlang";
repo = "otp";
rev = "OTP-${version}";
- sha256 = "0nnjj069d5pjhgcd8vvqbrkjdac3p1v4s3zb59i4h73vg7f5p736";
+ sha256 = "120dqi8h2fwqfmh9g2nmkf153zlglzw9kkddz57xqvqq5arcs72y";
};
buildInputs =
@@ -49,6 +50,7 @@ stdenv.mkDerivation rec {
configureFlags= [
"--with-ssl=${openssl.dev}"
] ++ optional enableHipe "--enable-hipe"
+ ++ optional enableDirtySchedulers "--enable-dirty-schedulers"
++ optional wxSupport "--enable-wx"
++ optional odbcSupport "--with-odbc=${unixODBC}"
++ optional javacSupport "--with-javac"
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index 78d154bb6542..a883080f58e7 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "groovy-${version}";
- version = "2.4.6";
+ version = "2.4.7";
src = fetchurl {
url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
- sha256 = "0s474wy7db7j1pans5ks986b52bdmn40l29zl6xl44y23fsvagwv";
+ sha256 = "1mgvpqxc99057szfhhjfirmf3xyhs0vmgb0jzy47wr2jh84xd3a3";
};
buildInputs = [ unzip makeWrapper ];
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 96c85704f5ef..3b1b288fd5d5 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -302,12 +302,12 @@ let
in {
php56 = generic {
- version = "5.6.27";
- sha256 = "0g1adx231c738694gc4bh8x65c7fwsqdbm42n9xwrsdncyhd6xrv";
+ version = "5.6.28";
+ sha256 = "13sl8z5inwyzmi1d5z4g42nq3n8gjdl4876h65bbd86mmbsa6pn5";
};
php70 = generic {
- version = "7.0.12";
- sha256 = "09va788b9zk5igzmsfxr593ly174qf9kmihd4fq3kclgzsa75i1q";
+ version = "7.0.13";
+ sha256 = "1hc8zry3mrggfh1yxvm255xal5h6bxf0p3wdq307w48j719bp46h";
};
}
diff --git a/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix b/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix
deleted file mode 100644
index 24ba479186ec..000000000000
--- a/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchurl, readline, nspr }:
-
-stdenv.mkDerivation rec {
- version = "1.8.0-rc1";
- name = "spidermonkey-${version}";
-
- src = fetchurl {
- url = "mirror://mozilla/js/js-${version}.tar.gz";
- sha256 = "374398699ac3fd802d98d642486cf6b0edc082a119c9c9c499945a0bc73e3413";
- };
-
- buildInputs = [ readline nspr ];
-
- postUnpack = "sourceRoot=\${sourceRoot}/src";
-
- hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.isi686 "pic";
-
- makefileExtra = ./Makefile.extra;
- makefile = "Makefile.ref";
-
- patchPhase =
- ''
- cat ${makefileExtra} >> ${makefile}
- sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile}
- '';
-
- preConfigure = ''
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
- '';
-
- makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1 JS_THREADSAFE=1";
-
- meta = {
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/development/interpreters/spidermonkey/arm-flags.patch b/pkgs/development/interpreters/spidermonkey/1.8.5-arm-flags.patch
similarity index 100%
rename from pkgs/development/interpreters/spidermonkey/arm-flags.patch
rename to pkgs/development/interpreters/spidermonkey/1.8.5-arm-flags.patch
diff --git a/pkgs/development/interpreters/spidermonkey/findvanilla.patch b/pkgs/development/interpreters/spidermonkey/1.8.5-findvanilla.patch
similarity index 100%
rename from pkgs/development/interpreters/spidermonkey/findvanilla.patch
rename to pkgs/development/interpreters/spidermonkey/1.8.5-findvanilla.patch
diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
similarity index 87%
rename from pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
rename to pkgs/development/interpreters/spidermonkey/1.8.5.nix
index 582e7039d17c..3c5eef01db01 100644
--- a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
+++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
@@ -1,11 +1,11 @@
-{ stdenv, autoconf213, fetchurl, pkgconfig, nspr, perl, python2, zip }:
+{ stdenv, lib, autoconf213, fetchurl, pkgconfig, nspr, perl, python2, zip }:
stdenv.mkDerivation rec {
- version = "185-1.0.0";
name = "spidermonkey-${version}";
+ version = "1.8.5";
src = fetchurl {
- url = "mirror://mozilla/js/js${version}.tar.gz";
+ url = "mirror://mozilla/js/js185-1.0.0.tar.gz";
sha256 = "5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687";
};
@@ -19,14 +19,14 @@ stdenv.mkDerivation rec {
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
export LIBXUL_DIST=$out
- ${if stdenv.isArm then "autoreconf --verbose --force" else ""}
+ ${lib.optionalString stdenv.isArm "autoreconf --verbose --force"}
'';
patches = stdenv.lib.optionals stdenv.isArm [
# Explained below in configureFlags for ARM
- ./findvanilla.patch
+ ./1.8.5-findvanilla.patch
# Fix for hard float flags.
- ./arm-flags.patch
+ ./1.8.5-arm-flags.patch
];
patchFlags = "-p3";
diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.nix
similarity index 100%
rename from pkgs/development/interpreters/spidermonkey/17.0.nix
rename to pkgs/development/interpreters/spidermonkey/17.nix
diff --git a/pkgs/development/interpreters/spidermonkey/24.2.nix b/pkgs/development/interpreters/spidermonkey/24.nix
similarity index 93%
rename from pkgs/development/interpreters/spidermonkey/24.2.nix
rename to pkgs/development/interpreters/spidermonkey/24.nix
index 279528e9e83c..6e354c542963 100644
--- a/pkgs/development/interpreters/spidermonkey/24.2.nix
+++ b/pkgs/development/interpreters/spidermonkey/24.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline }:
+{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline, icu }:
stdenv.mkDerivation rec {
version = "24.2.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ nspr ];
- buildInputs = [ pkgconfig perl python2 zip libffi readline ];
+ buildInputs = [ pkgconfig perl python2 zip libffi readline icu ];
postPatch = ''
# Fixes an issue with version detection under perl 5.22.x
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
"--libdir=$(lib)/lib"
"--includedir=$(dev)/include"
"--enable-threadsafe"
+ "--with-system-icu"
"--with-system-nspr"
"--with-system-ffi"
"--enable-readline"
diff --git a/pkgs/development/interpreters/spidermonkey/31.5.nix b/pkgs/development/interpreters/spidermonkey/31.nix
similarity index 89%
rename from pkgs/development/interpreters/spidermonkey/31.5.nix
rename to pkgs/development/interpreters/spidermonkey/31.nix
index f52d526e3fa9..585ebc120d8e 100644
--- a/pkgs/development/interpreters/spidermonkey/31.5.nix
+++ b/pkgs/development/interpreters/spidermonkey/31.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, readline }:
+{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, nspr, icu, readline }:
stdenv.mkDerivation rec {
version = "31.5.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "1q8icql5hh1g3gzg5fp4rl9rfagyhm9gilfn3dgi7qn4i1mrfqsd";
};
- buildInputs = [ pkgconfig perl python2 zip libffi readline ];
+ buildInputs = [ pkgconfig perl python2 zip libffi readline nspr icu ];
postUnpack = "sourceRoot=\${sourceRoot}/js/src";
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-threadsafe"
"--with-system-ffi"
+ "--with-system-nspr"
+ "--with-system-icu"
"--enable-readline"
# enabling these because they're wanted by 0ad. They may or may
diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix
new file mode 100644
index 000000000000..89c02f262001
--- /dev/null
+++ b/pkgs/development/interpreters/spidermonkey/38.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, readline, icu, zlib, nspr }:
+
+stdenv.mkDerivation rec {
+ version = "38.2.1.rc0";
+ name = "spidermonkey-${version}";
+
+ # the release notes point to some guys home directory, see
+ # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38
+ # probably it would be more ideal to pull a particular tag/revision
+ # from the mercurial repo
+ src = fetchurl {
+ url = "https://people.mozilla.org/~sstangl/mozjs-${version}.tar.bz2";
+ sha256 = "0p4bmbpgkfsj54xschcny0a118jdrdgg0q29rwxigg3lh5slr681";
+ };
+
+ buildInputs = [ pkgconfig perl python2 zip libffi readline icu zlib nspr ];
+
+ postUnpack = "sourceRoot=\${sourceRoot}/js/src";
+
+ preConfigure = ''
+ export CXXFLAGS="-fpermissive"
+ export LIBXUL_DIST=$out
+ export PYTHON="${python2.interpreter}"
+ '';
+
+ configureFlags = [
+ "--enable-threadsafe"
+ "--with-system-ffi"
+ "--with-system-nspr"
+ "--with-system-zlib"
+ "--with-system-icu"
+ "--enable-readline"
+
+ # enabling these because they're wanted by 0ad. They may or may
+ # not be good defaults for other uses.
+ "--enable-gcgenerational"
+ "--enable-shared-js"
+ ];
+
+ # This addresses some build system bug. It's quite likely to be safe
+ # to re-enable parallel builds if the source revision changes.
+ enableParallelBuilding = true;
+
+ postFixup = ''
+ # The headers are symlinks to a directory that doesn't get put
+ # into $out, so they end up broken. Fix that by just resolving the
+ # symlinks.
+ for i in $(find $out -type l); do
+ cp --remove-destination "$(readlink "$i")" "$i";
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Mozilla's JavaScript engine written in C/C++";
+ homepage = https://developer.mozilla.org/en/SpiderMonkey;
+ # TODO: MPL/GPL/LGPL tri-license.
+
+ maintainers = [ maintainers.abbradar ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/interpreters/spidermonkey/Makefile.extra b/pkgs/development/interpreters/spidermonkey/Makefile.extra
deleted file mode 100644
index a764cfc69cb6..000000000000
--- a/pkgs/development/interpreters/spidermonkey/Makefile.extra
+++ /dev/null
@@ -1,10 +0,0 @@
-install: $(PROGRAM) $(SHARED_LIBRARY)
- mkdir -pv $(DIST)/{bin,lib}
- mkdir -pv $(DIST)/include
- cp -v $(PROGRAM) $(DIST)/bin
- cp -v $(SHARED_LIBRARY) $(LIBRARY) $(DIST)/lib
- cp -v $(JS_HFILES) $(API_HFILES) $(OTHER_HFILES) $(DIST)/include
- mkdir -pv $(DIST)/include/js
- find . -name '*.h' -exec cp '{}' $(DIST)/include/js ';'
- find . -name '*.msg' -exec cp '{}' $(DIST)/include/js ';'
-
diff --git a/pkgs/development/interpreters/spidermonkey/default.nix b/pkgs/development/interpreters/spidermonkey/default.nix
deleted file mode 100644
index 1fe4b90b2b80..000000000000
--- a/pkgs/development/interpreters/spidermonkey/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchurl, readline }:
-
-stdenv.mkDerivation rec {
- name = "spidermonkey-1.7";
-
- src = fetchurl {
- url = mirror://mozilla/js/js-1.7.0.tar.gz;
- sha256 = "12v6v2ccw1y6ng3kny3xw0lfs58d1klylqq707k0x04m707kydj4";
- };
-
- hardeningDisable = [ "format" ]
- ++ stdenv.lib.optional stdenv.isi686 "stackprotector";
-
- buildInputs = [ readline ];
-
- postUnpack = "sourceRoot=\${sourceRoot}/src";
-
- makefileExtra = ./Makefile.extra;
- makefile = "Makefile.ref";
-
- patchPhase =
- ''
- cat ${makefileExtra} >> ${makefile}
- sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile}
- '';
-
- CFLAGS = "-DPIC -fPIC -DJS_C_STRINGS_ARE_UTF8";
-
- makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1";
-
- meta = with stdenv.lib; {
- description = "Mozilla's JavaScript engine written in C/C++";
- homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey";
- license = licenses.mpl20;
- platforms = platforms.all;
- };
-}
diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix
index a10d730d06e4..e1cfb488be88 100644
--- a/pkgs/development/libraries/atkmm/default.nix
+++ b/pkgs/development/libraries/atkmm/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "ff95385759e2af23828d4056356f25376cfabc41e690ac1df055371537e458bd";
};
+ outputs = [ "out" "dev" ];
+
propagatedBuildInputs = [ atk glibmm ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix
index fbf3cd57e3b9..017516f6b490 100644
--- a/pkgs/development/libraries/cairomm/default.nix
+++ b/pkgs/development/libraries/cairomm/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6";
};
+ outputs = [ "out" "dev" ];
+
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ cairo libsigcxx ];
buildInputs = [ fontconfig freetype ]
diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix
index 3b015532ca8b..feb769229c02 100644
--- a/pkgs/development/libraries/glfw/3.x.nix
+++ b/pkgs/development/libraries/glfw/3.x.nix
@@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
- version = "3.2";
+ version = "3.2.1";
name = "glfw-${version}";
src = fetchFromGitHub {
owner = "glfw";
repo = "GLFW";
rev = "${version}";
- sha256 = "0knqf40jij2z1mia091xqyky5r11r4qyh7b8172blrmgm9q23sl9";
+ sha256 = "0gq6ad38b3azk0w2yy298yz2vmg2jmf9g0ydidqbmiswpk25ills";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index a91acdbb0086..4e18e4d16b2c 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -14,7 +14,7 @@ let
inherit (stdenv.lib) optional optionalString;
in
stdenv.mkDerivation rec {
- name = "gst-plugins-bad-1.8.2";
+ name = "gst-plugins-bad-1.10.1";
meta = with stdenv.lib; {
description = "Gstreamer Bad Plugins";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
- sha256 = "d7995317530c8773ec088f94d9320909d41da61996b801ebacce9a56af493f97";
+ sha256 = "07cjra4fclrk6lpdm5hrsgp79aqpklx3v3l9scain091zvchwghk";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 00aa893bd33e..319f7c75a750 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "gst-plugins-base-1.8.2";
+ name = "gst-plugins-base-1.10.1";
meta = {
description = "Base plugins and helper libraries";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
- sha256 = "9d7109c8fb0a5dec8edb17b0053c59a46aba7ddf48dc48ea822ebbbd4339d38d";
+ sha256 = "1jbnr6vbklzli493xdd8y5sflm32r90lifpacxw9vbvs9hlyxkv6";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index da6a8c7a74a4..55da05c4c971 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "gstreamer-1.8.2";
+ name = "gstreamer-1.10.1";
meta = {
description = "Open source multimedia framework";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
- sha256 = "9dbebe079c2ab2004ef7f2649fa317cabea1feb4fb5605c24d40744b90918341";
+ sha256 = "1npnpyrw8603ivi5g3ziglvh3hq2shypid2vjcmki6g6w2bgk3gn";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 5f60b9c03a31..06776de9340c 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "gstreamer-editing-services-1.8.2";
+ name = "gstreamer-editing-services-1.10.1";
meta = with stdenv.lib; {
description = "Library for creation of audio/video non-linear editors";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz";
- sha256 = "a1d57ff9461407cca1f6e7a9f31a5bdb73f73f33c488a3e3318b27e10a4332ae";
+ sha256 = "048dxpbzmidbl1sb902nx8rkg8m0z69f3dn7vfhs1ai68x2hzip9";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index a44bdbcd08c4..ba6f79c138ab 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -10,7 +10,7 @@ let
inherit (stdenv.lib) optionals optionalString;
in
stdenv.mkDerivation rec {
- name = "gst-plugins-good-1.8.2";
+ name = "gst-plugins-good-1.10.1";
meta = with stdenv.lib; {
description = "Gstreamer Good Plugins";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
- sha256 = "8d7549118a3b7a009ece6bb38a05b66709c551d32d2adfd89eded4d1d7a23944";
+ sha256 = "1hkcap9l2603266gyi6jgvx7frbvfmb7xhfhjizbczy1wykjwr57";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
index 176e19000e91..a1e28efbff46 100644
--- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
+++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, file, glibmm, gst_all_1 }:
let
- ver_maj = "1.4";
- ver_min = "3";
+ ver_maj = "1.8";
+ ver_min = "0";
in
stdenv.mkDerivation rec {
name = "gstreamermm-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/gstreamermm/${ver_maj}/${name}.tar.xz";
- sha256 = "0bj6and9b26d32bq90l8nx5wqh2ikkh8dm7qwxyxfdvmrzhixhgi";
+ sha256 = "0i4sk6ns4dyi4szk45bkm4kvl57l52lgm15p2wg2rhx2gr2w3qry";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 788aacf03ec6..7ae10f50c4d6 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -9,7 +9,7 @@
assert withSystemLibav -> libav != null;
stdenv.mkDerivation rec {
- name = "gst-libav-1.8.2";
+ name = "gst-libav-1.10.1";
meta = {
homepage = "http://gstreamer.freedesktop.org";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
- sha256 = "b5f3c7a27b39b5f5c2f0bfd546b0c655020faf6b38d27b64b346c43e5ebf687a";
+ sha256 = "1ivjbh5g0l5ykfpc16kq5x2jz8d4ignyha14jpiz3pz6w26qpci7";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix
index 9d6fa94cf3ae..78127e3ce98a 100644
--- a/pkgs/development/libraries/gstreamer/python/default.nix
+++ b/pkgs/development/libraries/gstreamer/python/default.nix
@@ -6,14 +6,14 @@
let
inherit (pythonPackages) python pygobject3;
in stdenv.mkDerivation rec {
- name = "gst-python-1.8.2";
+ name = "gst-python-1.10.1";
src = fetchurl {
urls = [
"${meta.homepage}/src/gst-python/${name}.tar.xz"
"mirror://gentoo/distfiles/${name}.tar.xz"
];
- sha256 = "15sdfa6lq5pswvi09vk51cs30yf8wr2rlm9myhb4q0c2jhiial2g";
+ sha256 = "04xhh0z0c0s6aq7kvmfs4r6yl1pjnqz0krp05pbjy62ayx5b61ak";
};
patches = [ ./different-path-with-pygobject.patch ];
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index ab6e1f9f4f17..df5b682a2371 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "gst-plugins-ugly-1.8.2";
+ name = "gst-plugins-ugly-1.10.1";
meta = with stdenv.lib; {
description = "Gstreamer Ugly Plugins";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
- sha256 = "9c5b33a2a98fc1d6d6c99a1b536b1fb2de45f53cc8bf8ab85a8b8141fed1a8ac";
+ sha256 = "1hl385fys7hfx5ffipavvhciq6hwm731rs4d6r9fn7h9qagxbv55";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index 9972468f1b7f..f18b9fc214dc 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -1,24 +1,25 @@
{ stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva, wayland
, libdrm, udev, xorg, mesa, yasm, gstreamer, gst-plugins-bad, nasm
-, libvpx
+, libvpx, python
}:
stdenv.mkDerivation rec {
name = "gst-vaapi-${version}";
- version = "0.7.0";
+ version = "1.10.1";
src = fetchurl {
- url = "${meta.homepage}/software/vaapi/releases/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.bz2";
- sha256 = "14jal2g5mf8r59w8420ixl3kg50vcmy56446ncwd0xrizd6yms5b";
+ url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz";
+ sha256 = "0d6sw5j7x3ah7zlcipy7w3fwag0fqxyfgc8q4phnazgk16kcmblr";
};
outputs = [ "out" "dev" ];
- nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ];
+ nativeBuildInputs = [ pkgconfig bzip2 ];
buildInputs = [
gstreamer gst-plugins-base gst-plugins-bad libva wayland libdrm udev
- xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM xorg.libICE mesa nasm libvpx
+ xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM
+ xorg.libICE mesa nasm libvpx python
];
preConfigure = "
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-builtin-libvpx --with-gstreamer-api=1.0";
meta = {
- homepage = "http://www.freedesktop.org";
+ homepage = "http://gstreamer.freedesktop.org";
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ tstrobel ];
diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix
index 2de3955ab06a..2f5ba2372ce7 100644
--- a/pkgs/development/libraries/gstreamer/validate/default.nix
+++ b/pkgs/development/libraries/gstreamer/validate/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, pkgconfig, gstreamer, gst-plugins-base
-, python, gobjectIntrospection
+, python, gobjectIntrospection, json_glib
}:
stdenv.mkDerivation rec {
- name = "gst-validate-1.8.2";
+ name = "gst-validate-1.10.1";
meta = {
description = "Integration testing infrastructure for the GStreamer framework";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-validate/${name}.tar.xz";
- sha256 = "33c5b585c5ca1659fe6c09fdf02e45d8132c0d386b405bf527b14ab481a0bafe";
+ sha256 = "0x9z0kizi44swsrx8mdc6xlmn9dksdfifchp5h6liibp7qd6gbh7";
};
outputs = [ "out" "dev" ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- python
+ python json_glib
];
propagatedBuildInputs = [ gstreamer gst-plugins-base ];
diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix
index 119e3f77f670..1ec2a7cd6f0d 100644
--- a/pkgs/development/libraries/gtkmm/2.x.nix
+++ b/pkgs/development/libraries/gtkmm/2.x.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72";
};
+ outputs = [ "out" "dev" ];
+
nativeBuildInputs = [pkgconfig];
propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ];
diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix
index 8b2383f33cce..49055f6b4a95 100644
--- a/pkgs/development/libraries/gtkmm/3.x.nix
+++ b/pkgs/development/libraries/gtkmm/3.x.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "05da4d4b628fb20c8384630ddf478a3b5562952b2d6181fe28d58f6cbc0514f5";
};
+ outputs = [ "out" "dev" ];
+
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ epoxy ];
diff --git a/pkgs/development/libraries/java/shared-objects/default.nix b/pkgs/development/libraries/java/shared-objects/default.nix
deleted file mode 100644
index 9453aa0635c7..000000000000
--- a/pkgs/development/libraries/java/shared-objects/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, jdk}:
-
-stdenv.mkDerivation {
- name = "shared-objects-1.4";
- src = fetchurl {
- url = http://www.cwi.nl/projects/MetaEnv/shared-objects/shared-objects-1.4.tar.gz;
- md5 = "c1f2c58bd1a07be32da8a6b89354a11f";
- };
- buildInputs = [stdenv jdk];
-
- meta = {
- platforms = stdenv.lib.platforms.unix;
- };
-}
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 4b214c37a698..397d59f8b246 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -56,20 +56,15 @@ let
} // (args.meta or {});
});
- kdeEnv = import ./kde-env.nix {
- inherit (pkgs) stdenv lib;
- inherit (pkgs.xorg) lndir;
- };
-
kdeWrapper = import ./kde-wrapper.nix {
inherit (pkgs) stdenv lib makeWrapper;
- inherit kdeEnv;
};
attica = callPackage ./attica.nix {};
baloo = callPackage ./baloo.nix {};
bluez-qt = callPackage ./bluez-qt.nix {};
breeze-icons = callPackage ./breeze-icons.nix {};
+ # FIXME: this collides with the "ecm" package.
ecm =
let drv = { cmake, ecmNoHooks, pkgconfig, qtbase, qttools }:
makeSetupHook
diff --git a/pkgs/development/libraries/kde-frameworks/kde-env.nix b/pkgs/development/libraries/kde-frameworks/kde-env.nix
deleted file mode 100644
index 5ddf89a0129f..000000000000
--- a/pkgs/development/libraries/kde-frameworks/kde-env.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, lib, lndir }:
-
-drv: pkgs:
-
-stdenv.mkDerivation {
- name = "kde-env-${drv.name}";
- nativeBuildInputs = [ lndir ];
- envPkgs = builtins.map lib.getBin ([drv] ++ pkgs);
- unpackPhase = "true";
- configurePhase = "runHook preConfigure; runHook postConfigure";
- buildPhase = "true";
- installPhase = ''
- runHook preInstall
-
- propagated=""
- for i in $envPkgs; do
- findInputs $i propagated propagated-user-env-packages
- done
-
- for tgt in bin etc/xdg lib/libexec lib/qt5 share; do
- mkdir -p "$out/$tgt"
- for p in $propagated; do
- if [ -d "$p/$tgt" ]; then
- lndir -silent "$p/$tgt" "$out/$tgt" >/dev/null 2>&1
- fi
- done
- done
-
- runHook postInstall
- '';
-}
diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
index 153ca31fd625..3591e20d11fb 100644
--- a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
+++ b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
@@ -1,17 +1,14 @@
-{ stdenv, lib, makeWrapper, kdeEnv }:
+{ stdenv, lib, makeWrapper }:
drv:
{ targets, paths ? [] }:
-let
- env = kdeEnv drv paths;
-in
stdenv.mkDerivation {
- inherit (drv) name;
+ inherit (drv) name meta;
- drv = lib.getBin drv;
- inherit env targets;
+ paths = builtins.map lib.getBin ([drv] ++ paths);
+ inherit drv targets;
passthru = { unwrapped = drv; };
nativeBuildInputs = [ makeWrapper ];
@@ -21,16 +18,36 @@ stdenv.mkDerivation {
buildPhase = "true";
installPhase = ''
+ propagated=
+ for p in $drv $paths; do
+ findInputs $p propagated propagated-user-env-packages
+ done
+
+ wrap_PATH="$out/bin"
+ wrap_XDG_DATA_DIRS=
+ wrap_XDG_CONFIG_DIRS=
+ wrap_QML_IMPORT_PATH=
+ wrap_QML2_IMPORT_PATH=
+ wrap_QT_PLUGIN_PATH=
+ for p in $propagated; do
+ addToSearchPath wrap_PATH "$p/bin"
+ addToSearchPath wrap_XDG_DATA_DIRS "$p/share"
+ addToSearchPath wrap_XDG_CONFIG_DIRS "$p/etc/xdg"
+ addToSearchPath wrap_QML_IMPORT_PATH "$p/lib/qt5/imports"
+ addToSearchPath wrap_QML2_IMPORT_PATH "$p/lib/qt5/qml"
+ addToSearchPath wrap_QT_PLUGIN_PATH "$p/lib/qt5/plugins"
+ done
+
for t in $targets; do
if [ -a "$drv/$t" ]; then
makeWrapper "$drv/$t" "$out/$t" \
--argv0 '"$0"' \
- --suffix PATH : "$out/bin:$env/bin" \
- --prefix XDG_CONFIG_DIRS : "$env/etc/xdg" \
- --prefix XDG_DATA_DIRS : "$env/share" \
- --set QML_IMPORT_PATH "$env/lib/qt5/imports" \
- --set QML2_IMPORT_PATH "$env/lib/qt5/qml" \
- --set QT_PLUGIN_PATH "$env/lib/qt5/plugins"
+ --suffix PATH : "$wrap_PATH" \
+ --prefix XDG_CONFIG_DIRS : "$wrap_XDG_CONFIG_DIRS" \
+ --prefix XDG_DATA_DIRS : "$wrap_XDG_DATA_DIRS" \
+ --set QML_IMPORT_PATH "$wrap_QML_IMPORT_PATH" \
+ --set QML2_IMPORT_PATH "$wrap_QML2_IMPORT_PATH" \
+ --set QT_PLUGIN_PATH "$wrap_QT_PLUGIN_PATH"
else
echo "no such file or directory: $drv/$t"
exit 1
diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index 2158f26f2859..61fb8f2ffd86 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libfilezilla-${version}";
- version = "0.7.1";
+ version = "0.8.0";
src = fetchurl {
- url = "mirror://sourceforge/project/filezilla/libfilezilla/${version}/${name}.tar.bz2";
- sha256 = "1lyxlras357p17vbwfhwny69izjx74xncaxpyk1n4d2jbsvjspfr";
+ url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2";
+ sha256 = "0pq143f2j0g6ghl9vk1d3xw4ws2cddc8li8lm69v7lv8inz1dvhb";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libktorrent/5.nix b/pkgs/development/libraries/libktorrent/5.nix
new file mode 100644
index 000000000000..e5406d3a2a58
--- /dev/null
+++ b/pkgs/development/libraries/libktorrent/5.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, cmake, ecm
+, karchive, kcrash, ki18n, kio, solid
+, boost, gmp, qca-qt5, libgcrypt
+}:
+
+stdenv.mkDerivation rec {
+ name = "libktorrent-2.0.1";
+
+ src = fetchurl {
+ url = http://download.kde.org/stable/ktorrent/5.0/libktorrent-2.0.1.tar.xz;
+ sha256 = "0hiz4wm8jkymp24r6f1g8svj3pw9qspbjajf512m3j8s3bhrw3f7";
+ };
+
+ outputs = [ "out" "dev" ];
+
+ nativeBuildInputs = [ cmake ecm ];
+ buildInputs = [ karchive kcrash ki18n kio solid qca-qt5 libgcrypt ];
+
+ propagatedBuildInputs = [ gmp boost ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "A BitTorrent library used by KTorrent";
+ homepage = https://www.kde.org/applications/internet/ktorrent/;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix
index db07775d45ed..9e7fb0a0b3d5 100644
--- a/pkgs/development/libraries/libktorrent/default.nix
+++ b/pkgs/development/libraries/libktorrent/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
- description = "A BiTtorrent library used by KTorrent";
+ description = "A BitTorrent library used by KTorrent";
homepage = http://ktorrent.pwsp.net;
inherit (kdelibs.meta) platforms;
};
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index 4c9733c6a5e5..36c486ce53d2 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -1,10 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, cmake, zlib, glib }:
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, zlib, glib }:
stdenv.mkDerivation rec {
- name = "libproxy-0.4.11";
- src = fetchurl {
- url = "http://libproxy.googlecode.com/files/${name}.tar.gz";
- sha256 = "0jw6454gxjykmbnbh544axi8hzz9gmm4jz1y5gw1hdqnakg36gyw";
+ name = "libproxy-${version}";
+ version = "0.4.13";
+
+ src = fetchFromGitHub {
+ owner = "libproxy";
+ repo = "libproxy";
+ rev = version;
+ sha256 = "0yg4wr44ync6x3p107ic00m1l04xqhni9jn1vzvkw3nfjd0k6f92";
};
outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs
@@ -14,7 +18,10 @@ stdenv.mkDerivation rec {
# now some optional deps, but many more are possible
++ [ glib ];
- meta = {
- platforms = stdenv.lib.platforms.linux;
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ license = licenses.lgpl21;
+ homepage = "http://libproxy.github.io/libproxy/";
+ description = "A library that provides automatic proxy configuration management";
};
}
diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix
index e9b08609f23c..646fdfbac4f3 100644
--- a/pkgs/development/libraries/libxmlxx/v3.nix
+++ b/pkgs/development/libraries/libxmlxx/v3.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "libxml++-${maj_ver}.${min_ver}";
maj_ver = "3.0";
- min_ver = "0";
+ min_ver = "1";
src = fetchurl {
url = "mirror://gnome/sources/libxml++/${maj_ver}/${name}.tar.xz";
- sha256 = "0lkrajbdys5f6w6qwfijih3hnbk4c6809qx2mmxkb7bj2w269wrg";
+ sha256 = "19kik79fmg61nv0by0a5f9wchrcfjwzvih4v2waw01hqflhqvp0r";
};
nativeBuildInputs = [ pkgconfig perl ];
diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix
index b6d187e7a0ed..9b2fd805c319 100644
--- a/pkgs/development/libraries/menu-cache/default.nix
+++ b/pkgs/development/libraries/menu-cache/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, glib, pkgconfig, libfm-extra }:
-let name = "menu-cache-1.0.1";
+let name = "menu-cache-1.0.2";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/lxde/${name}.tar.xz";
- sha256 = "0ngxvwfj9drabqi3lyzgpi0d0za6431sy2ijb010filrj54jdiqa";
+ sha256 = "1m8j40npykfcfqs43kc0fmksal2jfmfi8lnb3mq3xy1lvvrfv0vg";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index e923f87722ae..2b31405980b0 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -132,12 +132,17 @@ stdenv.mkDerivation {
$out/lib/vdpau \
$out/lib/bellagio \
$out/lib/libxatracker* \
- $out/lib/libvulkan_* \
+ $out/lib/libvulkan_*
# move share/vulkan/icd.d/
mv $out/share/ $drivers/
+ # Update search path used by Vulkan (it's pointing to $out but
+ # drivers are in $drivers)
+ for js in $drivers/share/vulkan/icd.d/*.json; do
+ substituteInPlace "$js" --replace "$out" "$drivers"
+ done
- mv $out/lib/dri/* $drivers/lib/dri
+ mv $out/lib/dri/* $drivers/lib/dri # */
rmdir "$out/lib/dri"
# move libOSMesa to $osmesa, as it's relatively big
diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix
index 53b2b6358649..35f675a305af 100644
--- a/pkgs/development/libraries/netcdf-fortran/default.nix
+++ b/pkgs/development/libraries/netcdf-fortran/default.nix
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
buildInputs = [ netcdf hdf5 curl gfortran ];
doCheck = true;
- meta = {
+ meta = with stdenv.lib; {
description = "Fortran API to manipulate netcdf files";
- homepage = "http://www.unidata.ucar.edu/software/netcdf/";
- license = stdenv.lib.licenses.free;
- maintainers = stdenv.lib.maintainers.bzizou;
- platforms = stdenv.lib.platforms.unix;
+ homepage = http://www.unidata.ucar.edu/software/netcdf/;
+ license = licenses.free;
+ maintainers = [ maintainers.bzizou ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix
index 6850c13b44e9..b99498f2013e 100644
--- a/pkgs/development/libraries/pangomm/default.nix
+++ b/pkgs/development/libraries/pangomm/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af";
};
+ outputs = [ "out" "dev" ];
+
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ pango glibmm cairomm ];
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index ab1943b85909..ff67ff8a1bbf 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, spidermonkey
+{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, spidermonkey_17
, gobjectIntrospection, libxslt, docbook_xsl, docbook_xml_dtd_412
, useSystemd ? stdenv.isLinux, systemd }:
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" ]; # small man pages in $bin
buildInputs =
- [ pkgconfig glib expat pam intltool spidermonkey gobjectIntrospection ]
+ [ pkgconfig glib expat pam intltool spidermonkey_17 gobjectIntrospection ]
++ [ libxslt docbook_xsl docbook_xml_dtd_412 ] # man pages
++ stdenv.lib.optional useSystemd systemd;
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index 0e40a7ac96d2..8b4e924a7339 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -106,7 +106,7 @@ let
qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects
qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript
qtsensors qtserialport qtsvg qttools qttranslations qtwayland
- qtwebsockets qtx11extras qtxmlpatterns
+ qtwebchannel qtwebengine qtwebsockets qtx11extras qtxmlpatterns
];
makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh;
diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
index dba3611683e3..e5d7d0d4372c 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
@@ -30,7 +30,12 @@ qtSubmodule {
--replace /bin/echo ${coreutils}/bin/echo
substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \
--replace /bin/echo ${coreutils}/bin/echo
-
+
+ # hardcode paths for which default path resolution does not work in nix
+ sed -i -e 's,\(static QString potentialResourcesPath =\).*,\1 QLatin1String("'$out'/resources");,' src/core/web_engine_library_info.cpp
+ sed -i -e 's,\(static QString processPath\),\1 = QLatin1String("'$out'/libexec/QtWebEngineProcess"),' src/core/web_engine_library_info.cpp
+ sed -i -e 's,\(static QString potentialLocalesPath =\).*,\1 QLatin1String("'$out'/translations/qtwebengine_locales");,' src/core/web_engine_library_info.cpp
+
configureFlags+="\
-plugindir $out/lib/qt5/plugins \
-importdir $out/lib/qt5/imports \
diff --git a/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix b/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix
new file mode 100644
index 000000000000..0820897b81db
--- /dev/null
+++ b/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, requireFile
+, cudatoolkit
+, fetchurl
+}:
+
+stdenv.mkDerivation rec {
+ version = "5.1";
+ cudatoolkit_version = "8.0";
+
+ name = "cudatoolkit-${cudatoolkit_version}-cudnn-${version}";
+
+ src = fetchurl {
+ url = "http://developer.download.nvidia.com/compute/redist/cudnn/v5.1/cudnn-8.0-linux-x64-v5.1.tgz";
+ sha256 = "a87cb2df2e5e7cc0a05e266734e679ee1a2fadad6f06af82a76ed81a23b102c8";
+ };
+
+ installPhase = ''
+ function fixRunPath {
+ p=$(patchelf --print-rpath $1)
+ patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" $1
+ }
+ fixRunPath lib64/libcudnn.so
+
+ mkdir -p $out
+ cp -a include $out/include
+ cp -a lib64 $out/lib64
+ '';
+
+ propagatedBuildInputs = [
+ cudatoolkit
+ ];
+
+ meta = with stdenv.lib; {
+ description = "NVIDIA CUDA Deep Neural Network library (cuDNN)";
+ homepage = "https://developer.nvidia.com/cudnn";
+ license = stdenv.lib.licenses.unfree;
+ maintainers = with maintainers; [ mdaiter ];
+ };
+}
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 3893875a2347..e0e8c2686296 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -11,11 +11,12 @@ let blas64_ = blas64; in
let local = config.openblas.preferLocalBuild or false;
binary =
{ i686-linux = "32";
+ armv7l-linux = "32";
x86_64-linux = "64";
x86_64-darwin = "64";
}."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
genericFlags =
- [ "DYNAMIC_ARCH=1"
+ [ "DYNAMIC_ARCH=${if stdenv.system == "armv7l-linux" then "0" else "1"}"
"NUM_THREADS=64"
];
localFlags = config.openblas.flags or
@@ -65,7 +66,9 @@ stdenv.mkDerivation {
"BINARY=${binary}"
"USE_OPENMP=${if stdenv.isDarwin then "0" else "1"}"
"INTERFACE64=${if blas64 then "1" else "0"}"
- ];
+ ]
+ ++
+ optionals (stdenv.system == "armv7l-linux") ["TARGET=ARMV7"];
doCheck = true;
checkTarget = "tests";
diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix
index a55173a62b3c..c4db48248f33 100644
--- a/pkgs/development/libraries/slang/default.nix
+++ b/pkgs/development/libraries/slang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline }:
+{ stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline, libiconv }:
stdenv.mkDerivation rec {
name = "slang-2.3.0";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sed -i -e "s|-ltermcap|-lncurses|" ./configure
'';
configureFlags = "--with-png=${libpng.dev} --with-z=${zlib.dev} --with-pcre=${pcre.dev} --with-readline=${readline.dev}";
- buildInputs = [ pcre libpng zlib readline ];
+ buildInputs = [ pcre libpng zlib readline ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ libiconv ];
propagatedBuildInputs = [ ncurses ];
postInstall = ''
diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index 0e4de5f6bb71..e6c31441967e 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -310,13 +310,13 @@ let
sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217";
};
};
- "which-1.2.11" = {
+ "which-1.2.12" = {
name = "which";
packageName = "which";
- version = "1.2.11";
+ version = "1.2.12";
src = fetchurl {
- url = "https://registry.npmjs.org/which/-/which-1.2.11.tgz";
- sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b";
+ url = "https://registry.npmjs.org/which/-/which-1.2.12.tgz";
+ sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192";
};
};
"os-homedir-1.0.2" = {
@@ -868,13 +868,13 @@ let
sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a";
};
};
- "moment-2.15.2" = {
+ "moment-2.16.0" = {
name = "moment";
packageName = "moment";
- version = "2.15.2";
+ version = "2.16.0";
src = fetchurl {
- url = "https://registry.npmjs.org/moment/-/moment-2.15.2.tgz";
- sha1 = "1bfdedf6a6e345f322fe956d5df5bd08a8ce84dc";
+ url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz";
+ sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e";
};
};
"ms-rest-1.15.2" = {
@@ -1102,13 +1102,13 @@ let
sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64";
};
};
- "jws-3.1.3" = {
+ "jws-3.1.4" = {
name = "jws";
packageName = "jws";
- version = "3.1.3";
+ version = "3.1.4";
src = fetchurl {
- url = "https://registry.npmjs.org/jws/-/jws-3.1.3.tgz";
- sha1 = "b88f1b4581a2c5ee8813c06b3fdf90ea9b5c7e6c";
+ url = "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz";
+ sha1 = "f9e8b9338e8a847277d6444b1464f61880e050a2";
};
};
"node-uuid-1.4.7" = {
@@ -1138,184 +1138,31 @@ let
sha1 = "fe4b81c1b152ebd8e1395265fedc5b00fca29b90";
};
};
- "base64url-1.0.6" = {
+ "base64url-2.0.0" = {
name = "base64url";
packageName = "base64url";
- version = "1.0.6";
- src = fetchurl {
- url = "https://registry.npmjs.org/base64url/-/base64url-1.0.6.tgz";
- sha1 = "d64d375d68a7c640d912e2358d170dca5bb54681";
- };
- };
- "jwa-1.1.3" = {
- name = "jwa";
- packageName = "jwa";
- version = "1.1.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/jwa/-/jwa-1.1.3.tgz";
- sha1 = "fa9f2f005ff0c630e7c41526a31f37f79733cd6d";
- };
- };
- "concat-stream-1.4.10" = {
- name = "concat-stream";
- packageName = "concat-stream";
- version = "1.4.10";
- src = fetchurl {
- url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz";
- sha1 = "acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36";
- };
- };
- "meow-2.0.0" = {
- name = "meow";
- packageName = "meow";
version = "2.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/meow/-/meow-2.0.0.tgz";
- sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1";
+ url = "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz";
+ sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb";
};
};
- "inherits-2.0.3" = {
- name = "inherits";
- packageName = "inherits";
- version = "2.0.3";
+ "jwa-1.1.4" = {
+ name = "jwa";
+ packageName = "jwa";
+ version = "1.1.4";
src = fetchurl {
- url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
- sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+ url = "https://registry.npmjs.org/jwa/-/jwa-1.1.4.tgz";
+ sha1 = "dbb01bd38cd409899fa715107e90d90f9bcb161e";
};
};
- "typedarray-0.0.6" = {
- name = "typedarray";
- packageName = "typedarray";
- version = "0.0.6";
+ "safe-buffer-5.0.1" = {
+ name = "safe-buffer";
+ packageName = "safe-buffer";
+ version = "5.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
- sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
- };
- };
- "readable-stream-1.1.14" = {
- name = "readable-stream";
- packageName = "readable-stream";
- version = "1.1.14";
- src = fetchurl {
- url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz";
- sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
- };
- };
- "core-util-is-1.0.2" = {
- name = "core-util-is";
- packageName = "core-util-is";
- version = "1.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
- sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
- };
- };
- "isarray-0.0.1" = {
- name = "isarray";
- packageName = "isarray";
- version = "0.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
- sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
- };
- };
- "string_decoder-0.10.31" = {
- name = "string_decoder";
- packageName = "string_decoder";
- version = "0.10.31";
- src = fetchurl {
- url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
- sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
- };
- };
- "camelcase-keys-1.0.0" = {
- name = "camelcase-keys";
- packageName = "camelcase-keys";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz";
- sha1 = "bd1a11bf9b31a1ce493493a930de1a0baf4ad7ec";
- };
- };
- "indent-string-1.2.2" = {
- name = "indent-string";
- packageName = "indent-string";
- version = "1.2.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/indent-string/-/indent-string-1.2.2.tgz";
- sha1 = "db99bcc583eb6abbb1e48dcbb1999a986041cb6b";
- };
- };
- "minimist-1.2.0" = {
- name = "minimist";
- packageName = "minimist";
- version = "1.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
- sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
- };
- };
- "object-assign-1.0.0" = {
- name = "object-assign";
- packageName = "object-assign";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz";
- sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6";
- };
- };
- "camelcase-1.2.1" = {
- name = "camelcase";
- packageName = "camelcase";
- version = "1.2.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
- sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
- };
- };
- "map-obj-1.0.1" = {
- name = "map-obj";
- packageName = "map-obj";
- version = "1.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz";
- sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d";
- };
- };
- "get-stdin-4.0.1" = {
- name = "get-stdin";
- packageName = "get-stdin";
- version = "4.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
- sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
- };
- };
- "repeating-1.1.3" = {
- name = "repeating";
- packageName = "repeating";
- version = "1.1.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz";
- sha1 = "3d4114218877537494f97f77f9785fab810fa4ac";
- };
- };
- "is-finite-1.0.2" = {
- name = "is-finite";
- packageName = "is-finite";
- version = "1.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
- sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
- };
- };
- "number-is-nan-1.0.1" = {
- name = "number-is-nan";
- packageName = "number-is-nan";
- version = "1.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
- sha1 = "097b602b53422a522c1afb8790318336941a011d";
+ url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
+ sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
};
};
"buffer-equal-constant-time-1.0.1" = {
@@ -1462,6 +1309,24 @@ let
sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd";
};
};
+ "core-util-is-1.0.2" = {
+ name = "core-util-is";
+ packageName = "core-util-is";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+ sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+ };
+ };
+ "inherits-2.0.3" = {
+ name = "inherits";
+ packageName = "inherits";
+ version = "2.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+ sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+ };
+ };
"isarray-1.0.0" = {
name = "isarray";
packageName = "isarray";
@@ -1480,6 +1345,15 @@ let
sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
};
};
+ "string_decoder-0.10.31" = {
+ name = "string_decoder";
+ packageName = "string_decoder";
+ version = "0.10.31";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+ sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+ };
+ };
"util-deprecate-1.0.2" = {
name = "util-deprecate";
packageName = "util-deprecate";
@@ -1831,6 +1705,15 @@ let
sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21";
};
};
+ "isarray-0.0.1" = {
+ name = "isarray";
+ packageName = "isarray";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+ sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+ };
+ };
"aws-sign2-0.6.0" = {
name = "aws-sign2";
packageName = "aws-sign2";
@@ -1948,13 +1831,13 @@ let
sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
};
};
- "mime-types-2.1.12" = {
+ "mime-types-2.1.13" = {
name = "mime-types";
packageName = "mime-types";
- version = "2.1.12";
+ version = "2.1.13";
src = fetchurl {
- url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz";
- sha1 = "152ba256777020dd4663f54c2e7bc26381e71729";
+ url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz";
+ sha1 = "e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88";
};
};
"oauth-sign-0.8.2" = {
@@ -2020,13 +1903,13 @@ let
sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385";
};
};
- "lodash-4.16.6" = {
+ "lodash-4.17.2" = {
name = "lodash";
packageName = "lodash";
- version = "4.16.6";
+ version = "4.17.2";
src = fetchurl {
- url = "https://registry.npmjs.org/lodash/-/lodash-4.16.6.tgz";
- sha1 = "d22c9ac660288f3843e16ba7d2b5d06cca27d777";
+ url = "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz";
+ sha1 = "34a3055babe04ce42467b607d700072c7ff6bf42";
};
};
"chalk-1.1.3" = {
@@ -2353,13 +2236,13 @@ let
sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4";
};
};
- "mime-db-1.24.0" = {
+ "mime-db-1.25.0" = {
name = "mime-db";
packageName = "mime-db";
- version = "1.24.0";
+ version = "1.25.0";
src = fetchurl {
- url = "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz";
- sha1 = "e2d13f939f0016c6e4e9ad25a8652f126c467f0c";
+ url = "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz";
+ sha1 = "c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392";
};
};
"punycode-1.4.1" = {
@@ -2443,6 +2326,15 @@ let
sha1 = "6678b32fa0ca218fe569981bbd8871b594060d81";
};
};
+ "typedarray-0.0.6" = {
+ name = "typedarray";
+ packageName = "typedarray";
+ version = "0.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
+ sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
+ };
+ };
"http-basic-2.5.1" = {
name = "http-basic";
packageName = "http-basic";
@@ -2524,13 +2416,13 @@ let
sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4";
};
};
- "bower-1.7.9" = {
+ "bower-1.8.0" = {
name = "bower";
packageName = "bower";
- version = "1.7.9";
+ version = "1.8.0";
src = fetchurl {
- url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz";
- sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0";
+ url = "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz";
+ sha1 = "55dbebef0ad9155382d9e9d3e497c1372345b44a";
};
};
"bower-endpoint-parser-0.2.1" = {
@@ -2776,13 +2668,13 @@ let
sha1 = "6b83370546c55ab6ade2bf75e83c66e45989bbf0";
};
};
- "statuses-1.3.0" = {
+ "statuses-1.3.1" = {
name = "statuses";
packageName = "statuses";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz";
- sha1 = "8e55758cb20e7682c1f4fce8dcab30bf01d1e07a";
+ url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz";
+ sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e";
};
};
"timed-out-2.0.0" = {
@@ -2803,13 +2695,13 @@ let
sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e";
};
};
- "readable-stream-2.1.5" = {
+ "readable-stream-2.2.2" = {
name = "readable-stream";
packageName = "readable-stream";
- version = "2.1.5";
+ version = "2.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz";
- sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0";
+ url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz";
+ sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e";
};
};
"stream-shift-1.0.0" = {
@@ -2866,6 +2758,24 @@ let
sha1 = "5b46f80147edee578870f086d04821cf998e551f";
};
};
+ "map-obj-1.0.1" = {
+ name = "map-obj";
+ packageName = "map-obj";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz";
+ sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d";
+ };
+ };
+ "minimist-1.2.0" = {
+ name = "minimist";
+ packageName = "minimist";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
+ sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+ };
+ };
"normalize-package-data-2.3.5" = {
name = "normalize-package-data";
packageName = "normalize-package-data";
@@ -3145,6 +3055,33 @@ let
sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
};
};
+ "is-finite-1.0.2" = {
+ name = "is-finite";
+ packageName = "is-finite";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
+ sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
+ };
+ };
+ "number-is-nan-1.0.1" = {
+ name = "number-is-nan";
+ packageName = "number-is-nan";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
+ sha1 = "097b602b53422a522c1afb8790318336941a011d";
+ };
+ };
+ "get-stdin-4.0.1" = {
+ name = "get-stdin";
+ packageName = "get-stdin";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
+ sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
+ };
+ };
"sort-keys-1.1.2" = {
name = "sort-keys";
packageName = "sort-keys";
@@ -3199,22 +3136,22 @@ let
sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e";
};
};
- "debug-2.2.0" = {
+ "debug-2.3.3" = {
name = "debug";
packageName = "debug";
- version = "2.2.0";
+ version = "2.3.3";
src = fetchurl {
- url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
- sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
+ url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
+ sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
};
};
- "ms-0.7.1" = {
+ "ms-0.7.2" = {
name = "ms";
packageName = "ms";
- version = "0.7.1";
+ version = "0.7.2";
src = fetchurl {
- url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
- sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
+ url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz";
+ sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765";
};
};
"rimraf-2.2.8" = {
@@ -3505,13 +3442,13 @@ let
sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
};
};
- "stream-http-2.4.1" = {
+ "stream-http-2.5.0" = {
name = "stream-http";
packageName = "stream-http";
- version = "2.4.1";
+ version = "2.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/stream-http/-/stream-http-2.4.1.tgz";
- sha1 = "8ee5689ae69169e8eb8edd6aeb2ca08ab47e8f59";
+ url = "https://registry.npmjs.org/stream-http/-/stream-http-2.5.0.tgz";
+ sha1 = "585eee513217ed98fe199817e7313b6f772a6802";
};
};
"subarg-1.0.0" = {
@@ -3883,13 +3820,13 @@ let
sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573";
};
};
- "asn1.js-4.8.1" = {
+ "asn1.js-4.9.0" = {
name = "asn1.js";
packageName = "asn1.js";
- version = "4.8.1";
+ version = "4.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.8.1.tgz";
- sha1 = "3949b7f5fd1e8bedc13be3abebf477f93490c810";
+ url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.0.tgz";
+ sha1 = "f71a1243f3e79d46d7b07d7fbf4824ee73af054a";
};
};
"ripemd160-1.0.1" = {
@@ -3901,13 +3838,13 @@ let
sha1 = "93a4bbd4942bc574b69a8fa57c71de10ecca7d6e";
};
};
- "sha.js-2.4.5" = {
+ "sha.js-2.4.8" = {
name = "sha.js";
packageName = "sha.js";
- version = "2.4.5";
+ version = "2.4.8";
src = fetchurl {
- url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz";
- sha1 = "27d171efcc82a118b99639ff581660242b506e7c";
+ url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz";
+ sha1 = "37068c2c476b6baf402d14a49c67f597921f634f";
};
};
"miller-rabin-4.0.0" = {
@@ -4486,6 +4423,15 @@ let
sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78";
};
};
+ "object-assign-1.0.0" = {
+ name = "object-assign";
+ packageName = "object-assign";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz";
+ sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6";
+ };
+ };
"airplay-js-0.2.16" = {
name = "airplay-js";
packageName = "airplay-js";
@@ -4594,13 +4540,13 @@ let
sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb";
};
};
- "mdns-js-0.5.0" = {
+ "mdns-js-0.5.1" = {
name = "mdns-js";
packageName = "mdns-js";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.0.tgz";
- sha1 = "4c8abb6ba7cabdc892d39228c3faa2556e09cf87";
+ url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.1.tgz";
+ sha1 = "a7ffa47e506e1c0f39bb9cd47c8fa4999e7bc4ec";
};
};
"plist-2.0.1" = {
@@ -4612,13 +4558,13 @@ let
sha1 = "0a32ca9481b1c364e92e18dc55c876de9d01da8b";
};
};
- "mdns-js-packet-0.2.0" = {
- name = "mdns-js-packet";
- packageName = "mdns-js-packet";
- version = "0.2.0";
+ "dns-js-0.2.1" = {
+ name = "dns-js";
+ packageName = "dns-js";
+ version = "0.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.2.0.tgz";
- sha1 = "642409e8183c7561cc60615bbd1420ec2fad7616";
+ url = "https://registry.npmjs.org/dns-js/-/dns-js-0.2.1.tgz";
+ sha1 = "5d66629b3c0e6a5eb0e14f0ae701d05f6ea46673";
};
};
"semver-5.1.1" = {
@@ -4738,13 +4684,13 @@ let
sha1 = "122e161591e21ff4c52530305693f20e6393a398";
};
};
- "magnet-uri-5.1.4" = {
+ "magnet-uri-5.1.5" = {
name = "magnet-uri";
packageName = "magnet-uri";
- version = "5.1.4";
+ version = "5.1.5";
src = fetchurl {
- url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.4.tgz";
- sha1 = "225db1f8670a944db87a5fbe27e2d90350513403";
+ url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.5.tgz";
+ sha1 = "be6abbf2648796c6d6e36e66416f7e0feecf2df8";
};
};
"parse-torrent-file-4.0.0" = {
@@ -5089,6 +5035,15 @@ let
sha1 = "ae43eb7745f5fe63dcc2f277cb4164ad27087f30";
};
};
+ "readable-stream-1.1.14" = {
+ name = "readable-stream";
+ packageName = "readable-stream";
+ version = "1.1.14";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz";
+ sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
+ };
+ };
"bncode-0.2.3" = {
name = "bncode";
packageName = "bncode";
@@ -5728,13 +5683,13 @@ let
sha1 = "364200d5f13646ca8bcd44490271335614792300";
};
};
- "big-integer-1.6.16" = {
+ "big-integer-1.6.17" = {
name = "big-integer";
packageName = "big-integer";
- version = "1.6.16";
+ version = "1.6.17";
src = fetchurl {
- url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.16.tgz";
- sha1 = "0ca30b58013db46b10084a09242ca1d8954724cc";
+ url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.17.tgz";
+ sha1 = "f0dcf5109a949e42a993ee3e8fb2070452817b51";
};
};
"sax-0.3.5" = {
@@ -6070,6 +6025,15 @@ let
sha1 = "6daab4e2b599c2770dd9e21e7a891b1c5a755425";
};
};
+ "debug-2.2.0" = {
+ name = "debug";
+ packageName = "debug";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
+ sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
+ };
+ };
"on-headers-1.0.1" = {
name = "on-headers";
packageName = "on-headers";
@@ -6097,6 +6061,15 @@ let
sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9";
};
};
+ "ms-0.7.1" = {
+ name = "ms";
+ packageName = "ms";
+ version = "0.7.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
+ sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
+ };
+ };
"array-flatten-1.1.1" = {
name = "array-flatten";
packageName = "array-flatten";
@@ -6277,13 +6250,13 @@ let
sha1 = "d6cce7693505f733c759de57befc1af76c0f0805";
};
};
- "type-is-1.6.13" = {
+ "type-is-1.6.14" = {
name = "type-is";
packageName = "type-is";
- version = "1.6.13";
+ version = "1.6.14";
src = fetchurl {
- url = "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz";
- sha1 = "6e83ba7bc30cd33a7bb0b7fb00737a2085bf9d08";
+ url = "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz";
+ sha1 = "e219639c17ded1ca0789092dd54a03826b817cb2";
};
};
"utils-merge-1.0.0" = {
@@ -6340,22 +6313,22 @@ let
sha1 = "978857442c44749e4206613e37946205826abd80";
};
};
- "http-errors-1.5.0" = {
+ "http-errors-1.5.1" = {
name = "http-errors";
packageName = "http-errors";
- version = "1.5.0";
+ version = "1.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz";
- sha1 = "b1cb3d8260fd8e2386cad3189045943372d48211";
+ url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz";
+ sha1 = "788c0d2c1de2c81b9e6e8c01843b6b97eb920750";
};
};
- "setprototypeof-1.0.1" = {
+ "setprototypeof-1.0.2" = {
name = "setprototypeof";
packageName = "setprototypeof";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz";
- sha1 = "52009b27888c4dc48f591949c0a8275834c1ca7e";
+ url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz";
+ sha1 = "81a552141ec104b88e89ce383103ad5c66564d08";
};
};
"media-typer-0.3.0" = {
@@ -6736,6 +6709,15 @@ let
sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067";
};
};
+ "readable-stream-2.1.5" = {
+ name = "readable-stream";
+ packageName = "readable-stream";
+ version = "2.1.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz";
+ sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0";
+ };
+ };
"realize-package-specifier-3.0.3" = {
name = "realize-package-specifier";
packageName = "realize-package-specifier";
@@ -7294,13 +7276,13 @@ let
sha1 = "1b379f64835af7c5a7f498b357cb95215c159edf";
};
};
- "request-2.78.0" = {
+ "request-2.79.0" = {
name = "request";
packageName = "request";
- version = "2.78.0";
+ version = "2.79.0";
src = fetchurl {
- url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz";
- sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc";
+ url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz";
+ sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de";
};
};
"uuid-2.0.3" = {
@@ -7456,13 +7438,22 @@ let
sha1 = "5fa55e02be7ca934edfc12665632e849b72e5209";
};
};
- "form-data-2.1.1" = {
+ "form-data-2.1.2" = {
name = "form-data";
packageName = "form-data";
- version = "2.1.1";
+ version = "2.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/form-data/-/form-data-2.1.1.tgz";
- sha1 = "4adf0342e1a79afa1e84c8c320a9ffc82392a1f3";
+ url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz";
+ sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4";
+ };
+ };
+ "uuid-3.0.0" = {
+ name = "uuid";
+ packageName = "uuid";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz";
+ sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
};
};
"asynckit-0.4.0" = {
@@ -7492,6 +7483,15 @@ let
sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb";
};
};
+ "repeating-1.1.3" = {
+ name = "repeating";
+ packageName = "repeating";
+ version = "1.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz";
+ sha1 = "3d4114218877537494f97f77f9785fab810fa4ac";
+ };
+ };
"semver-diff-2.1.0" = {
name = "semver-diff";
packageName = "semver-diff";
@@ -8135,13 +8135,13 @@ let
sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779";
};
};
- "verror-1.8.1" = {
+ "verror-1.9.0" = {
name = "verror";
packageName = "verror";
- version = "1.8.1";
+ version = "1.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/verror/-/verror-1.8.1.tgz";
- sha1 = "157589400a2d14570a62f2d5dd6a0f6214be3029";
+ url = "https://registry.npmjs.org/verror/-/verror-1.9.0.tgz";
+ sha1 = "107a8a2d14c33586fc4bb830057cd2d19ae2a6ee";
};
};
"extsprintf-1.3.0" = {
@@ -8234,13 +8234,13 @@ let
sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd";
};
};
- "basic-auth-1.0.4" = {
+ "basic-auth-1.1.0" = {
name = "basic-auth";
packageName = "basic-auth";
- version = "1.0.4";
+ version = "1.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz";
- sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290";
+ url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz";
+ sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884";
};
};
"cors-2.8.1" = {
@@ -8486,13 +8486,13 @@ let
sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b";
};
};
- "ltgt-2.1.2" = {
+ "ltgt-2.1.3" = {
name = "ltgt";
packageName = "ltgt";
- version = "2.1.2";
+ version = "2.1.3";
src = fetchurl {
- url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.2.tgz";
- sha1 = "e7472324fee690afc0d5ecf900403ce5788a311d";
+ url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.3.tgz";
+ sha1 = "10851a06d9964b971178441c23c9e52698eece34";
};
};
"pull-level-2.0.3" = {
@@ -8738,13 +8738,13 @@ let
sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25";
};
};
- "got-6.6.1" = {
+ "got-6.6.3" = {
name = "got";
packageName = "got";
- version = "6.6.1";
+ version = "6.6.3";
src = fetchurl {
- url = "https://registry.npmjs.org/got/-/got-6.6.1.tgz";
- sha1 = "542d7a0e34676060e561b1b90d103876eefabed2";
+ url = "https://registry.npmjs.org/got/-/got-6.6.3.tgz";
+ sha1 = "ff72c56d7f040eb8918ffb80fb62bcaf489d4eec";
};
};
"lodash.debounce-4.0.8" = {
@@ -8909,13 +8909,13 @@ let
sha1 = "c392990c3e684783d838b8c84a45d8a048458361";
};
};
- "globals-9.12.0" = {
+ "globals-9.14.0" = {
name = "globals";
packageName = "globals";
- version = "9.12.0";
+ version = "9.14.0";
src = fetchurl {
- url = "https://registry.npmjs.org/globals/-/globals-9.12.0.tgz";
- sha1 = "992ce90828c3a55fa8f16fada177adb64664cf9d";
+ url = "https://registry.npmjs.org/globals/-/globals-9.14.0.tgz";
+ sha1 = "8859936af0038741263053b39d0e76ca241e4034";
};
};
"ignore-3.2.0" = {
@@ -8945,13 +8945,13 @@ let
sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62";
};
};
- "js-yaml-3.6.1" = {
+ "js-yaml-3.7.0" = {
name = "js-yaml";
packageName = "js-yaml";
- version = "3.6.1";
+ version = "3.7.0";
src = fetchurl {
- url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz";
- sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30";
+ url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
+ sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
};
};
"json-stable-stringify-1.0.1" = {
@@ -8999,13 +8999,13 @@ let
sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45";
};
};
- "require-uncached-1.0.2" = {
+ "require-uncached-1.0.3" = {
name = "require-uncached";
packageName = "require-uncached";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.2.tgz";
- sha1 = "67dad3b733089e77030124678a459589faf6a7ec";
+ url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz";
+ sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3";
};
};
"strip-bom-3.0.0" = {
@@ -9323,13 +9323,13 @@ let
sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
};
};
- "ajv-4.8.2" = {
+ "ajv-4.9.0" = {
name = "ajv";
packageName = "ajv";
- version = "4.8.2";
+ version = "4.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/ajv/-/ajv-4.8.2.tgz";
- sha1 = "65486936ca36fea39a1504332a78bebd5d447bdc";
+ url = "https://registry.npmjs.org/ajv/-/ajv-4.9.0.tgz";
+ sha1 = "5a358085747b134eb567d6d15e015f1d7802f45c";
};
};
"ajv-keywords-1.1.1" = {
@@ -9890,13 +9890,13 @@ let
sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017";
};
};
- "npmlog-4.0.0" = {
+ "npmlog-4.0.1" = {
name = "npmlog";
packageName = "npmlog";
- version = "4.0.0";
+ version = "4.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.0.tgz";
- sha1 = "e094503961c70c1774eb76692080e8d578a9f88f";
+ url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.1.tgz";
+ sha1 = "d14f503b4cd79710375553004ba96e6662fbc0b8";
};
};
"tar-pack-3.3.0" = {
@@ -9917,13 +9917,13 @@ let
sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
};
};
- "gauge-2.6.0" = {
+ "gauge-2.7.1" = {
name = "gauge";
packageName = "gauge";
- version = "2.6.0";
+ version = "2.7.1";
src = fetchurl {
- url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz";
- sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46";
+ url = "https://registry.npmjs.org/gauge/-/gauge-2.7.1.tgz";
+ sha1 = "388473894fe8be5e13ffcdb8b93e4ed0616428c7";
};
};
"set-blocking-2.0.0" = {
@@ -10125,13 +10125,13 @@ let
sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6";
};
};
- "clean-css-3.4.20" = {
+ "clean-css-3.4.21" = {
name = "clean-css";
packageName = "clean-css";
- version = "3.4.20";
+ version = "3.4.21";
src = fetchurl {
- url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.20.tgz";
- sha1 = "c0d8963b5448e030f0bcd3ddd0dac4dfe3dea501";
+ url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.21.tgz";
+ sha1 = "2101d5dbd19d63dbc16a75ebd570e7c33948f65b";
};
};
"commander-2.6.0" = {
@@ -10305,6 +10305,15 @@ let
sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
};
};
+ "camelcase-1.2.1" = {
+ name = "camelcase";
+ packageName = "camelcase";
+ version = "1.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
+ sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
+ };
+ };
"cliui-2.1.0" = {
name = "cliui";
packageName = "cliui";
@@ -10422,22 +10431,22 @@ let
sha1 = "a98f2ff67183d8ba7cfaca10548bd7ff0550b385";
};
};
- "orchestrator-0.3.7" = {
+ "orchestrator-0.3.8" = {
name = "orchestrator";
packageName = "orchestrator";
- version = "0.3.7";
+ version = "0.3.8";
src = fetchurl {
- url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz";
- sha1 = "c45064e22c5a2a7b99734f409a95ffedc7d3c3df";
+ url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz";
+ sha1 = "14e7e9e2764f7315fbac184e506c7aa6df94ad7e";
};
};
- "pretty-hrtime-1.0.2" = {
+ "pretty-hrtime-1.0.3" = {
name = "pretty-hrtime";
packageName = "pretty-hrtime";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.2.tgz";
- sha1 = "70ca96f4d0628a443b918758f79416a9a7bc9fa8";
+ url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz";
+ sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1";
};
};
"tildify-1.2.0" = {
@@ -10476,13 +10485,13 @@ let
sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031";
};
};
- "beeper-1.1.0" = {
+ "beeper-1.1.1" = {
name = "beeper";
packageName = "beeper";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz";
- sha1 = "9ee6fc1ce7f54feaace7ce73588b056037866a2c";
+ url = "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz";
+ sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809";
};
};
"dateformat-1.0.12" = {
@@ -11295,13 +11304,13 @@ let
sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018";
};
};
- "handlebars-4.0.5" = {
+ "handlebars-4.0.6" = {
name = "handlebars";
packageName = "handlebars";
- version = "4.0.5";
+ version = "4.0.6";
src = fetchurl {
- url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz";
- sha1 = "92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7";
+ url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.6.tgz";
+ sha1 = "2ce4484850537f9c97a8026d5399b935c4ed4ed7";
};
};
"supports-color-3.1.2" = {
@@ -11961,6 +11970,15 @@ let
sha1 = "a73f04d88e7292d7fd2f2d7d691a0cdeeed141a9";
};
};
+ "basic-auth-1.0.4" = {
+ name = "basic-auth";
+ packageName = "basic-auth";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz";
+ sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290";
+ };
+ };
"connect-2.30.2" = {
name = "connect";
packageName = "connect";
@@ -12105,13 +12123,13 @@ let
sha1 = "197e22cdebd4198585e8694ef6786197b91ed942";
};
};
- "method-override-2.3.6" = {
+ "method-override-2.3.7" = {
name = "method-override";
packageName = "method-override";
- version = "2.3.6";
+ version = "2.3.7";
src = fetchurl {
- url = "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz";
- sha1 = "209261cc588d45d9d5a022ff20d7d5eb8e92179e";
+ url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz";
+ sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5";
};
};
"morgan-1.6.1" = {
@@ -12150,22 +12168,22 @@ let
sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607";
};
};
- "response-time-2.3.1" = {
+ "response-time-2.3.2" = {
name = "response-time";
packageName = "response-time";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchurl {
- url = "https://registry.npmjs.org/response-time/-/response-time-2.3.1.tgz";
- sha1 = "2bde19181de6c81ab95e3207a28d61d965b31797";
+ url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz";
+ sha1 = "ffa71bab952d62f7c1d49b7434355fbc68dffc5a";
};
};
- "serve-favicon-2.3.0" = {
+ "serve-favicon-2.3.2" = {
name = "serve-favicon";
packageName = "serve-favicon";
- version = "2.3.0";
+ version = "2.3.2";
src = fetchurl {
- url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz";
- sha1 = "aed36cc6834069a6f189cc7222c6a1a811dc5b39";
+ url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz";
+ sha1 = "dd419e268de012ab72b319d337f2105013f9381f";
};
};
"serve-index-1.7.3" = {
@@ -12204,22 +12222,13 @@ let
sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade";
};
};
- "csrf-3.0.3" = {
+ "csrf-3.0.4" = {
name = "csrf";
packageName = "csrf";
- version = "3.0.3";
+ version = "3.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/csrf/-/csrf-3.0.3.tgz";
- sha1 = "69d13220de95762808bb120f7533a994fc4293b5";
- };
- };
- "base64-url-1.2.2" = {
- name = "base64-url";
- packageName = "base64-url";
- version = "1.2.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz";
- sha1 = "90af26ef8b0b67bc801b05eccf943345649008b3";
+ url = "https://registry.npmjs.org/csrf/-/csrf-3.0.4.tgz";
+ sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5";
};
};
"rndm-1.2.0" = {
@@ -12240,13 +12249,13 @@ let
sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97";
};
};
- "uid-safe-2.1.1" = {
+ "uid-safe-2.1.3" = {
name = "uid-safe";
packageName = "uid-safe";
- version = "2.1.1";
+ version = "2.1.3";
src = fetchurl {
- url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.1.tgz";
- sha1 = "3dbf9436b528be9f52882c05a6216c3763db3666";
+ url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.3.tgz";
+ sha1 = "077e264a00b3187936b270bb7376a26473631071";
};
};
"random-bytes-1.0.0" = {
@@ -12789,6 +12798,15 @@ let
sha1 = "2d46fa874337af9498a2f12bb43d8d0be4a36873";
};
};
+ "gauge-2.6.0" = {
+ name = "gauge";
+ packageName = "gauge";
+ version = "2.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz";
+ sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46";
+ };
+ };
"uid-number-0.0.5" = {
name = "uid-number";
packageName = "uid-number";
@@ -13311,49 +13329,49 @@ let
sha1 = "6b65273b99193c5f067a4cf5809598f777e3b759";
};
};
- "node-red-node-feedparser-0.1.6" = {
+ "node-red-node-feedparser-0.1.7" = {
name = "node-red-node-feedparser";
packageName = "node-red-node-feedparser";
- version = "0.1.6";
- src = fetchurl {
- url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.6.tgz";
- sha1 = "42eb2e11a010904e6af7257feb27a2a64a1b578d";
- };
- };
- "node-red-node-email-0.1.11" = {
- name = "node-red-node-email";
- packageName = "node-red-node-email";
- version = "0.1.11";
- src = fetchurl {
- url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.11.tgz";
- sha1 = "4a64070f3fc5596fdc50e988813dd4ff003b3fd8";
- };
- };
- "node-red-node-twitter-0.1.7" = {
- name = "node-red-node-twitter";
- packageName = "node-red-node-twitter";
version = "0.1.7";
src = fetchurl {
- url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.7.tgz";
- sha1 = "8cef1e54df6217d83b49fd48684e6ca2ee1cf595";
+ url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.7.tgz";
+ sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f";
};
};
- "node-red-node-rbe-0.1.5" = {
+ "node-red-node-email-0.1.12" = {
+ name = "node-red-node-email";
+ packageName = "node-red-node-email";
+ version = "0.1.12";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.12.tgz";
+ sha1 = "ada28233b92e60907ab53a6edc0bb4c17d27d4f5";
+ };
+ };
+ "node-red-node-twitter-0.1.9" = {
+ name = "node-red-node-twitter";
+ packageName = "node-red-node-twitter";
+ version = "0.1.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.9.tgz";
+ sha1 = "e0ad7f654aab3ff8e7c3d001ec3cee030d33d217";
+ };
+ };
+ "node-red-node-rbe-0.1.6" = {
name = "node-red-node-rbe";
packageName = "node-red-node-rbe";
- version = "0.1.5";
+ version = "0.1.6";
src = fetchurl {
- url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.5.tgz";
- sha1 = "9df9b13b8828c9396319a54ad7c0fbb1a4005e9d";
+ url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.6.tgz";
+ sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539";
};
};
- "node-red-node-serialport-0.4.0" = {
+ "node-red-node-serialport-0.4.1" = {
name = "node-red-node-serialport";
packageName = "node-red-node-serialport";
- version = "0.4.0";
+ version = "0.4.1";
src = fetchurl {
- url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.0.tgz";
- sha1 = "dfa63bedd535fa9debef754c373e439f8bc73abe";
+ url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.1.tgz";
+ sha1 = "1c59ea7d2b25612dd0cb53956ab8edf28c74d45c";
};
};
"bcrypt-0.8.7" = {
@@ -13509,13 +13527,13 @@ let
sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4";
};
};
- "moment-timezone-0.5.7" = {
+ "moment-timezone-0.5.9" = {
name = "moment-timezone";
packageName = "moment-timezone";
- version = "0.5.7";
+ version = "0.5.9";
src = fetchurl {
- url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.7.tgz";
- sha1 = "1305bcada16f046dbbc7ac89abf66effff886cb5";
+ url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.9.tgz";
+ sha1 = "e0ea82036d67d21d793544a91b5057f480eda2dd";
};
};
"retry-0.6.1" = {
@@ -13527,13 +13545,13 @@ let
sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918";
};
};
- "cookies-0.6.1" = {
+ "cookies-0.6.2" = {
name = "cookies";
packageName = "cookies";
- version = "0.6.1";
+ version = "0.6.2";
src = fetchurl {
- url = "https://registry.npmjs.org/cookies/-/cookies-0.6.1.tgz";
- sha1 = "ef693b1bc6f01f567d46e2f504e9c15fb70cba90";
+ url = "https://registry.npmjs.org/cookies/-/cookies-0.6.2.tgz";
+ sha1 = "6ac1b052895208e8fc4c4f5f86a9ed31b9cb5ccf";
};
};
"i18next-client-1.10.3" = {
@@ -13617,13 +13635,13 @@ let
sha1 = "7382c148cb622c4b28af7c727f9673730b73f474";
};
};
- "websocket-stream-3.3.0" = {
+ "websocket-stream-3.3.3" = {
name = "websocket-stream";
packageName = "websocket-stream";
- version = "3.3.0";
+ version = "3.3.3";
src = fetchurl {
- url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.0.tgz";
- sha1 = "69ced776afca68688ed5be73d28511a2c329c8ed";
+ url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.3.tgz";
+ sha1 = "361da5404a337e60cfbc29b4a46368762679df0b";
};
};
"leven-1.0.2" = {
@@ -13896,13 +13914,13 @@ let
sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb";
};
};
- "uue-3.0.0" = {
+ "uue-3.1.0" = {
name = "uue";
packageName = "uue";
- version = "3.0.0";
+ version = "3.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/uue/-/uue-3.0.0.tgz";
- sha1 = "07af69344defa9851b7b845c1c18110b8264e51e";
+ url = "https://registry.npmjs.org/uue/-/uue-3.1.0.tgz";
+ sha1 = "5d67d37030e66efebbb4b8aac46daf9b55befbf6";
};
};
"utf7-1.0.2" = {
@@ -13923,13 +13941,13 @@ let
sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4";
};
};
- "serialport-4.0.4" = {
+ "serialport-4.0.6" = {
name = "serialport";
packageName = "serialport";
- version = "4.0.4";
+ version = "4.0.6";
src = fetchurl {
- url = "https://registry.npmjs.org/serialport/-/serialport-4.0.4.tgz";
- sha1 = "93e55ad75e0451fcdeabb939c08da01da138a74a";
+ url = "https://registry.npmjs.org/serialport/-/serialport-4.0.6.tgz";
+ sha1 = "2ea4c1a2b6ad91d9cacd78e8e530f8969ac650ae";
};
};
"lie-3.1.0" = {
@@ -14202,13 +14220,13 @@ let
sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81";
};
};
- "buffer-crc32-0.2.5" = {
+ "buffer-crc32-0.2.6" = {
name = "buffer-crc32";
packageName = "buffer-crc32";
- version = "0.2.5";
+ version = "0.2.6";
src = fetchurl {
- url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz";
- sha1 = "db003ac2671e62ebd6ece78ea2c2e1b405736e91";
+ url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.6.tgz";
+ sha1 = "612b318074fc6c4c30504b297247a1f91641253b";
};
};
"fresh-0.1.0" = {
@@ -14517,13 +14535,13 @@ let
sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2";
};
};
- "raw-socket-1.5.0" = {
+ "raw-socket-1.5.1" = {
name = "raw-socket";
packageName = "raw-socket";
- version = "1.5.0";
+ version = "1.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.0.tgz";
- sha1 = "7a0fba1aef118609011a1205e830e626ca522ae9";
+ url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.1.tgz";
+ sha1 = "a85466c7984c0f0c3842ee562dc61b9873977528";
};
};
"argparse-0.1.16" = {
@@ -14607,6 +14625,15 @@ let
sha1 = "3cd4574a00b67bae373a94b748772640507b7aac";
};
};
+ "mississippi-1.2.0" = {
+ name = "mississippi";
+ packageName = "mississippi";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz";
+ sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
+ };
+ };
"npm-install-checks-3.0.0" = {
name = "npm-install-checks";
packageName = "npm-install-checks";
@@ -14616,6 +14643,15 @@ let
sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
};
};
+ "npm-registry-client-7.3.0" = {
+ name = "npm-registry-client";
+ packageName = "npm-registry-client";
+ version = "7.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.3.0.tgz";
+ sha1 = "f2a390e8b13b78fafe26e9fa9d8bc74e17bcaa50";
+ };
+ };
"opener-1.4.2" = {
name = "opener";
packageName = "opener";
@@ -14643,13 +14679,22 @@ let
sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6";
};
};
- "request-2.75.0" = {
+ "request-2.78.0" = {
name = "request";
packageName = "request";
- version = "2.75.0";
+ version = "2.78.0";
src = fetchurl {
- url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz";
- sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93";
+ url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz";
+ sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc";
+ };
+ };
+ "sorted-union-stream-2.1.3" = {
+ name = "sorted-union-stream";
+ packageName = "sorted-union-stream";
+ version = "2.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sorted-union-stream/-/sorted-union-stream-2.1.3.tgz";
+ sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7";
};
};
"unique-filename-1.1.0" = {
@@ -14697,13 +14742,40 @@ let
sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26";
};
};
- "form-data-2.0.0" = {
- name = "form-data";
- packageName = "form-data";
- version = "2.0.0";
+ "flush-write-stream-1.0.2" = {
+ name = "flush-write-stream";
+ packageName = "flush-write-stream";
+ version = "1.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz";
- sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25";
+ url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz";
+ sha1 = "c81b90d8746766f1a609a46809946c45dd8ae417";
+ };
+ };
+ "from2-2.3.0" = {
+ name = "from2";
+ packageName = "from2";
+ version = "2.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz";
+ sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
+ };
+ };
+ "stream-each-1.2.0" = {
+ name = "stream-each";
+ packageName = "stream-each";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.0.tgz";
+ sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991";
+ };
+ };
+ "stream-iterate-1.2.0" = {
+ name = "stream-iterate";
+ packageName = "stream-iterate";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/stream-iterate/-/stream-iterate-1.2.0.tgz";
+ sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1";
};
};
"unique-slug-2.0.0" = {
@@ -14931,13 +15003,13 @@ let
sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292";
};
};
- "npm-3.10.9" = {
+ "npm-3.10.10" = {
name = "npm";
packageName = "npm";
- version = "3.10.9";
+ version = "3.10.10";
src = fetchurl {
- url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz";
- sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3";
+ url = "https://registry.npmjs.org/npm/-/npm-3.10.10.tgz";
+ sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e";
};
};
"npmi-2.0.1" = {
@@ -14985,6 +15057,24 @@ let
sha1 = "27c90519196dc15015be02a34ea52986feab8877";
};
};
+ "request-2.75.0" = {
+ name = "request";
+ packageName = "request";
+ version = "2.75.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz";
+ sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93";
+ };
+ };
+ "form-data-2.0.0" = {
+ name = "form-data";
+ packageName = "form-data";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz";
+ sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25";
+ };
+ };
"boxen-0.6.0" = {
name = "boxen";
packageName = "boxen";
@@ -15129,15 +15219,6 @@ let
sha1 = "da80c79c6d7441cdfec7c2ff2dcbd7c13ebdbea2";
};
};
- "bunyan-1.8.4" = {
- name = "bunyan";
- packageName = "bunyan";
- version = "1.8.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.4.tgz";
- sha1 = "98013acc812ebc3806364049edf6c9129d8b8d73";
- };
- };
"connect-busboy-0.0.2" = {
name = "connect-busboy";
packageName = "connect-busboy";
@@ -15147,13 +15228,14 @@ let
sha1 = "ac5c9c96672171885e576c66b2bfd95d3bb11097";
};
};
- "core-js-1.2.7" = {
- name = "core-js";
- packageName = "core-js";
- version = "1.2.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz";
- sha1 = "652294c14651db28fa93bd2d5ff2983a4f08c636";
+ "content-type-git+https://github.com/wikimedia/content-type.git#master" = {
+ name = "content-type";
+ packageName = "content-type";
+ version = "1.0.1";
+ src = fetchgit {
+ url = "https://github.com/wikimedia/content-type.git";
+ rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b";
+ sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04";
};
};
"diff-1.4.0" = {
@@ -15174,22 +15256,22 @@ let
sha1 = "26bc01f739707505c51456af7f59e3373369475d";
};
};
- "express-handlebars-2.0.1" = {
+ "express-handlebars-3.0.0" = {
name = "express-handlebars";
packageName = "express-handlebars";
- version = "2.0.1";
+ version = "3.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-2.0.1.tgz";
- sha1 = "975661ffebd6e79463230ba4c8e0ca5cd0522fb1";
+ url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-3.0.0.tgz";
+ sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f";
};
};
- "finalhandler-0.4.1" = {
+ "finalhandler-0.5.1" = {
name = "finalhandler";
packageName = "finalhandler";
- version = "0.4.1";
+ version = "0.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz";
- sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d";
+ url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz";
+ sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd";
};
};
"gelf-stream-0.2.4" = {
@@ -15201,22 +15283,23 @@ let
sha1 = "a418c8c2e39b85b7932a3e8523f6022d6852e013";
};
};
- "html5-1.0.5" = {
- name = "html5";
- packageName = "html5";
- version = "1.0.5";
+ "mediawiki-title-0.5.6" = {
+ name = "mediawiki-title";
+ packageName = "mediawiki-title";
+ version = "0.5.6";
src = fetchurl {
- url = "https://registry.npmjs.org/html5/-/html5-1.0.5.tgz";
- sha1 = "c9e6ce4e07a70521904bee1b318a4c48feab5848";
+ url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.5.6.tgz";
+ sha1 = "549069294e27728a1f13bed3d705d6beecf4ea24";
};
};
- "node-txstatsd-0.1.6" = {
- name = "node-txstatsd";
- packageName = "node-txstatsd";
- version = "0.1.6";
- src = fetchurl {
- url = "https://registry.npmjs.org/node-txstatsd/-/node-txstatsd-0.1.6.tgz";
- sha1 = "924d22e5348c40156c2eb5ac29a5bb5609ca2a04";
+ "negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = {
+ name = "negotiator";
+ packageName = "negotiator";
+ version = "0.6.1";
+ src = fetchgit {
+ url = "https://github.com/arlolra/negotiator.git";
+ rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a";
+ sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394";
};
};
"pegjs-git+https://github.com/tstarling/pegjs.git#fork" = {
@@ -15225,8 +15308,8 @@ let
version = "0.8.0";
src = fetchgit {
url = "https://github.com/tstarling/pegjs.git";
- rev = "9162b1e114e41992dd0fdafa24d2574a0b8a836a";
- sha256 = "d0dac8e9de14c4e7c05da55248dd3a422b915a96d668aa14f92747cfdbdb40aa";
+ rev = "36d584bd7bbc564c86c058c5dfe8053b1fe1d584";
+ sha256 = "df0bf31b132e63beae73a28f1edfe0a2e9edf01660632c72834c682e2b484905";
};
};
"prfun-2.1.4" = {
@@ -15238,6 +15321,15 @@ let
sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0";
};
};
+ "service-runner-2.1.11" = {
+ name = "service-runner";
+ packageName = "service-runner";
+ version = "2.1.11";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.11.tgz";
+ sha1 = "1b0c83666beef6cc0637f0573a5107d107eac5bb";
+ };
+ };
"simplediff-0.1.1" = {
name = "simplediff";
packageName = "simplediff";
@@ -15247,6 +15339,15 @@ let
sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c";
};
};
+ "yargs-4.8.1" = {
+ name = "yargs";
+ packageName = "yargs";
+ version = "4.8.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz";
+ sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0";
+ };
+ };
"is-arguments-1.0.2" = {
name = "is-arguments";
packageName = "is-arguments";
@@ -15256,13 +15357,103 @@ let
sha1 = "07e30ad79531844179b642d2d8399435182c8727";
};
};
- "dtrace-provider-0.7.1" = {
+ "busboy-0.2.13" = {
+ name = "busboy";
+ packageName = "busboy";
+ version = "0.2.13";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz";
+ sha1 = "90fc4f6a3967d815616fc976bfa8e56aed0c58b6";
+ };
+ };
+ "dicer-0.2.5" = {
+ name = "dicer";
+ packageName = "dicer";
+ version = "0.2.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz";
+ sha1 = "5996c086bb33218c812c090bddc09cd12facb70f";
+ };
+ };
+ "streamsearch-0.1.2" = {
+ name = "streamsearch";
+ packageName = "streamsearch";
+ version = "0.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz";
+ sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
+ };
+ };
+ "gelfling-0.2.0" = {
+ name = "gelfling";
+ packageName = "gelfling";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz";
+ sha1 = "23a13c366883adae32ecfd252a566be302b88dc3";
+ };
+ };
+ "bunyan-1.8.5" = {
+ name = "bunyan";
+ packageName = "bunyan";
+ version = "1.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.5.tgz";
+ sha1 = "0d619e83005fb89070f5f47982fc1bf00600878a";
+ };
+ };
+ "bunyan-syslog-udp-0.1.0" = {
+ name = "bunyan-syslog-udp";
+ packageName = "bunyan-syslog-udp";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bunyan-syslog-udp/-/bunyan-syslog-udp-0.1.0.tgz";
+ sha1 = "fbfaee03a81cd2a95abc18f92c99f2bb87e2429c";
+ };
+ };
+ "gelf-stream-1.1.1" = {
+ name = "gelf-stream";
+ packageName = "gelf-stream";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-1.1.1.tgz";
+ sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669";
+ };
+ };
+ "hot-shots-4.3.1" = {
+ name = "hot-shots";
+ packageName = "hot-shots";
+ version = "4.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.3.1.tgz";
+ sha1 = "58a6c1ff717f25673be4d2f736d1c94d5d79e239";
+ };
+ };
+ "limitation-0.1.9" = {
+ name = "limitation";
+ packageName = "limitation";
+ version = "0.1.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/limitation/-/limitation-0.1.9.tgz";
+ sha1 = "ba055ff7dd3a267a65cc6be2deca4ea6bebbdb03";
+ };
+ };
+ "yargs-5.0.0" = {
+ name = "yargs";
+ packageName = "yargs";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz";
+ sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e";
+ };
+ };
+ "dtrace-provider-0.8.0" = {
name = "dtrace-provider";
packageName = "dtrace-provider";
- version = "0.7.1";
+ version = "0.8.0";
src = fetchurl {
- url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.7.1.tgz";
- sha1 = "c06b308f2f10d5d5838aec9c571e5d588dc71d04";
+ url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.0.tgz";
+ sha1 = "fa95fbf67ed3ae3e97364f9664af7302e5ff5625";
};
};
"mv-2.1.1" = {
@@ -15301,139 +15492,167 @@ let
sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da";
};
};
- "busboy-0.2.13" = {
- name = "busboy";
- packageName = "busboy";
- version = "0.2.13";
- src = fetchurl {
- url = "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz";
- sha1 = "90fc4f6a3967d815616fc976bfa8e56aed0c58b6";
- };
- };
- "dicer-0.2.5" = {
- name = "dicer";
- packageName = "dicer";
- version = "0.2.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz";
- sha1 = "5996c086bb33218c812c090bddc09cd12facb70f";
- };
- };
- "streamsearch-0.1.2" = {
- name = "streamsearch";
- packageName = "streamsearch";
- version = "0.1.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz";
- sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
- };
- };
- "handlebars-3.0.3" = {
- name = "handlebars";
- packageName = "handlebars";
- version = "3.0.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/handlebars/-/handlebars-3.0.3.tgz";
- sha1 = "0e09651a2f0fb3c949160583710d551f92e6d2ad";
- };
- };
- "object.assign-1.1.1" = {
- name = "object.assign";
- packageName = "object.assign";
- version = "1.1.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/object.assign/-/object.assign-1.1.1.tgz";
- sha1 = "f229674273f94fcb230d02c1958a8b94ec9ef95c";
- };
- };
- "uglify-js-2.3.6" = {
- name = "uglify-js";
- packageName = "uglify-js";
- version = "2.3.6";
- src = fetchurl {
- url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
- sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
- };
- };
- "gelfling-0.2.0" = {
+ "gelfling-0.3.1" = {
name = "gelfling";
packageName = "gelfling";
- version = "0.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz";
- sha1 = "23a13c366883adae32ecfd252a566be302b88dc3";
- };
- };
- "opts-1.2.2" = {
- name = "opts";
- packageName = "opts";
- version = "1.2.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/opts/-/opts-1.2.2.tgz";
- sha1 = "81782b93014a1cd88d56c226643fd4282473853d";
- };
- };
- "html5-entities-1.0.0" = {
- name = "html5-entities";
- packageName = "html5-entities";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/html5-entities/-/html5-entities-1.0.0.tgz";
- sha1 = "e568fd84d8efb52c806b16c98b92dad548ebe370";
- };
- };
- "jsdom-0.11.1" = {
- name = "jsdom";
- packageName = "jsdom";
- version = "0.11.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/jsdom/-/jsdom-0.11.1.tgz";
- sha1 = "f1a79756ebc2116932caef8c6bfde7022dacdbfb";
- };
- };
- "nwmatcher-1.3.9" = {
- name = "nwmatcher";
- packageName = "nwmatcher";
- version = "1.3.9";
- src = fetchurl {
- url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.9.tgz";
- sha1 = "8bab486ff7fa3dfd086656bbe8b17116d3692d2a";
- };
- };
- "xmlhttprequest-1.8.0" = {
- name = "xmlhttprequest";
- packageName = "xmlhttprequest";
- version = "1.8.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz";
- sha1 = "67fe075c5c24fef39f9d65f5f7b7fe75171968fc";
- };
- };
- "cssom-0.3.1" = {
- name = "cssom";
- packageName = "cssom";
version = "0.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/cssom/-/cssom-0.3.1.tgz";
- sha1 = "c9e37ef2490e64f6d1baa10fda852257082c25d3";
+ url = "https://registry.npmjs.org/gelfling/-/gelfling-0.3.1.tgz";
+ sha1 = "336a98f81510f9ae0af2a494e17468a116a9dc04";
};
};
- "cssstyle-0.2.37" = {
- name = "cssstyle";
- packageName = "cssstyle";
- version = "0.2.37";
- src = fetchurl {
- url = "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz";
- sha1 = "541097234cb2513c83ceed3acddc27ff27987d54";
+ "kad-git+https://github.com/gwicke/kad.git#master" = {
+ name = "kad";
+ packageName = "kad";
+ version = "1.3.6";
+ src = fetchgit {
+ url = "https://github.com/gwicke/kad.git";
+ rev = "f35971036f43814043245da82b12d035b7bbfd16";
+ sha256 = "9529b2615547db37851d15b39155c608d6b8d0641366d14cce728824b6135a35";
};
};
- "contextify-0.1.15" = {
- name = "contextify";
- packageName = "contextify";
- version = "0.1.15";
+ "clarinet-0.11.0" = {
+ name = "clarinet";
+ packageName = "clarinet";
+ version = "0.11.0";
src = fetchurl {
- url = "https://registry.npmjs.org/contextify/-/contextify-0.1.15.tgz";
- sha1 = "3d34681d14a5ccbbe609c9ee11eda206b8cf266f";
+ url = "https://registry.npmjs.org/clarinet/-/clarinet-0.11.0.tgz";
+ sha1 = "6cc912b93138dc867fc273cd34ea90e83e054719";
+ };
+ };
+ "kad-fs-0.0.4" = {
+ name = "kad-fs";
+ packageName = "kad-fs";
+ version = "0.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/kad-fs/-/kad-fs-0.0.4.tgz";
+ sha1 = "02ea5aa5cf22225725579627ccfd6d266372289a";
+ };
+ };
+ "kad-localstorage-0.0.7" = {
+ name = "kad-localstorage";
+ packageName = "kad-localstorage";
+ version = "0.0.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/kad-localstorage/-/kad-localstorage-0.0.7.tgz";
+ sha1 = "f7a2e780da53fb28b943c2c5a894c279aa810f17";
+ };
+ };
+ "kad-memstore-0.0.1" = {
+ name = "kad-memstore";
+ packageName = "kad-memstore";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/kad-memstore/-/kad-memstore-0.0.1.tgz";
+ sha1 = "83cb748496ac491c7135104cbe56b88ca7392477";
+ };
+ };
+ "merge-1.2.0" = {
+ name = "merge";
+ packageName = "merge";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz";
+ sha1 = "7531e39d4949c281a66b8c5a6e0265e8b05894da";
+ };
+ };
+ "msgpack5-3.4.1" = {
+ name = "msgpack5";
+ packageName = "msgpack5";
+ version = "3.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.4.1.tgz";
+ sha1 = "350ef35899c6c8773710fd84d881ddd3340a8114";
+ };
+ };
+ "dom-storage-2.0.2" = {
+ name = "dom-storage";
+ packageName = "dom-storage";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.0.2.tgz";
+ sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0";
+ };
+ };
+ "get-caller-file-1.0.2" = {
+ name = "get-caller-file";
+ packageName = "get-caller-file";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz";
+ sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5";
+ };
+ };
+ "lodash.assign-4.2.0" = {
+ name = "lodash.assign";
+ packageName = "lodash.assign";
+ version = "4.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
+ sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
+ };
+ };
+ "require-directory-2.1.1" = {
+ name = "require-directory";
+ packageName = "require-directory";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
+ sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
+ };
+ };
+ "require-main-filename-1.0.1" = {
+ name = "require-main-filename";
+ packageName = "require-main-filename";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
+ sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
+ };
+ };
+ "which-module-1.0.0" = {
+ name = "which-module";
+ packageName = "which-module";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz";
+ sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
+ };
+ };
+ "window-size-0.2.0" = {
+ name = "window-size";
+ packageName = "window-size";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz";
+ sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075";
+ };
+ };
+ "yargs-parser-3.2.0" = {
+ name = "yargs-parser";
+ packageName = "yargs-parser";
+ version = "3.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz";
+ sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f";
+ };
+ };
+ "camelcase-3.0.0" = {
+ name = "camelcase";
+ packageName = "camelcase";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
+ sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
+ };
+ };
+ "yargs-parser-2.4.1" = {
+ name = "yargs-parser";
+ packageName = "yargs-parser";
+ version = "2.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz";
+ sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4";
};
};
"airplayer-2.0.0" = {
@@ -15454,13 +15673,13 @@ let
sha1 = "b8d19188b3243e390f302410bd0cb1622db82649";
};
};
- "inquirer-1.2.2" = {
+ "inquirer-1.2.3" = {
name = "inquirer";
packageName = "inquirer";
- version = "1.2.2";
+ version = "1.2.3";
src = fetchurl {
- url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.2.tgz";
- sha1 = "f725c1316f0020e7f3d538c8c5ad0c2732c1c451";
+ url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz";
+ sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918";
};
};
"network-address-1.1.0" = {
@@ -15634,13 +15853,13 @@ let
sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901";
};
};
- "dns-packet-1.1.0" = {
+ "dns-packet-1.1.1" = {
name = "dns-packet";
packageName = "dns-packet";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.0.tgz";
- sha1 = "c11ce43bd9977aa789af72de06b6e4ad6e84730d";
+ url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.1.tgz";
+ sha1 = "2369d45038af045f3898e6fa56862aed3f40296c";
};
};
"external-editor-1.1.1" = {
@@ -15715,13 +15934,13 @@ let
sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad";
};
};
- "socket.io-0.9.17" = {
+ "socket.io-1.6.0" = {
name = "socket.io";
packageName = "socket.io";
- version = "0.9.17";
+ version = "1.6.0";
src = fetchurl {
- url = "https://registry.npmjs.org/socket.io/-/socket.io-0.9.17.tgz";
- sha1 = "ca389268fb2cd5df4b59218490a08c907581c9ec";
+ url = "https://registry.npmjs.org/socket.io/-/socket.io-1.6.0.tgz";
+ sha1 = "3e40d932637e6bd923981b25caf7c53e83b6e2e1";
};
};
"torrent-stream-0.18.1" = {
@@ -16093,13 +16312,121 @@ let
sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0";
};
};
- "socket.io-client-0.9.16" = {
+ "engine.io-1.8.0" = {
+ name = "engine.io";
+ packageName = "engine.io";
+ version = "1.8.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.0.tgz";
+ sha1 = "3eeb5f264cb75dbbec1baaea26d61f5a4eace2aa";
+ };
+ };
+ "socket.io-adapter-0.5.0" = {
+ name = "socket.io-adapter";
+ packageName = "socket.io-adapter";
+ version = "0.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz";
+ sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b";
+ };
+ };
+ "socket.io-client-1.6.0" = {
name = "socket.io-client";
packageName = "socket.io-client";
- version = "0.9.16";
+ version = "1.6.0";
src = fetchurl {
- url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz";
- sha1 = "4da7515c5e773041d1b423970415bcc430f35fc6";
+ url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.6.0.tgz";
+ sha1 = "5b668f4f771304dfeed179064708386fa6717853";
+ };
+ };
+ "socket.io-parser-2.3.1" = {
+ name = "socket.io-parser";
+ packageName = "socket.io-parser";
+ version = "2.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz";
+ sha1 = "dd532025103ce429697326befd64005fcfe5b4a0";
+ };
+ };
+ "engine.io-parser-1.3.1" = {
+ name = "engine.io-parser";
+ packageName = "engine.io-parser";
+ version = "1.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.1.tgz";
+ sha1 = "9554f1ae33107d6fbd170ca5466d2f833f6a07cf";
+ };
+ };
+ "base64-arraybuffer-0.1.5" = {
+ name = "base64-arraybuffer";
+ packageName = "base64-arraybuffer";
+ version = "0.1.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz";
+ sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8";
+ };
+ };
+ "wtf-8-1.0.0" = {
+ name = "wtf-8";
+ packageName = "wtf-8";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz";
+ sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a";
+ };
+ };
+ "component-emitter-1.2.1" = {
+ name = "component-emitter";
+ packageName = "component-emitter";
+ version = "1.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
+ sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
+ };
+ };
+ "engine.io-client-1.8.0" = {
+ name = "engine.io-client";
+ packageName = "engine.io-client";
+ version = "1.8.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.0.tgz";
+ sha1 = "7b730e4127414087596d9be3c88d2bc5fdb6cf5c";
+ };
+ };
+ "parseuri-0.0.5" = {
+ name = "parseuri";
+ packageName = "parseuri";
+ version = "0.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz";
+ sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a";
+ };
+ };
+ "parsejson-0.0.3" = {
+ name = "parsejson";
+ packageName = "parsejson";
+ version = "0.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz";
+ sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab";
+ };
+ };
+ "parseqs-0.0.5" = {
+ name = "parseqs";
+ packageName = "parseqs";
+ version = "0.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz";
+ sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
+ };
+ };
+ "xmlhttprequest-ssl-1.5.3" = {
+ name = "xmlhttprequest-ssl";
+ packageName = "xmlhttprequest-ssl";
+ version = "1.5.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz";
+ sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d";
};
};
"bittorrent-dht-3.2.6" = {
@@ -16859,6 +17186,15 @@ let
sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20";
};
};
+ "uglify-js-2.3.6" = {
+ name = "uglify-js";
+ packageName = "uglify-js";
+ version = "2.3.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
+ sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
+ };
+ };
"markdown-it-4.4.0" = {
name = "markdown-it";
packageName = "markdown-it";
@@ -17264,6 +17600,15 @@ let
sha1 = "7f959346cfc8719e3f7233cd6852854a7c67d8a3";
};
};
+ "js-yaml-3.6.1" = {
+ name = "js-yaml";
+ packageName = "js-yaml";
+ version = "3.6.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz";
+ sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30";
+ };
+ };
"whet.extend-0.9.9" = {
name = "whet.extend";
packageName = "whet.extend";
@@ -17309,31 +17654,22 @@ let
sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4";
};
};
- "longjohn-0.2.9" = {
+ "longjohn-0.2.11" = {
name = "longjohn";
packageName = "longjohn";
- version = "0.2.9";
+ version = "0.2.11";
src = fetchurl {
- url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.9.tgz";
- sha1 = "db1bf175fcfffcfce099132d1470f52f41a31519";
+ url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.11.tgz";
+ sha1 = "83736a15ae5f48711b625153e98012f2de659e69";
};
};
- "node-appc-0.2.31" = {
+ "node-appc-0.2.39" = {
name = "node-appc";
packageName = "node-appc";
- version = "0.2.31";
+ version = "0.2.39";
src = fetchurl {
- url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.31.tgz";
- sha1 = "8d8d0052fd8b8ce4bc44f06883009f7c950bc8c2";
- };
- };
- "request-2.62.0" = {
- name = "request";
- packageName = "request";
- version = "2.62.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/request/-/request-2.62.0.tgz";
- sha1 = "55c165f702a146f1e21e0725c0b75e1136487b0f";
+ url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.39.tgz";
+ sha1 = "c8ffb1e4e1c85b0df3a443889d765de0d963a1f4";
};
};
"sprintf-0.1.5" = {
@@ -17345,22 +17681,22 @@ let
sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf";
};
};
- "winston-1.0.2" = {
+ "winston-1.1.2" = {
name = "winston";
packageName = "winston";
- version = "1.0.2";
+ version = "1.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/winston/-/winston-1.0.2.tgz";
- sha1 = "351c58e2323f8a4ca29a45195aa9aa3b4c35d76f";
+ url = "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz";
+ sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c";
};
};
- "wrench-1.5.8" = {
+ "wrench-1.5.9" = {
name = "wrench";
packageName = "wrench";
- version = "1.5.8";
+ version = "1.5.9";
src = fetchurl {
- url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz";
- sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5";
+ url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz";
+ sha1 = "411691c63a9b2531b1700267279bdeca23b2142a";
};
};
"source-map-support-0.3.2" = {
@@ -17390,85 +17726,58 @@ let
sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1";
};
};
- "diff-2.1.0" = {
+ "diff-2.2.1" = {
name = "diff";
packageName = "diff";
- version = "2.1.0";
+ version = "2.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/diff/-/diff-2.1.0.tgz";
- sha1 = "39b5aa97f0d1600b428ad0a91dc8efcc9b29e288";
+ url = "https://registry.npmjs.org/diff/-/diff-2.2.1.tgz";
+ sha1 = "76ec8ea33535344078079fbe8cf03435ffb185ec";
};
};
- "node-uuid-1.4.3" = {
- name = "node-uuid";
- packageName = "node-uuid";
- version = "1.4.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz";
- sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9";
- };
- };
- "request-2.61.0" = {
+ "request-2.69.0" = {
name = "request";
packageName = "request";
- version = "2.61.0";
+ version = "2.69.0";
src = fetchurl {
- url = "https://registry.npmjs.org/request/-/request-2.61.0.tgz";
- sha1 = "6973cb2ac94885f02693f554eec64481d6013f9f";
+ url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz";
+ sha1 = "cf91d2e000752b1217155c005241911991a2346a";
};
};
- "semver-5.0.1" = {
+ "semver-5.1.0" = {
name = "semver";
packageName = "semver";
- version = "5.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/semver/-/semver-5.0.1.tgz";
- sha1 = "9fb3f4004f900d83c47968fe42f7583e05832cc9";
- };
- };
- "uglify-js-2.4.24" = {
- name = "uglify-js";
- packageName = "uglify-js";
- version = "2.4.24";
- src = fetchurl {
- url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz";
- sha1 = "fad5755c1e1577658bb06ff9ab6e548c95bebd6e";
- };
- };
- "har-validator-1.8.0" = {
- name = "har-validator";
- packageName = "har-validator";
- version = "1.8.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz";
- sha1 = "d83842b0eb4c435960aeb108a067a3aa94c0eeb2";
- };
- };
- "bluebird-2.11.0" = {
- name = "bluebird";
- packageName = "bluebird";
- version = "2.11.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz";
- sha1 = "534b9033c022c9579c56ba3b3e5a5caafbb650e1";
- };
- };
- "yargs-3.5.4" = {
- name = "yargs";
- packageName = "yargs";
- version = "3.5.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz";
- sha1 = "d8aff8f665e94c34bd259bdebd1bfaf0ddd35361";
- };
- };
- "qs-5.1.0" = {
- name = "qs";
- packageName = "qs";
version = "5.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz";
- sha1 = "4d932e5c7ea411cca76a312d39a606200fd50cd9";
+ url = "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz";
+ sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5";
+ };
+ };
+ "wrench-1.5.8" = {
+ name = "wrench";
+ packageName = "wrench";
+ version = "1.5.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz";
+ sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5";
+ };
+ };
+ "uglify-js-2.6.1" = {
+ name = "uglify-js";
+ packageName = "uglify-js";
+ version = "2.6.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz";
+ sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b";
+ };
+ };
+ "qs-6.0.2" = {
+ name = "qs";
+ packageName = "qs";
+ version = "6.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz";
+ sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd";
};
};
"bluebird-3.3.5" = {
@@ -17570,13 +17879,13 @@ let
sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3";
};
};
- "knockout-3.4.0" = {
+ "knockout-3.4.1" = {
name = "knockout";
packageName = "knockout";
- version = "3.4.0";
+ version = "3.4.1";
src = fetchurl {
- url = "https://registry.npmjs.org/knockout/-/knockout-3.4.0.tgz";
- sha1 = "59d7261815a11eb7c1a3f3c7077ca898a44caadb";
+ url = "https://registry.npmjs.org/knockout/-/knockout-3.4.1.tgz";
+ sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0";
};
};
"lodash-4.12.0" = {
@@ -17678,13 +17987,13 @@ let
sha1 = "e60432658a3387ff269c028eacde4a512e438dff";
};
};
- "color-convert-1.6.0" = {
+ "color-convert-1.8.2" = {
name = "color-convert";
packageName = "color-convert";
- version = "1.6.0";
+ version = "1.8.2";
src = fetchurl {
- url = "https://registry.npmjs.org/color-convert/-/color-convert-1.6.0.tgz";
- sha1 = "7592755faf53938a05b1ea8e5374cab77d6dd190";
+ url = "https://registry.npmjs.org/color-convert/-/color-convert-1.8.2.tgz";
+ sha1 = "be868184d7c8631766d54e7078e2672d7c7e3339";
};
};
"color-string-0.3.0" = {
@@ -17723,6 +18032,15 @@ let
sha1 = "6ab9948a4b1ae21952cd2588530a4722d4044d7c";
};
};
+ "finalhandler-0.4.1" = {
+ name = "finalhandler";
+ packageName = "finalhandler";
+ version = "0.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz";
+ sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d";
+ };
+ };
"send-0.13.1" = {
name = "send";
packageName = "send";
@@ -17849,22 +18167,22 @@ let
sha1 = "2c35e43ea086516f7997cf80b7aa64d55a4a4484";
};
};
- "editions-1.3.1" = {
+ "editions-1.3.3" = {
name = "editions";
packageName = "editions";
- version = "1.3.1";
+ version = "1.3.3";
src = fetchurl {
- url = "https://registry.npmjs.org/editions/-/editions-1.3.1.tgz";
- sha1 = "008425f64dc1401db45ec110e06aa602562419c0";
+ url = "https://registry.npmjs.org/editions/-/editions-1.3.3.tgz";
+ sha1 = "0907101bdda20fac3cbe334c27cbd0688dc99a5b";
};
};
- "typechecker-4.3.0" = {
+ "typechecker-4.4.0" = {
name = "typechecker";
packageName = "typechecker";
- version = "4.3.0";
+ version = "4.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/typechecker/-/typechecker-4.3.0.tgz";
- sha1 = "6f6d6815753e88d6812aa80de4a3fd18948e6e62";
+ url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.0.tgz";
+ sha1 = "efc56882d36e435c6eb978200e22b88278a3f7fc";
};
};
"underscore-1.5.2" = {
@@ -18038,24 +18356,6 @@ let
sha1 = "7d250d8fa1c218119ecde51390458a57d5171376";
};
};
- "camelcase-3.0.0" = {
- name = "camelcase";
- packageName = "camelcase";
- version = "3.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
- sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
- };
- };
- "lodash.assign-4.2.0" = {
- name = "lodash.assign";
- packageName = "lodash.assign";
- version = "4.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
- sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
- };
- };
"pkg-conf-1.1.3" = {
name = "pkg-conf";
packageName = "pkg-conf";
@@ -18065,15 +18365,6 @@ let
sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b";
};
};
- "require-main-filename-1.0.1" = {
- name = "require-main-filename";
- packageName = "require-main-filename";
- version = "1.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
- sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
- };
- };
"set-blocking-1.0.0" = {
name = "set-blocking";
packageName = "set-blocking";
@@ -18083,24 +18374,6 @@ let
sha1 = "cd5e5d938048df1ac92dfe92e1f16add656f5ec5";
};
};
- "window-size-0.2.0" = {
- name = "window-size";
- packageName = "window-size";
- version = "0.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz";
- sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075";
- };
- };
- "yargs-parser-2.4.1" = {
- name = "yargs-parser";
- packageName = "yargs-parser";
- version = "2.4.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz";
- sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4";
- };
- };
"symbol-0.2.3" = {
name = "symbol";
packageName = "symbol";
@@ -18437,7 +18710,7 @@ in
sources."os-tmpdir-1.0.2"
];
})
- (sources."which-1.2.11" // {
+ (sources."which-1.2.12" // {
dependencies = [
sources."isexe-1.1.2"
];
@@ -18491,52 +18764,10 @@ in
(sources."adal-node-0.1.21" // {
dependencies = [
sources."date-utils-1.2.21"
- (sources."jws-3.1.3" // {
+ (sources."jws-3.1.4" // {
dependencies = [
- (sources."base64url-1.0.6" // {
- dependencies = [
- (sources."concat-stream-1.4.10" // {
- dependencies = [
- sources."inherits-2.0.3"
- sources."typedarray-0.0.6"
- (sources."readable-stream-1.1.14" // {
- dependencies = [
- sources."core-util-is-1.0.2"
- sources."isarray-0.0.1"
- sources."string_decoder-0.10.31"
- ];
- })
- ];
- })
- (sources."meow-2.0.0" // {
- dependencies = [
- (sources."camelcase-keys-1.0.0" // {
- dependencies = [
- sources."camelcase-1.2.1"
- sources."map-obj-1.0.1"
- ];
- })
- (sources."indent-string-1.2.2" // {
- dependencies = [
- sources."get-stdin-4.0.1"
- (sources."repeating-1.1.3" // {
- dependencies = [
- (sources."is-finite-1.0.2" // {
- dependencies = [
- sources."number-is-nan-1.0.1"
- ];
- })
- ];
- })
- ];
- })
- sources."minimist-1.2.0"
- sources."object-assign-1.0.0"
- ];
- })
- ];
- })
- (sources."jwa-1.1.3" // {
+ sources."base64url-2.0.0"
+ (sources."jwa-1.1.4" // {
dependencies = [
sources."buffer-equal-constant-time-1.0.1"
(sources."ecdsa-sig-formatter-1.0.7" // {
@@ -18546,6 +18777,7 @@ in
})
];
})
+ sources."safe-buffer-5.0.1"
];
})
sources."node-uuid-1.4.7"
@@ -18696,7 +18928,7 @@ in
sources."streamline-0.4.11"
];
})
- sources."moment-2.15.2"
+ sources."moment-2.16.0"
(sources."ms-rest-1.15.2" // {
dependencies = [
sources."duplexer-0.1.1"
@@ -18817,7 +19049,7 @@ in
dependencies = [
(sources."async-2.1.2" // {
dependencies = [
- sources."lodash-4.16.6"
+ sources."lodash-4.17.2"
];
})
];
@@ -18901,9 +19133,9 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
sources."node-uuid-1.4.7"
@@ -19011,10 +19243,10 @@ in
bower = nodeEnv.buildNodePackage {
name = "bower";
packageName = "bower";
- version = "1.7.9";
+ version = "1.8.0";
src = fetchurl {
- url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz";
- sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0";
+ url = "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz";
+ sha1 = "55dbebef0ad9155382d9e9d3e497c1372345b44a";
};
buildInputs = globalBuildInputs;
meta = {
@@ -19038,7 +19270,7 @@ in
sources."sprintf-js-1.0.3"
];
})
- sources."bower-1.7.9"
+ sources."bower-1.8.0"
sources."bower-endpoint-parser-0.2.1"
(sources."bower-json-0.6.0" // {
dependencies = [
@@ -19062,7 +19294,7 @@ in
];
})
sources."inherits-2.0.3"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -19087,12 +19319,12 @@ in
sources."prepend-http-1.0.4"
(sources."read-all-stream-2.2.0" // {
dependencies = [
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
- sources."inherits-2.0.3"
sources."isarray-1.0.0"
+ sources."inherits-2.0.3"
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
@@ -19100,7 +19332,7 @@ in
})
];
})
- sources."statuses-1.3.0"
+ sources."statuses-1.3.1"
sources."timed-out-2.0.0"
];
})
@@ -19288,9 +19520,9 @@ in
(sources."promised-temp-0.1.0" // {
dependencies = [
sources."q-1.4.1"
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
(sources."mkdirp-0.5.1" // {
@@ -19439,7 +19671,7 @@ in
})
(sources."parse-asn1-5.0.0" // {
dependencies = [
- (sources."asn1.js-4.8.1" // {
+ (sources."asn1.js-4.9.0" // {
dependencies = [
sources."minimalistic-assert-1.0.0"
];
@@ -19470,7 +19702,7 @@ in
dependencies = [
sources."cipher-base-1.0.3"
sources."ripemd160-1.0.1"
- sources."sha.js-2.4.5"
+ sources."sha.js-2.4.8"
];
})
sources."create-hmac-1.1.4"
@@ -19491,7 +19723,7 @@ in
sources."browserify-rsa-4.0.1"
(sources."parse-asn1-5.0.0" // {
dependencies = [
- (sources."asn1.js-4.8.1" // {
+ (sources."asn1.js-4.9.0" // {
dependencies = [
sources."minimalistic-assert-1.0.0"
];
@@ -19597,7 +19829,7 @@ in
sources."punycode-1.4.1"
sources."querystring-es3-0.2.1"
sources."read-only-stream-2.0.0"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -19614,7 +19846,7 @@ in
sources."jsonify-0.0.0"
];
})
- sources."sha.js-2.4.5"
+ sources."sha.js-2.4.8"
];
})
(sources."shell-quote-1.6.1" // {
@@ -19626,7 +19858,7 @@ in
];
})
sources."stream-browserify-2.0.1"
- (sources."stream-http-2.4.1" // {
+ (sources."stream-http-2.5.0" // {
dependencies = [
sources."builtin-status-codes-2.0.0"
sources."to-arraybuffer-1.0.1"
@@ -19762,9 +19994,9 @@ in
];
})
sources."debounced-seeker-1.0.0"
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
sources."fs-extended-0.2.1"
@@ -19904,9 +20136,9 @@ in
dependencies = [
(sources."airplay-js-0.2.16" // {
dependencies = [
- (sources."mdns-js-0.5.0" // {
+ (sources."mdns-js-0.5.1" // {
dependencies = [
- (sources."mdns-js-packet-0.2.0" // {
+ (sources."dns-js-0.2.1" // {
dependencies = [
sources."qap-3.1.3"
];
@@ -19958,7 +20190,7 @@ in
dependencies = [
sources."blob-to-buffer-1.2.6"
sources."get-stdin-5.0.1"
- (sources."magnet-uri-5.1.4" // {
+ (sources."magnet-uri-5.1.5" // {
dependencies = [
sources."thirty-two-1.0.2"
sources."uniq-1.0.1"
@@ -20184,7 +20416,7 @@ in
dependencies = [
sources."get-browser-rtc-1.0.2"
sources."randombytes-2.0.3"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -20198,7 +20430,7 @@ in
})
(sources."simple-websocket-4.1.0" // {
dependencies = [
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -20359,7 +20591,7 @@ in
sources."sax-1.2.1"
(sources."xmlbuilder-4.2.1" // {
dependencies = [
- sources."lodash-4.16.6"
+ sources."lodash-4.17.2"
];
})
];
@@ -20404,7 +20636,7 @@ in
sources."ansi-0.3.1"
(sources."bplist-parser-0.1.1" // {
dependencies = [
- sources."big-integer-1.6.16"
+ sources."big-integer-1.6.17"
];
})
sources."cordova-registry-mapper-1.1.15"
@@ -20623,7 +20855,7 @@ in
})
(sources."parse-asn1-5.0.0" // {
dependencies = [
- (sources."asn1.js-4.8.1" // {
+ (sources."asn1.js-4.9.0" // {
dependencies = [
sources."minimalistic-assert-1.0.0"
];
@@ -20654,7 +20886,7 @@ in
dependencies = [
sources."cipher-base-1.0.3"
sources."ripemd160-1.0.1"
- sources."sha.js-2.4.5"
+ sources."sha.js-2.4.8"
];
})
sources."create-hmac-1.1.4"
@@ -20675,7 +20907,7 @@ in
sources."browserify-rsa-4.0.1"
(sources."parse-asn1-5.0.0" // {
dependencies = [
- (sources."asn1.js-4.8.1" // {
+ (sources."asn1.js-4.9.0" // {
dependencies = [
sources."minimalistic-assert-1.0.0"
];
@@ -20757,7 +20989,7 @@ in
sources."punycode-1.4.1"
sources."querystring-es3-0.2.1"
sources."read-only-stream-2.0.0"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -20774,7 +21006,7 @@ in
sources."jsonify-0.0.0"
];
})
- sources."sha.js-2.4.5"
+ sources."sha.js-2.4.8"
];
})
(sources."shell-quote-1.6.1" // {
@@ -20786,7 +21018,7 @@ in
];
})
sources."stream-browserify-2.0.1"
- (sources."stream-http-2.4.1" // {
+ (sources."stream-http-2.5.0" // {
dependencies = [
sources."builtin-status-codes-2.0.0"
sources."to-arraybuffer-1.0.1"
@@ -20862,9 +21094,9 @@ in
dependencies = [
(sources."accepts-1.3.3" // {
dependencies = [
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
sources."negotiator-0.6.1"
@@ -20873,7 +21105,7 @@ in
sources."bytes-2.3.0"
(sources."compressible-2.0.9" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
(sources."debug-2.2.0" // {
@@ -20889,9 +21121,9 @@ in
dependencies = [
(sources."accepts-1.3.3" // {
dependencies = [
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
sources."negotiator-0.6.1"
@@ -20913,7 +21145,7 @@ in
sources."etag-1.7.0"
(sources."finalhandler-0.5.0" // {
dependencies = [
- sources."statuses-1.3.0"
+ sources."statuses-1.3.1"
sources."unpipe-1.0.0"
];
})
@@ -20938,24 +21170,24 @@ in
(sources."send-0.14.1" // {
dependencies = [
sources."destroy-1.0.4"
- (sources."http-errors-1.5.0" // {
+ (sources."http-errors-1.5.1" // {
dependencies = [
- sources."inherits-2.0.1"
- sources."setprototypeof-1.0.1"
+ sources."inherits-2.0.3"
+ sources."setprototypeof-1.0.2"
];
})
sources."mime-1.3.4"
sources."ms-0.7.1"
- sources."statuses-1.3.0"
+ sources."statuses-1.3.1"
];
})
sources."serve-static-1.11.1"
- (sources."type-is-1.6.13" // {
+ (sources."type-is-1.6.14" // {
dependencies = [
sources."media-typer-0.3.0"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
];
@@ -21175,9 +21407,9 @@ in
dependencies = [
(sources."array-index-1.0.0" // {
dependencies = [
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
(sources."es6-symbol-3.1.0" // {
@@ -21319,7 +21551,7 @@ in
dependencies = [
(sources."async-2.1.2" // {
dependencies = [
- sources."lodash-4.16.6"
+ sources."lodash-4.17.2"
];
})
];
@@ -21394,9 +21626,9 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
sources."node-uuid-1.4.7"
@@ -21434,7 +21666,7 @@ in
sources."builtins-0.0.7"
];
})
- (sources."which-1.2.11" // {
+ (sources."which-1.2.12" // {
dependencies = [
sources."isexe-1.1.2"
];
@@ -21699,7 +21931,7 @@ in
})
];
})
- (sources."request-2.78.0" // {
+ (sources."request-2.79.0" // {
dependencies = [
sources."aws-sign2-0.6.0"
sources."aws4-1.5.0"
@@ -21711,7 +21943,7 @@ in
})
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- (sources."form-data-2.1.1" // {
+ (sources."form-data-2.1.2" // {
dependencies = [
sources."asynckit-0.4.0"
];
@@ -21778,15 +22010,16 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
];
})
(sources."tough-cookie-2.3.2" // {
@@ -21870,7 +22103,7 @@ in
];
})
sources."inherits-2.0.3"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -21901,12 +22134,12 @@ in
sources."pinkie-2.0.4"
];
})
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
- sources."inherits-2.0.3"
sources."isarray-1.0.0"
+ sources."inherits-2.0.3"
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
@@ -22012,9 +22245,9 @@ in
dependencies = [
(sources."accepts-1.2.13" // {
dependencies = [
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
sources."negotiator-0.5.3"
@@ -22119,7 +22352,7 @@ in
dependencies = [
(sources."buffercursor-0.0.12" // {
dependencies = [
- (sources."verror-1.8.1" // {
+ (sources."verror-1.9.0" // {
dependencies = [
sources."assert-plus-1.0.0"
sources."core-util-is-1.0.2"
@@ -22136,7 +22369,7 @@ in
dependencies = [
(sources."buffercursor-0.0.12" // {
dependencies = [
- (sources."verror-1.8.1" // {
+ (sources."verror-1.9.0" // {
dependencies = [
sources."assert-plus-1.0.0"
sources."core-util-is-1.0.2"
@@ -22153,7 +22386,7 @@ in
dependencies = [
(sources."buffercursor-0.0.12" // {
dependencies = [
- (sources."verror-1.8.1" // {
+ (sources."verror-1.9.0" // {
dependencies = [
sources."assert-plus-1.0.0"
sources."core-util-is-1.0.2"
@@ -22198,9 +22431,9 @@ in
sources."component-emitter-1.1.2"
sources."methods-1.0.1"
sources."cookiejar-2.0.1"
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
sources."reduce-component-1.0.1"
@@ -22249,7 +22482,7 @@ in
sources."through-2.3.8"
];
})
- sources."basic-auth-1.0.4"
+ sources."basic-auth-1.1.0"
sources."cookie-signature-1.0.6"
(sources."cors-2.8.1" // {
dependencies = [
@@ -22292,7 +22525,7 @@ in
];
})
sources."inherits-2.0.3"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -22351,7 +22584,7 @@ in
sources."xtend-3.0.0"
];
})
- sources."ltgt-2.1.2"
+ sources."ltgt-2.1.3"
(sources."pull-level-2.0.3" // {
dependencies = [
sources."level-post-1.0.5"
@@ -22447,7 +22680,7 @@ in
})
];
})
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -22509,12 +22742,12 @@ in
})
];
})
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
- sources."inherits-2.0.3"
sources."isarray-1.0.0"
+ sources."inherits-2.0.3"
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
@@ -22562,7 +22795,7 @@ in
})
(sources."async-2.0.1" // {
dependencies = [
- sources."lodash-4.16.6"
+ sources."lodash-4.17.2"
];
})
sources."aws4-1.5.0"
@@ -22572,7 +22805,7 @@ in
sources."minimist-0.0.10"
];
})
- (sources."request-2.78.0" // {
+ (sources."request-2.79.0" // {
dependencies = [
sources."aws-sign2-0.6.0"
sources."caseless-0.11.0"
@@ -22583,7 +22816,7 @@ in
})
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- (sources."form-data-2.1.1" // {
+ (sources."form-data-2.1.2" // {
dependencies = [
sources."asynckit-0.4.0"
];
@@ -22667,12 +22900,11 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
- sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
@@ -22682,6 +22914,7 @@ in
];
})
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
];
})
];
@@ -22714,7 +22947,7 @@ in
sources."supports-color-2.0.0"
];
})
- (sources."got-6.6.1" // {
+ (sources."got-6.6.3" // {
dependencies = [
(sources."create-error-class-3.0.2" // {
dependencies = [
@@ -22901,10 +23134,10 @@ in
eslint = nodeEnv.buildNodePackage {
name = "eslint";
packageName = "eslint";
- version = "3.9.1";
+ version = "3.10.2";
src = fetchurl {
- url = "https://registry.npmjs.org/eslint/-/eslint-3.9.1.tgz";
- sha1 = "5a8597706fc6048bc6061ac754d4a211d28f4f5b";
+ url = "https://registry.npmjs.org/eslint/-/eslint-3.10.2.tgz";
+ sha1 = "c9a10e8bf6e9d65651204778c503341f1eac3ce7";
};
dependencies = [
(sources."babel-code-frame-6.16.0" // {
@@ -22944,9 +23177,9 @@ in
})
];
})
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
(sources."doctrine-1.5.0" // {
@@ -23060,7 +23293,7 @@ in
sources."path-is-absolute-1.0.1"
];
})
- sources."globals-9.12.0"
+ sources."globals-9.14.0"
sources."ignore-3.2.0"
sources."imurmurhash-0.1.4"
(sources."inquirer-0.12.0" // {
@@ -23136,7 +23369,7 @@ in
sources."tryit-1.0.3"
];
})
- (sources."js-yaml-3.6.1" // {
+ (sources."js-yaml-3.7.0" // {
dependencies = [
(sources."argparse-1.0.9" // {
dependencies = [
@@ -23157,7 +23390,7 @@ in
sources."type-check-0.3.2"
];
})
- sources."lodash-4.16.6"
+ sources."lodash-4.17.2"
(sources."mkdirp-0.5.1" // {
dependencies = [
sources."minimist-0.0.8"
@@ -23176,7 +23409,7 @@ in
sources."path-is-inside-1.0.2"
sources."pluralize-1.2.1"
sources."progress-1.1.8"
- (sources."require-uncached-1.0.2" // {
+ (sources."require-uncached-1.0.3" // {
dependencies = [
(sources."caller-path-0.1.0" // {
dependencies = [
@@ -23200,7 +23433,7 @@ in
sources."strip-json-comments-1.0.4"
(sources."table-3.8.3" // {
dependencies = [
- (sources."ajv-4.8.2" // {
+ (sources."ajv-4.9.0" // {
dependencies = [
sources."co-4.6.0"
];
@@ -23260,7 +23493,7 @@ in
dependencies = [
sources."bower-endpoint-parser-0.2.1"
sources."bower-logger-0.2.1"
- sources."bower-1.7.9"
+ sources."bower-1.8.0"
(sources."glob-3.2.11" // {
dependencies = [
sources."inherits-2.0.3"
@@ -23450,7 +23683,7 @@ in
(sources."readdirp-2.1.0" // {
dependencies = [
sources."graceful-fs-4.1.10"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -23478,12 +23711,12 @@ in
sources."abbrev-1.0.9"
];
})
- (sources."npmlog-4.0.0" // {
+ (sources."npmlog-4.0.1" // {
dependencies = [
(sources."are-we-there-yet-1.1.2" // {
dependencies = [
sources."delegates-1.0.0"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -23496,7 +23729,7 @@ in
];
})
sources."console-control-strings-1.1.0"
- (sources."gauge-2.6.0" // {
+ (sources."gauge-2.7.1" // {
dependencies = [
sources."aproba-1.0.4"
sources."has-color-0.1.7"
@@ -23532,7 +23765,7 @@ in
sources."strip-json-comments-1.0.4"
];
})
- (sources."request-2.78.0" // {
+ (sources."request-2.79.0" // {
dependencies = [
sources."aws-sign2-0.6.0"
sources."aws4-1.5.0"
@@ -23544,7 +23777,7 @@ in
})
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- (sources."form-data-2.1.1" // {
+ (sources."form-data-2.1.2" // {
dependencies = [
sources."asynckit-0.4.0"
];
@@ -23628,12 +23861,11 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
- sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
@@ -23643,6 +23875,7 @@ in
];
})
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
];
})
(sources."rimraf-2.5.4" // {
@@ -23944,7 +24177,7 @@ in
(sources."jade-1.11.0" // {
dependencies = [
sources."character-parser-1.2.1"
- (sources."clean-css-3.4.20" // {
+ (sources."clean-css-3.4.21" // {
dependencies = [
(sources."commander-2.8.1" // {
dependencies = [
@@ -24083,7 +24316,7 @@ in
sources."sax-1.2.1"
(sources."xmlbuilder-4.2.1" // {
dependencies = [
- sources."lodash-4.16.6"
+ sources."lodash-4.17.2"
];
})
];
@@ -24133,7 +24366,7 @@ in
dependencies = [
sources."array-differ-1.0.0"
sources."array-uniq-1.0.3"
- sources."beeper-1.1.0"
+ sources."beeper-1.1.1"
(sources."dateformat-1.0.12" // {
dependencies = [
sources."get-stdin-4.0.1"
@@ -24445,7 +24678,7 @@ in
sources."os-tmpdir-1.0.2"
];
})
- (sources."which-1.2.11" // {
+ (sources."which-1.2.12" // {
dependencies = [
sources."isexe-1.1.2"
];
@@ -24504,7 +24737,7 @@ in
];
})
sources."minimist-1.2.0"
- (sources."orchestrator-0.3.7" // {
+ (sources."orchestrator-0.3.8" // {
dependencies = [
(sources."end-of-stream-0.1.5" // {
dependencies = [
@@ -24519,7 +24752,7 @@ in
sources."stream-consume-0.1.0"
];
})
- sources."pretty-hrtime-1.0.2"
+ sources."pretty-hrtime-1.0.3"
sources."semver-4.3.6"
(sources."tildify-1.2.0" // {
dependencies = [
@@ -24852,7 +25085,7 @@ in
sources."path-is-absolute-1.0.1"
];
})
- (sources."handlebars-4.0.5" // {
+ (sources."handlebars-4.0.6" // {
dependencies = [
(sources."optimist-0.6.1" // {
dependencies = [
@@ -24917,7 +25150,7 @@ in
})
];
})
- (sources."js-yaml-3.6.1" // {
+ (sources."js-yaml-3.7.0" // {
dependencies = [
(sources."argparse-1.0.9" // {
dependencies = [
@@ -24943,7 +25176,7 @@ in
sources."has-flag-1.0.0"
];
})
- (sources."which-1.2.11" // {
+ (sources."which-1.2.12" // {
dependencies = [
sources."isexe-1.1.2"
];
@@ -25093,10 +25326,10 @@ in
js-yaml = nodeEnv.buildNodePackage {
name = "js-yaml";
packageName = "js-yaml";
- version = "3.6.1";
+ version = "3.7.0";
src = fetchurl {
- url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz";
- sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30";
+ url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
+ sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
};
dependencies = [
(sources."argparse-1.0.9" // {
@@ -25134,11 +25367,11 @@ in
];
})
sources."depd-1.1.0"
- (sources."http-errors-1.5.0" // {
+ (sources."http-errors-1.5.1" // {
dependencies = [
- sources."inherits-2.0.1"
- sources."setprototypeof-1.0.1"
- sources."statuses-1.3.0"
+ sources."inherits-2.0.3"
+ sources."setprototypeof-1.0.2"
+ sources."statuses-1.3.1"
];
})
sources."iconv-lite-0.4.13"
@@ -25153,12 +25386,12 @@ in
sources."unpipe-1.0.0"
];
})
- (sources."type-is-1.6.13" // {
+ (sources."type-is-1.6.14" // {
dependencies = [
sources."media-typer-0.3.0"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
];
@@ -25256,7 +25489,7 @@ in
sources."path-is-absolute-1.0.1"
(sources."readdirp-2.1.0" // {
dependencies = [
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -25284,12 +25517,12 @@ in
sources."abbrev-1.0.9"
];
})
- (sources."npmlog-4.0.0" // {
+ (sources."npmlog-4.0.1" // {
dependencies = [
(sources."are-we-there-yet-1.1.2" // {
dependencies = [
sources."delegates-1.0.0"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -25302,7 +25535,7 @@ in
];
})
sources."console-control-strings-1.1.0"
- (sources."gauge-2.6.0" // {
+ (sources."gauge-2.7.1" // {
dependencies = [
sources."aproba-1.0.4"
sources."has-color-0.1.7"
@@ -25338,7 +25571,7 @@ in
sources."strip-json-comments-1.0.4"
];
})
- (sources."request-2.78.0" // {
+ (sources."request-2.79.0" // {
dependencies = [
sources."aws-sign2-0.6.0"
sources."aws4-1.5.0"
@@ -25350,7 +25583,7 @@ in
})
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- (sources."form-data-2.1.1" // {
+ (sources."form-data-2.1.2" // {
dependencies = [
sources."asynckit-0.4.0"
];
@@ -25434,12 +25667,11 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
- sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
@@ -25449,6 +25681,7 @@ in
];
})
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
];
})
sources."semver-5.3.0"
@@ -25494,7 +25727,7 @@ in
sources."colors-1.1.2"
(sources."combine-lists-1.0.1" // {
dependencies = [
- sources."lodash-4.16.6"
+ sources."lodash-4.17.2"
];
})
(sources."connect-3.5.0" // {
@@ -25512,7 +25745,7 @@ in
sources."ee-first-1.1.1"
];
})
- sources."statuses-1.3.0"
+ sources."statuses-1.3.1"
sources."unpipe-1.0.0"
];
})
@@ -25800,9 +26033,9 @@ in
dependencies = [
(sources."accepts-1.2.13" // {
dependencies = [
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
sources."negotiator-0.5.3"
@@ -25810,7 +26043,7 @@ in
})
(sources."compressible-2.0.9" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
];
@@ -25822,12 +26055,12 @@ in
})
(sources."csurf-1.8.3" // {
dependencies = [
- (sources."csrf-3.0.3" // {
+ (sources."csrf-3.0.4" // {
dependencies = [
- sources."base64-url-1.2.2"
+ sources."base64-url-1.3.3"
sources."rndm-1.2.0"
sources."tsscmp-1.0.5"
- (sources."uid-safe-2.1.1" // {
+ (sources."uid-safe-2.1.3" // {
dependencies = [
sources."random-bytes-1.0.0"
];
@@ -25840,9 +26073,9 @@ in
dependencies = [
(sources."accepts-1.3.3" // {
dependencies = [
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
sources."negotiator-0.6.1"
@@ -25874,11 +26107,16 @@ in
(sources."http-errors-1.3.1" // {
dependencies = [
sources."inherits-2.0.3"
- sources."statuses-1.3.0"
+ sources."statuses-1.3.1"
];
})
- (sources."method-override-2.3.6" // {
+ (sources."method-override-2.3.7" // {
dependencies = [
+ (sources."debug-2.3.3" // {
+ dependencies = [
+ sources."ms-0.7.2"
+ ];
+ })
sources."vary-1.1.0"
];
})
@@ -25907,10 +26145,14 @@ in
sources."on-headers-1.0.1"
sources."pause-0.1.0"
sources."qs-4.0.0"
- sources."response-time-2.3.1"
- (sources."serve-favicon-2.3.0" // {
+ (sources."response-time-2.3.2" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."depd-1.1.0"
+ ];
+ })
+ (sources."serve-favicon-2.3.2" // {
+ dependencies = [
+ sources."ms-0.7.2"
];
})
(sources."serve-index-1.7.3" // {
@@ -25922,9 +26164,9 @@ in
})
sources."batch-0.5.3"
sources."escape-html-1.0.3"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
];
@@ -25948,12 +26190,12 @@ in
})
];
})
- (sources."type-is-1.6.13" // {
+ (sources."type-is-1.6.14" // {
dependencies = [
sources."media-typer-0.3.0"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
];
@@ -26050,7 +26292,7 @@ in
sources."sax-1.2.1"
(sources."xmlbuilder-4.2.1" // {
dependencies = [
- sources."lodash-4.16.6"
+ sources."lodash-4.17.2"
];
})
];
@@ -26277,12 +26519,12 @@ in
];
})
sources."object-assign-4.1.0"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
- sources."inherits-2.0.3"
sources."isarray-1.0.0"
+ sources."inherits-2.0.3"
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
@@ -26448,7 +26690,7 @@ in
sources."wrappy-1.0.2"
];
})
- (sources."request-2.78.0" // {
+ (sources."request-2.79.0" // {
dependencies = [
sources."aws-sign2-0.6.0"
sources."aws4-1.5.0"
@@ -26460,7 +26702,7 @@ in
})
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- (sources."form-data-2.1.1" // {
+ (sources."form-data-2.1.2" // {
dependencies = [
sources."asynckit-0.4.0"
];
@@ -26544,12 +26786,11 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
- sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
@@ -26559,6 +26800,7 @@ in
];
})
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
];
})
sources."retry-0.8.0"
@@ -26594,12 +26836,12 @@ in
(sources."are-we-there-yet-1.1.2" // {
dependencies = [
sources."delegates-1.0.0"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
- sources."inherits-2.0.3"
sources."isarray-1.0.0"
+ sources."inherits-2.0.3"
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
@@ -26813,12 +27055,12 @@ in
(sources."are-we-there-yet-1.1.2" // {
dependencies = [
sources."delegates-1.0.0"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
- sources."inherits-2.0.3"
sources."isarray-1.0.0"
+ sources."inherits-2.0.3"
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
@@ -26865,9 +27107,9 @@ in
dependencies = [
(sources."array-index-1.0.0" // {
dependencies = [
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
(sources."es6-symbol-3.1.0" // {
@@ -26884,7 +27126,7 @@ in
})
];
})
- (sources."request-2.78.0" // {
+ (sources."request-2.79.0" // {
dependencies = [
sources."aws-sign2-0.6.0"
sources."aws4-1.5.0"
@@ -26896,7 +27138,7 @@ in
})
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- (sources."form-data-2.1.1" // {
+ (sources."form-data-2.1.2" // {
dependencies = [
sources."asynckit-0.4.0"
];
@@ -26980,12 +27222,11 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
- sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
@@ -26995,6 +27236,7 @@ in
];
})
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
];
})
sources."rimraf-2.5.4"
@@ -27005,7 +27247,7 @@ in
sources."inherits-2.0.3"
];
})
- (sources."which-1.2.11" // {
+ (sources."which-1.2.12" // {
dependencies = [
sources."isexe-1.1.2"
];
@@ -27076,7 +27318,7 @@ in
dependencies = [
(sources."bplist-parser-0.1.1" // {
dependencies = [
- sources."big-integer-1.6.16"
+ sources."big-integer-1.6.17"
];
})
(sources."meow-3.7.0" // {
@@ -27209,18 +27451,18 @@ in
})
];
})
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
(sources."express-4.14.0" // {
dependencies = [
(sources."accepts-1.3.3" // {
dependencies = [
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
sources."negotiator-0.6.1"
@@ -27231,13 +27473,18 @@ in
sources."content-type-1.0.2"
sources."cookie-0.3.1"
sources."cookie-signature-1.0.6"
+ (sources."debug-2.2.0" // {
+ dependencies = [
+ sources."ms-0.7.1"
+ ];
+ })
sources."depd-1.1.0"
sources."encodeurl-1.0.1"
sources."escape-html-1.0.3"
sources."etag-1.7.0"
(sources."finalhandler-0.5.0" // {
dependencies = [
- sources."statuses-1.3.0"
+ sources."statuses-1.3.1"
sources."unpipe-1.0.0"
];
})
@@ -27262,24 +27509,24 @@ in
(sources."send-0.14.1" // {
dependencies = [
sources."destroy-1.0.4"
- (sources."http-errors-1.5.0" // {
+ (sources."http-errors-1.5.1" // {
dependencies = [
- sources."inherits-2.0.1"
- sources."setprototypeof-1.0.1"
+ sources."inherits-2.0.3"
+ sources."setprototypeof-1.0.2"
];
})
sources."mime-1.3.4"
sources."ms-0.7.1"
- sources."statuses-1.3.0"
+ sources."statuses-1.3.1"
];
})
sources."serve-static-1.11.1"
- (sources."type-is-1.6.13" // {
+ (sources."type-is-1.6.14" // {
dependencies = [
sources."media-typer-0.3.0"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
];
@@ -27323,11 +27570,11 @@ in
];
})
sources."semver-4.3.6"
- (sources."serve-favicon-2.3.0" // {
+ (sources."serve-favicon-2.3.2" // {
dependencies = [
sources."etag-1.7.0"
sources."fresh-0.3.0"
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
sources."parseurl-1.3.1"
];
})
@@ -27351,17 +27598,17 @@ in
sources."abbrev-1.0.9"
];
})
- (sources."npmlog-4.0.0" // {
+ (sources."npmlog-4.0.1" // {
dependencies = [
(sources."are-we-there-yet-1.1.2" // {
dependencies = [
sources."delegates-1.0.0"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
- sources."inherits-2.0.3"
sources."isarray-1.0.0"
+ sources."inherits-2.0.3"
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
@@ -27370,7 +27617,7 @@ in
];
})
sources."console-control-strings-1.1.0"
- (sources."gauge-2.6.0" // {
+ (sources."gauge-2.7.1" // {
dependencies = [
sources."aproba-1.0.4"
sources."has-color-0.1.7"
@@ -27398,7 +27645,7 @@ in
sources."set-blocking-2.0.0"
];
})
- (sources."request-2.78.0" // {
+ (sources."request-2.79.0" // {
dependencies = [
sources."aws-sign2-0.6.0"
sources."aws4-1.5.0"
@@ -27410,7 +27657,7 @@ in
})
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- (sources."form-data-2.1.1" // {
+ (sources."form-data-2.1.2" // {
dependencies = [
sources."asynckit-0.4.0"
];
@@ -27494,12 +27741,11 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
- sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
@@ -27509,6 +27755,7 @@ in
];
})
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
];
})
(sources."rimraf-2.5.4" // {
@@ -27555,6 +27802,11 @@ in
})
(sources."tar-pack-3.3.0" // {
dependencies = [
+ (sources."debug-2.2.0" // {
+ dependencies = [
+ sources."ms-0.7.1"
+ ];
+ })
(sources."fstream-1.0.10" // {
dependencies = [
sources."graceful-fs-4.1.10"
@@ -27614,17 +27866,17 @@ in
sources."abbrev-1.0.9"
];
})
- (sources."npmlog-4.0.0" // {
+ (sources."npmlog-4.0.1" // {
dependencies = [
(sources."are-we-there-yet-1.1.2" // {
dependencies = [
sources."delegates-1.0.0"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
- sources."inherits-2.0.3"
sources."isarray-1.0.0"
+ sources."inherits-2.0.3"
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
@@ -27633,7 +27885,7 @@ in
];
})
sources."console-control-strings-1.1.0"
- (sources."gauge-2.6.0" // {
+ (sources."gauge-2.7.1" // {
dependencies = [
sources."aproba-1.0.4"
sources."has-color-0.1.7"
@@ -27661,7 +27913,7 @@ in
sources."set-blocking-2.0.0"
];
})
- (sources."request-2.78.0" // {
+ (sources."request-2.79.0" // {
dependencies = [
sources."aws-sign2-0.6.0"
sources."aws4-1.5.0"
@@ -27673,7 +27925,7 @@ in
})
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- (sources."form-data-2.1.1" // {
+ (sources."form-data-2.1.2" // {
dependencies = [
sources."asynckit-0.4.0"
];
@@ -27757,12 +28009,11 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
- sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
@@ -27772,6 +28023,7 @@ in
];
})
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
];
})
(sources."rimraf-2.5.4" // {
@@ -27818,6 +28070,11 @@ in
})
(sources."tar-pack-3.3.0" // {
dependencies = [
+ (sources."debug-2.2.0" // {
+ dependencies = [
+ sources."ms-0.7.1"
+ ];
+ })
(sources."fstream-1.0.10" // {
dependencies = [
sources."graceful-fs-4.1.10"
@@ -27862,7 +28119,7 @@ in
})
];
})
- (sources."which-1.2.11" // {
+ (sources."which-1.2.12" // {
dependencies = [
sources."isexe-1.1.2"
];
@@ -27942,17 +28199,17 @@ in
sources."abbrev-1.0.9"
];
})
- (sources."npmlog-4.0.0" // {
+ (sources."npmlog-4.0.1" // {
dependencies = [
(sources."are-we-there-yet-1.1.2" // {
dependencies = [
sources."delegates-1.0.0"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
- sources."inherits-2.0.3"
sources."isarray-1.0.0"
+ sources."inherits-2.0.3"
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
@@ -27961,7 +28218,7 @@ in
];
})
sources."console-control-strings-1.1.0"
- (sources."gauge-2.6.0" // {
+ (sources."gauge-2.7.1" // {
dependencies = [
sources."aproba-1.0.4"
sources."has-color-0.1.7"
@@ -27997,7 +28254,7 @@ in
sources."strip-json-comments-1.0.4"
];
})
- (sources."request-2.78.0" // {
+ (sources."request-2.79.0" // {
dependencies = [
sources."aws-sign2-0.6.0"
sources."aws4-1.5.0"
@@ -28009,7 +28266,7 @@ in
})
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- (sources."form-data-2.1.1" // {
+ (sources."form-data-2.1.2" // {
dependencies = [
sources."asynckit-0.4.0"
];
@@ -28093,12 +28350,11 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
- sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
@@ -28108,6 +28364,7 @@ in
];
})
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
];
})
(sources."rimraf-2.5.4" // {
@@ -28310,7 +28567,7 @@ in
(sources."readdirp-2.1.0" // {
dependencies = [
sources."graceful-fs-4.1.10"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -28338,12 +28595,12 @@ in
sources."abbrev-1.0.9"
];
})
- (sources."npmlog-4.0.0" // {
+ (sources."npmlog-4.0.1" // {
dependencies = [
(sources."are-we-there-yet-1.1.2" // {
dependencies = [
sources."delegates-1.0.0"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -28356,7 +28613,7 @@ in
];
})
sources."console-control-strings-1.1.0"
- (sources."gauge-2.6.0" // {
+ (sources."gauge-2.7.1" // {
dependencies = [
sources."aproba-1.0.4"
sources."has-color-0.1.7"
@@ -28392,7 +28649,7 @@ in
sources."strip-json-comments-1.0.4"
];
})
- (sources."request-2.78.0" // {
+ (sources."request-2.79.0" // {
dependencies = [
sources."aws-sign2-0.6.0"
sources."aws4-1.5.0"
@@ -28404,7 +28661,7 @@ in
})
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- (sources."form-data-2.1.1" // {
+ (sources."form-data-2.1.2" // {
dependencies = [
sources."asynckit-0.4.0"
];
@@ -28488,12 +28745,11 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
- sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
@@ -28503,6 +28759,7 @@ in
];
})
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
];
})
(sources."rimraf-2.5.4" // {
@@ -28537,6 +28794,11 @@ in
})
(sources."tar-pack-3.3.0" // {
dependencies = [
+ (sources."debug-2.2.0" // {
+ dependencies = [
+ sources."ms-0.7.1"
+ ];
+ })
(sources."fstream-1.0.10" // {
dependencies = [
sources."graceful-fs-4.1.10"
@@ -28567,9 +28829,9 @@ in
})
];
})
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
sources."es6-promise-3.3.1"
@@ -28703,7 +28965,7 @@ in
];
})
sources."inherits-2.0.3"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -28734,12 +28996,12 @@ in
sources."pinkie-2.0.4"
];
})
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
- sources."inherits-2.0.3"
sources."isarray-1.0.0"
+ sources."inherits-2.0.3"
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
@@ -28821,11 +29083,11 @@ in
];
})
sources."depd-1.1.0"
- (sources."http-errors-1.5.0" // {
+ (sources."http-errors-1.5.1" // {
dependencies = [
- sources."inherits-2.0.1"
- sources."setprototypeof-1.0.1"
- sources."statuses-1.3.0"
+ sources."inherits-2.0.3"
+ sources."setprototypeof-1.0.2"
+ sources."statuses-1.3.1"
];
})
sources."iconv-lite-0.4.13"
@@ -28835,11 +29097,11 @@ in
];
})
sources."qs-6.2.0"
- (sources."type-is-1.6.13" // {
+ (sources."type-is-1.6.14" // {
dependencies = [
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
];
@@ -28872,7 +29134,7 @@ in
sources."domhandler-2.3.0"
sources."domutils-1.5.1"
sources."inherits-2.0.3"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -28912,9 +29174,9 @@ in
})
(sources."cron-1.1.1" // {
dependencies = [
- (sources."moment-timezone-0.5.7" // {
+ (sources."moment-timezone-0.5.9" // {
dependencies = [
- sources."moment-2.15.2"
+ sources."moment-2.16.0"
];
})
];
@@ -28923,9 +29185,9 @@ in
dependencies = [
(sources."accepts-1.3.3" // {
dependencies = [
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
sources."negotiator-0.6.1"
@@ -28947,7 +29209,7 @@ in
sources."etag-1.7.0"
(sources."finalhandler-0.5.0" // {
dependencies = [
- sources."statuses-1.3.0"
+ sources."statuses-1.3.1"
sources."unpipe-1.0.0"
];
})
@@ -28972,23 +29234,23 @@ in
(sources."send-0.14.1" // {
dependencies = [
sources."destroy-1.0.4"
- (sources."http-errors-1.5.0" // {
+ (sources."http-errors-1.5.1" // {
dependencies = [
- sources."inherits-2.0.1"
- sources."setprototypeof-1.0.1"
+ sources."inherits-2.0.3"
+ sources."setprototypeof-1.0.2"
];
})
sources."mime-1.3.4"
sources."ms-0.7.1"
- sources."statuses-1.3.0"
+ sources."statuses-1.3.1"
];
})
sources."serve-static-1.11.1"
- (sources."type-is-1.6.13" // {
+ (sources."type-is-1.6.14" // {
dependencies = [
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
];
@@ -28999,9 +29261,9 @@ in
})
(sources."follow-redirects-0.2.0" // {
dependencies = [
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
sources."stream-consume-0.1.0"
@@ -29053,7 +29315,7 @@ in
})
(sources."i18next-1.10.6" // {
dependencies = [
- (sources."cookies-0.6.1" // {
+ (sources."cookies-0.6.2" // {
dependencies = [
sources."depd-1.1.0"
sources."keygrip-1.0.1"
@@ -29212,7 +29474,7 @@ in
(sources."ordered-read-streams-0.3.0" // {
dependencies = [
sources."is-stream-1.1.0"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -29324,7 +29586,7 @@ in
})
];
})
- (sources."websocket-stream-3.3.0" // {
+ (sources."websocket-stream-3.3.3" // {
dependencies = [
(sources."duplexify-3.5.0" // {
dependencies = [
@@ -29337,7 +29599,7 @@ in
})
];
})
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -29384,9 +29646,9 @@ in
dependencies = [
sources."uid2-0.0.3"
sources."utils-merge-1.0.0"
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
];
@@ -29500,12 +29762,12 @@ in
sources."sax-1.2.1"
(sources."xmlbuilder-4.2.1" // {
dependencies = [
- sources."lodash-4.16.6"
+ sources."lodash-4.17.2"
];
})
];
})
- (sources."node-red-node-feedparser-0.1.6" // {
+ (sources."node-red-node-feedparser-0.1.7" // {
dependencies = [
(sources."feedparser-1.1.3" // {
dependencies = [
@@ -29552,7 +29814,7 @@ in
dependencies = [
(sources."async-2.1.2" // {
dependencies = [
- sources."lodash-4.16.6"
+ sources."lodash-4.17.2"
];
})
];
@@ -29636,9 +29898,9 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
sources."node-uuid-1.4.7"
@@ -29655,7 +29917,7 @@ in
})
];
})
- (sources."node-red-node-email-0.1.11" // {
+ (sources."node-red-node-email-0.1.12" // {
dependencies = [
(sources."nodemailer-1.11.0" // {
dependencies = [
@@ -29675,9 +29937,9 @@ in
sources."libqp-1.1.0"
(sources."needle-0.10.0" // {
dependencies = [
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
sources."iconv-lite-0.4.13"
@@ -29689,9 +29951,9 @@ in
})
(sources."needle-0.11.0" // {
dependencies = [
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
sources."iconv-lite-0.4.13"
@@ -29734,7 +29996,7 @@ in
];
})
sources."mime-1.3.4"
- (sources."uue-3.0.0" // {
+ (sources."uue-3.1.0" // {
dependencies = [
sources."extend-3.0.0"
];
@@ -29756,11 +30018,11 @@ in
})
];
})
- (sources."node-red-node-twitter-0.1.7" // {
+ (sources."node-red-node-twitter-0.1.9" // {
dependencies = [
sources."twitter-ng-0.6.2"
sources."oauth-0.9.14"
- (sources."request-2.78.0" // {
+ (sources."request-2.79.0" // {
dependencies = [
sources."aws-sign2-0.6.0"
sources."aws4-1.5.0"
@@ -29772,7 +30034,7 @@ in
})
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- (sources."form-data-2.1.1" // {
+ (sources."form-data-2.1.2" // {
dependencies = [
sources."asynckit-0.4.0"
];
@@ -29856,12 +30118,11 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
- sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
@@ -29871,14 +30132,15 @@ in
];
})
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
];
})
];
})
- sources."node-red-node-rbe-0.1.5"
- (sources."node-red-node-serialport-0.4.0" // {
+ sources."node-red-node-rbe-0.1.6"
+ (sources."node-red-node-serialport-0.4.1" // {
dependencies = [
- (sources."serialport-4.0.4" // {
+ (sources."serialport-4.0.6" // {
dependencies = [
sources."bindings-1.2.1"
(sources."commander-2.9.0" // {
@@ -29886,9 +30148,9 @@ in
sources."graceful-readlink-1.0.1"
];
})
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
(sources."lie-3.1.0" // {
@@ -29904,17 +30166,17 @@ in
sources."minimist-0.0.8"
];
})
- (sources."npmlog-4.0.0" // {
+ (sources."npmlog-4.0.1" // {
dependencies = [
(sources."are-we-there-yet-1.1.2" // {
dependencies = [
sources."delegates-1.0.0"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
- sources."inherits-2.0.3"
sources."isarray-1.0.0"
+ sources."inherits-2.0.3"
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
@@ -29923,7 +30185,7 @@ in
];
})
sources."console-control-strings-1.1.0"
- (sources."gauge-2.6.0" // {
+ (sources."gauge-2.7.1" // {
dependencies = [
sources."aproba-1.0.4"
sources."has-color-0.1.7"
@@ -29959,7 +30221,7 @@ in
sources."strip-json-comments-1.0.4"
];
})
- (sources."request-2.78.0" // {
+ (sources."request-2.79.0" // {
dependencies = [
sources."aws-sign2-0.6.0"
sources."aws4-1.5.0"
@@ -29971,7 +30233,7 @@ in
})
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- (sources."form-data-2.1.1" // {
+ (sources."form-data-2.1.2" // {
dependencies = [
sources."asynckit-0.4.0"
];
@@ -30050,12 +30312,11 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
- sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
@@ -30065,6 +30326,7 @@ in
];
})
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
];
})
(sources."rimraf-2.5.4" // {
@@ -30111,6 +30373,11 @@ in
})
(sources."tar-pack-3.3.0" // {
dependencies = [
+ (sources."debug-2.2.0" // {
+ dependencies = [
+ sources."ms-0.7.1"
+ ];
+ })
(sources."fstream-1.0.10" // {
dependencies = [
sources."graceful-fs-4.1.10"
@@ -30228,7 +30495,7 @@ in
sources."range-parser-0.0.4"
sources."mkdirp-0.3.5"
sources."cookie-0.0.5"
- sources."buffer-crc32-0.2.5"
+ sources."buffer-crc32-0.2.6"
sources."fresh-0.1.0"
sources."methods-0.0.1"
(sources."send-0.1.0" // {
@@ -30237,9 +30504,9 @@ in
];
})
sources."cookie-signature-1.0.1"
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
];
@@ -30347,7 +30614,7 @@ in
})
(sources."net-ping-1.1.7" // {
dependencies = [
- (sources."raw-socket-1.5.0" // {
+ (sources."raw-socket-1.5.1" // {
dependencies = [
sources."nan-2.3.5"
];
@@ -30376,12 +30643,18 @@ in
npm = nodeEnv.buildNodePackage {
name = "npm";
packageName = "npm";
- version = "3.10.9";
+ version = "4.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz";
- sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3";
+ url = "https://registry.npmjs.org/npm/-/npm-4.0.2.tgz";
+ sha1 = "fe6cb3c202145151459e74a2919060fb659e2dae";
};
dependencies = [
+ (sources."JSONStream-1.2.1" // {
+ dependencies = [
+ sources."jsonparse-1.2.0"
+ sources."through-2.3.8"
+ ];
+ })
sources."abbrev-1.0.9"
sources."ansicolors-0.3.2"
sources."ansistyles-0.1.3"
@@ -30485,6 +30758,62 @@ in
sources."lodash.union-4.6.0"
sources."lodash.uniq-4.5.0"
sources."lodash.without-4.4.0"
+ (sources."mississippi-1.2.0" // {
+ dependencies = [
+ (sources."concat-stream-1.5.2" // {
+ dependencies = [
+ sources."typedarray-0.0.6"
+ (sources."readable-stream-2.0.6" // {
+ dependencies = [
+ sources."core-util-is-1.0.2"
+ sources."isarray-1.0.0"
+ sources."process-nextick-args-1.0.7"
+ sources."string_decoder-0.10.31"
+ sources."util-deprecate-1.0.2"
+ ];
+ })
+ ];
+ })
+ (sources."duplexify-3.5.0" // {
+ dependencies = [
+ (sources."end-of-stream-1.0.0" // {
+ dependencies = [
+ sources."once-1.3.3"
+ ];
+ })
+ sources."stream-shift-1.0.0"
+ ];
+ })
+ (sources."end-of-stream-1.1.0" // {
+ dependencies = [
+ sources."once-1.3.3"
+ ];
+ })
+ sources."flush-write-stream-1.0.2"
+ sources."from2-2.3.0"
+ sources."pump-1.0.1"
+ sources."pumpify-1.3.5"
+ (sources."stream-each-1.2.0" // {
+ dependencies = [
+ sources."stream-shift-1.0.0"
+ ];
+ })
+ (sources."through2-2.0.1" // {
+ dependencies = [
+ (sources."readable-stream-2.0.6" // {
+ dependencies = [
+ sources."core-util-is-1.0.2"
+ sources."isarray-1.0.0"
+ sources."process-nextick-args-1.0.7"
+ sources."string_decoder-0.10.31"
+ sources."util-deprecate-1.0.2"
+ ];
+ })
+ sources."xtend-4.0.1"
+ ];
+ })
+ ];
+ })
(sources."mkdirp-0.5.1" // {
dependencies = [
sources."minimist-0.0.8"
@@ -30535,9 +30864,9 @@ in
dependencies = [
(sources."array-index-1.0.0" // {
dependencies = [
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
(sources."es6-symbol-3.1.0" // {
@@ -30570,7 +30899,7 @@ in
sources."npm-cache-filename-1.0.2"
sources."npm-install-checks-3.0.0"
sources."npm-package-arg-4.2.0"
- (sources."npm-registry-client-7.2.1" // {
+ (sources."npm-registry-client-7.3.0" // {
dependencies = [
(sources."concat-stream-1.5.2" // {
dependencies = [
@@ -30618,7 +30947,7 @@ in
];
})
sources."npm-user-validate-0.1.5"
- (sources."npmlog-4.0.0" // {
+ (sources."npmlog-4.0.1" // {
dependencies = [
(sources."are-we-there-yet-1.1.2" // {
dependencies = [
@@ -30626,7 +30955,7 @@ in
];
})
sources."console-control-strings-1.1.0"
- (sources."gauge-2.6.0" // {
+ (sources."gauge-2.7.1" // {
dependencies = [
sources."has-color-0.1.7"
sources."object-assign-4.1.0"
@@ -30703,23 +31032,10 @@ in
];
})
sources."realize-package-specifier-3.0.3"
- (sources."request-2.75.0" // {
+ (sources."request-2.78.0" // {
dependencies = [
sources."aws-sign2-0.6.0"
sources."aws4-1.5.0"
- (sources."bl-1.1.2" // {
- dependencies = [
- (sources."readable-stream-2.0.6" // {
- dependencies = [
- sources."core-util-is-1.0.2"
- sources."isarray-1.0.0"
- sources."process-nextick-args-1.0.7"
- sources."string_decoder-0.10.31"
- sources."util-deprecate-1.0.2"
- ];
- })
- ];
- })
sources."caseless-0.11.0"
(sources."combined-stream-1.0.5" // {
dependencies = [
@@ -30728,7 +31044,7 @@ in
})
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- (sources."form-data-2.0.0" // {
+ (sources."form-data-2.1.2" // {
dependencies = [
sources."asynckit-0.4.0"
];
@@ -30803,14 +31119,14 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
- sources."qs-6.2.1"
+ sources."qs-6.3.0"
sources."stringstream-0.0.5"
(sources."tough-cookie-2.3.2" // {
dependencies = [
@@ -30826,6 +31142,26 @@ in
sources."sha-2.0.1"
sources."slide-1.1.6"
sources."sorted-object-2.0.1"
+ (sources."sorted-union-stream-2.1.3" // {
+ dependencies = [
+ (sources."from2-1.3.0" // {
+ dependencies = [
+ (sources."readable-stream-1.1.14" // {
+ dependencies = [
+ sources."core-util-is-1.0.2"
+ sources."isarray-0.0.1"
+ sources."string_decoder-0.10.31"
+ ];
+ })
+ ];
+ })
+ (sources."stream-iterate-1.2.0" // {
+ dependencies = [
+ sources."stream-shift-1.0.0"
+ ];
+ })
+ ];
+ })
sources."strip-ansi-3.0.1"
(sources."tar-2.2.1" // {
dependencies = [
@@ -30846,7 +31182,7 @@ in
sources."builtins-0.0.7"
];
})
- (sources."which-1.2.11" // {
+ (sources."which-1.2.12" // {
dependencies = [
sources."isexe-1.1.2"
];
@@ -30901,7 +31237,7 @@ in
})
(sources."npm-registry-client-0.2.27" // {
dependencies = [
- (sources."request-2.78.0" // {
+ (sources."request-2.79.0" // {
dependencies = [
sources."aws-sign2-0.6.0"
sources."aws4-1.5.0"
@@ -30913,7 +31249,7 @@ in
})
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- (sources."form-data-2.1.1" // {
+ (sources."form-data-2.1.2" // {
dependencies = [
sources."asynckit-0.4.0"
];
@@ -30997,12 +31333,11 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
- sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
@@ -31012,6 +31347,7 @@ in
];
})
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
];
})
sources."graceful-fs-2.0.3"
@@ -31052,17 +31388,17 @@ in
})
sources."retry-0.6.0"
sources."couch-login-0.1.20"
- (sources."npmlog-4.0.0" // {
+ (sources."npmlog-4.0.1" // {
dependencies = [
(sources."are-we-there-yet-1.1.2" // {
dependencies = [
sources."delegates-1.0.0"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
- sources."inherits-2.0.3"
sources."isarray-1.0.0"
+ sources."inherits-2.0.3"
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
@@ -31071,7 +31407,7 @@ in
];
})
sources."console-control-strings-1.1.0"
- (sources."gauge-2.6.0" // {
+ (sources."gauge-2.7.1" // {
dependencies = [
sources."aproba-1.0.4"
sources."has-color-0.1.7"
@@ -31269,9 +31605,9 @@ in
sources."jju-1.3.0"
];
})
- sources."lodash-4.16.6"
+ sources."lodash-4.17.2"
sources."node-alias-1.0.4"
- (sources."npm-3.10.9" // {
+ (sources."npm-3.10.10" // {
dependencies = [
sources."abbrev-1.0.9"
sources."ansicolors-0.3.2"
@@ -31426,9 +31762,9 @@ in
dependencies = [
(sources."array-index-1.0.0" // {
dependencies = [
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
(sources."es6-symbol-3.1.0" // {
@@ -31509,7 +31845,7 @@ in
];
})
sources."npm-user-validate-0.1.5"
- (sources."npmlog-4.0.0" // {
+ (sources."npmlog-4.0.1" // {
dependencies = [
(sources."are-we-there-yet-1.1.2" // {
dependencies = [
@@ -31517,7 +31853,7 @@ in
];
})
sources."console-control-strings-1.1.0"
- (sources."gauge-2.6.0" // {
+ (sources."gauge-2.7.1" // {
dependencies = [
sources."has-color-0.1.7"
sources."object-assign-4.1.0"
@@ -31676,9 +32012,9 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
sources."node-uuid-1.4.7"
@@ -31718,7 +32054,7 @@ in
sources."builtins-0.0.7"
];
})
- (sources."which-1.2.11" // {
+ (sources."which-1.2.12" // {
dependencies = [
sources."isexe-1.1.2"
];
@@ -31855,12 +32191,12 @@ in
];
})
sources."read-all-stream-3.1.0"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
- sources."inherits-2.0.3"
sources."isarray-1.0.0"
+ sources."inherits-2.0.3"
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
@@ -31924,10 +32260,10 @@ in
parsoid = nodeEnv.buildNodePackage {
name = "parsoid";
packageName = "parsoid";
- version = "0.5.3";
+ version = "0.6.1";
src = fetchurl {
- url = "https://registry.npmjs.org/parsoid/-/parsoid-0.5.3.tgz";
- sha1 = "f1dea92c78b80f6af02d3652025e31fd8a81efde";
+ url = "https://registry.npmjs.org/parsoid/-/parsoid-0.6.1.tgz";
+ sha1 = "b6393a25fde2489290dc9d110b037ce89eec2723";
};
dependencies = [
sources."async-0.9.2"
@@ -31947,11 +32283,11 @@ in
];
})
sources."depd-1.1.0"
- (sources."http-errors-1.5.0" // {
+ (sources."http-errors-1.5.1" // {
dependencies = [
- sources."inherits-2.0.1"
- sources."setprototypeof-1.0.1"
- sources."statuses-1.3.0"
+ sources."inherits-2.0.3"
+ sources."setprototypeof-1.0.2"
+ sources."statuses-1.3.1"
];
})
sources."iconv-lite-0.4.13"
@@ -31966,85 +32302,33 @@ in
sources."unpipe-1.0.0"
];
})
- (sources."type-is-1.6.13" // {
+ (sources."type-is-1.6.14" // {
dependencies = [
sources."media-typer-0.3.0"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
];
})
];
})
- (sources."bunyan-1.8.4" // {
- dependencies = [
- (sources."dtrace-provider-0.7.1" // {
- dependencies = [
- sources."nan-2.4.0"
- ];
- })
- (sources."mv-2.1.1" // {
- dependencies = [
- (sources."mkdirp-0.5.1" // {
- dependencies = [
- sources."minimist-0.0.8"
- ];
- })
- sources."ncp-2.0.0"
- (sources."rimraf-2.4.5" // {
- dependencies = [
- (sources."glob-6.0.4" // {
- dependencies = [
- (sources."inflight-1.0.6" // {
- dependencies = [
- sources."wrappy-1.0.2"
- ];
- })
- sources."inherits-2.0.3"
- (sources."minimatch-3.0.3" // {
- dependencies = [
- (sources."brace-expansion-1.1.6" // {
- dependencies = [
- sources."balanced-match-0.4.2"
- sources."concat-map-0.0.1"
- ];
- })
- ];
- })
- (sources."once-1.4.0" // {
- dependencies = [
- sources."wrappy-1.0.2"
- ];
- })
- sources."path-is-absolute-1.0.1"
- ];
- })
- ];
- })
- ];
- })
- sources."safe-json-stringify-1.0.3"
- sources."moment-2.15.2"
- ];
- })
(sources."compression-1.6.2" // {
dependencies = [
(sources."accepts-1.3.3" // {
dependencies = [
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
- sources."negotiator-0.6.1"
];
})
sources."bytes-2.3.0"
(sources."compressible-2.0.9" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
(sources."debug-2.2.0" // {
@@ -32077,7 +32361,8 @@ in
})
];
})
- sources."core-js-1.2.7"
+ sources."content-type-git+https://github.com/wikimedia/content-type.git#master"
+ sources."core-js-2.4.1"
sources."diff-1.4.0"
sources."domino-1.0.27"
sources."entities-1.1.1"
@@ -32085,12 +32370,11 @@ in
dependencies = [
(sources."accepts-1.3.3" // {
dependencies = [
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
- sources."negotiator-0.6.1"
];
})
sources."array-flatten-1.1.1"
@@ -32109,7 +32393,7 @@ in
sources."etag-1.7.0"
(sources."finalhandler-0.5.0" // {
dependencies = [
- sources."statuses-1.3.0"
+ sources."statuses-1.3.1"
sources."unpipe-1.0.0"
];
})
@@ -32134,24 +32418,24 @@ in
(sources."send-0.14.1" // {
dependencies = [
sources."destroy-1.0.4"
- (sources."http-errors-1.5.0" // {
+ (sources."http-errors-1.5.1" // {
dependencies = [
- sources."inherits-2.0.1"
- sources."setprototypeof-1.0.1"
+ sources."inherits-2.0.3"
+ sources."setprototypeof-1.0.2"
];
})
sources."mime-1.3.4"
sources."ms-0.7.1"
- sources."statuses-1.3.0"
+ sources."statuses-1.3.1"
];
})
sources."serve-static-1.11.1"
- (sources."type-is-1.6.13" // {
+ (sources."type-is-1.6.14" // {
dependencies = [
sources."media-typer-0.3.0"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
];
@@ -32160,9 +32444,9 @@ in
sources."vary-1.1.0"
];
})
- (sources."express-handlebars-2.0.1" // {
+ (sources."express-handlebars-3.0.0" // {
dependencies = [
- (sources."glob-5.0.15" // {
+ (sources."glob-6.0.4" // {
dependencies = [
(sources."inflight-1.0.6" // {
dependencies = [
@@ -32188,49 +32472,92 @@ in
sources."path-is-absolute-1.0.1"
];
})
- (sources."graceful-fs-3.0.11" // {
- dependencies = [
- sources."natives-1.1.0"
- ];
- })
- (sources."handlebars-3.0.3" // {
+ sources."graceful-fs-4.1.10"
+ (sources."handlebars-4.0.6" // {
dependencies = [
+ sources."async-1.5.2"
(sources."optimist-0.6.1" // {
dependencies = [
sources."wordwrap-0.0.3"
sources."minimist-0.0.10"
];
})
- (sources."source-map-0.1.43" // {
+ (sources."source-map-0.4.4" // {
dependencies = [
sources."amdefine-1.0.1"
];
})
- (sources."uglify-js-2.3.6" // {
+ (sources."uglify-js-2.7.4" // {
dependencies = [
sources."async-0.2.10"
- (sources."optimist-0.3.7" // {
+ sources."source-map-0.5.6"
+ sources."uglify-to-browserify-1.0.2"
+ (sources."yargs-3.10.0" // {
dependencies = [
- sources."wordwrap-0.0.3"
+ sources."camelcase-1.2.1"
+ (sources."cliui-2.1.0" // {
+ dependencies = [
+ (sources."center-align-0.1.3" // {
+ dependencies = [
+ (sources."align-text-0.1.4" // {
+ dependencies = [
+ (sources."kind-of-3.0.4" // {
+ dependencies = [
+ sources."is-buffer-1.1.4"
+ ];
+ })
+ sources."longest-1.0.1"
+ sources."repeat-string-1.6.1"
+ ];
+ })
+ sources."lazy-cache-1.0.4"
+ ];
+ })
+ (sources."right-align-0.1.3" // {
+ dependencies = [
+ (sources."align-text-0.1.4" // {
+ dependencies = [
+ (sources."kind-of-3.0.4" // {
+ dependencies = [
+ sources."is-buffer-1.1.4"
+ ];
+ })
+ sources."longest-1.0.1"
+ sources."repeat-string-1.6.1"
+ ];
+ })
+ ];
+ })
+ sources."wordwrap-0.0.2"
+ ];
+ })
+ sources."decamelize-1.2.0"
+ sources."window-size-0.1.0"
];
})
];
})
];
})
- (sources."object.assign-1.1.1" // {
+ (sources."object.assign-4.0.4" // {
dependencies = [
+ sources."function-bind-1.1.0"
sources."object-keys-1.0.11"
+ (sources."define-properties-1.1.2" // {
+ dependencies = [
+ sources."foreach-2.0.5"
+ ];
+ })
];
})
- (sources."promise-6.1.0" // {
+ (sources."promise-7.1.1" // {
dependencies = [
- sources."asap-1.0.0"
+ sources."asap-2.0.5"
];
})
];
})
- (sources."finalhandler-0.4.1" // {
+ (sources."finalhandler-0.5.1" // {
dependencies = [
(sources."debug-2.2.0" // {
dependencies = [
@@ -32243,6 +32570,7 @@ in
sources."ee-first-1.1.1"
];
})
+ sources."statuses-1.3.1"
sources."unpipe-1.0.0"
];
})
@@ -32251,61 +32579,22 @@ in
sources."gelfling-0.2.0"
];
})
- (sources."html5-1.0.5" // {
+ (sources."js-yaml-3.7.0" // {
dependencies = [
- sources."opts-1.2.2"
- sources."html5-entities-1.0.0"
- (sources."jsdom-0.11.1" // {
+ (sources."argparse-1.0.9" // {
dependencies = [
- (sources."htmlparser2-3.9.2" // {
- dependencies = [
- sources."domelementtype-1.3.0"
- sources."domhandler-2.3.0"
- (sources."domutils-1.5.1" // {
- dependencies = [
- (sources."dom-serializer-0.1.0" // {
- dependencies = [
- sources."domelementtype-1.1.3"
- ];
- })
- ];
- })
- sources."inherits-2.0.3"
- (sources."readable-stream-2.1.5" // {
- dependencies = [
- sources."buffer-shims-1.0.0"
- sources."core-util-is-1.0.2"
- sources."isarray-1.0.0"
- sources."process-nextick-args-1.0.7"
- sources."string_decoder-0.10.31"
- sources."util-deprecate-1.0.2"
- ];
- })
- ];
- })
- sources."nwmatcher-1.3.9"
- sources."xmlhttprequest-1.8.0"
- sources."cssom-0.3.1"
- sources."cssstyle-0.2.37"
- (sources."contextify-0.1.15" // {
- dependencies = [
- sources."bindings-1.2.1"
- sources."nan-2.4.0"
- ];
- })
+ sources."sprintf-js-1.0.3"
];
})
+ sources."esprima-2.7.3"
];
})
- sources."node-txstatsd-0.1.6"
+ sources."mediawiki-title-0.5.6"
+ sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access"
sources."node-uuid-1.4.7"
sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork"
- (sources."prfun-2.1.4" // {
- dependencies = [
- sources."core-js-2.4.1"
- ];
- })
- (sources."request-2.78.0" // {
+ sources."prfun-2.1.4"
+ (sources."request-2.79.0" // {
dependencies = [
sources."aws-sign2-0.6.0"
sources."aws4-1.5.0"
@@ -32317,7 +32606,7 @@ in
})
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- (sources."form-data-2.1.1" // {
+ (sources."form-data-2.1.2" // {
dependencies = [
sources."asynckit-0.4.0"
];
@@ -32401,9 +32690,9 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
sources."oauth-sign-0.8.2"
@@ -32415,19 +32704,385 @@ in
];
})
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
];
})
sources."semver-5.3.0"
- (sources."serve-favicon-2.3.0" // {
+ (sources."serve-favicon-2.3.2" // {
dependencies = [
sources."etag-1.7.0"
sources."fresh-0.3.0"
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
sources."parseurl-1.3.1"
];
})
+ (sources."service-runner-2.1.11" // {
+ dependencies = [
+ sources."bluebird-3.4.6"
+ (sources."bunyan-1.8.5" // {
+ dependencies = [
+ (sources."dtrace-provider-0.8.0" // {
+ dependencies = [
+ sources."nan-2.4.0"
+ ];
+ })
+ (sources."mv-2.1.1" // {
+ dependencies = [
+ (sources."mkdirp-0.5.1" // {
+ dependencies = [
+ sources."minimist-0.0.8"
+ ];
+ })
+ sources."ncp-2.0.0"
+ (sources."rimraf-2.4.5" // {
+ dependencies = [
+ (sources."glob-6.0.4" // {
+ dependencies = [
+ (sources."inflight-1.0.6" // {
+ dependencies = [
+ sources."wrappy-1.0.2"
+ ];
+ })
+ sources."inherits-2.0.3"
+ (sources."minimatch-3.0.3" // {
+ dependencies = [
+ (sources."brace-expansion-1.1.6" // {
+ dependencies = [
+ sources."balanced-match-0.4.2"
+ sources."concat-map-0.0.1"
+ ];
+ })
+ ];
+ })
+ (sources."once-1.4.0" // {
+ dependencies = [
+ sources."wrappy-1.0.2"
+ ];
+ })
+ sources."path-is-absolute-1.0.1"
+ ];
+ })
+ ];
+ })
+ ];
+ })
+ sources."safe-json-stringify-1.0.3"
+ sources."moment-2.16.0"
+ ];
+ })
+ sources."bunyan-syslog-udp-0.1.0"
+ sources."extend-3.0.0"
+ (sources."gelf-stream-1.1.1" // {
+ dependencies = [
+ sources."gelfling-0.3.1"
+ ];
+ })
+ sources."hot-shots-4.3.1"
+ (sources."limitation-0.1.9" // {
+ dependencies = [
+ (sources."kad-git+https://github.com/gwicke/kad.git#master" // {
+ dependencies = [
+ sources."clarinet-0.11.0"
+ sources."colors-1.1.2"
+ sources."hat-0.0.3"
+ sources."kad-fs-0.0.4"
+ (sources."kad-localstorage-0.0.7" // {
+ dependencies = [
+ sources."dom-storage-2.0.2"
+ ];
+ })
+ sources."kad-memstore-0.0.1"
+ sources."lodash-3.10.1"
+ sources."merge-1.2.0"
+ sources."ms-0.7.2"
+ (sources."msgpack5-3.4.1" // {
+ dependencies = [
+ (sources."bl-1.1.2" // {
+ dependencies = [
+ (sources."readable-stream-2.0.6" // {
+ dependencies = [
+ sources."core-util-is-1.0.2"
+ sources."isarray-1.0.0"
+ sources."process-nextick-args-1.0.7"
+ sources."string_decoder-0.10.31"
+ sources."util-deprecate-1.0.2"
+ ];
+ })
+ ];
+ })
+ sources."inherits-2.0.3"
+ ];
+ })
+ ];
+ })
+ (sources."readable-stream-2.2.2" // {
+ dependencies = [
+ sources."buffer-shims-1.0.0"
+ sources."core-util-is-1.0.2"
+ sources."isarray-1.0.0"
+ sources."inherits-2.0.3"
+ sources."process-nextick-args-1.0.7"
+ sources."string_decoder-0.10.31"
+ sources."util-deprecate-1.0.2"
+ ];
+ })
+ ];
+ })
+ (sources."yargs-5.0.0" // {
+ dependencies = [
+ (sources."cliui-3.2.0" // {
+ dependencies = [
+ (sources."strip-ansi-3.0.1" // {
+ dependencies = [
+ sources."ansi-regex-2.0.0"
+ ];
+ })
+ sources."wrap-ansi-2.0.0"
+ ];
+ })
+ sources."decamelize-1.2.0"
+ sources."get-caller-file-1.0.2"
+ sources."lodash.assign-4.2.0"
+ (sources."os-locale-1.4.0" // {
+ dependencies = [
+ (sources."lcid-1.0.0" // {
+ dependencies = [
+ sources."invert-kv-1.0.0"
+ ];
+ })
+ ];
+ })
+ (sources."read-pkg-up-1.0.1" // {
+ dependencies = [
+ (sources."find-up-1.1.2" // {
+ dependencies = [
+ sources."path-exists-2.1.0"
+ (sources."pinkie-promise-2.0.1" // {
+ dependencies = [
+ sources."pinkie-2.0.4"
+ ];
+ })
+ ];
+ })
+ (sources."read-pkg-1.1.0" // {
+ dependencies = [
+ (sources."load-json-file-1.1.0" // {
+ dependencies = [
+ sources."graceful-fs-4.1.10"
+ (sources."parse-json-2.2.0" // {
+ dependencies = [
+ (sources."error-ex-1.3.0" // {
+ dependencies = [
+ sources."is-arrayish-0.2.1"
+ ];
+ })
+ ];
+ })
+ sources."pify-2.3.0"
+ (sources."pinkie-promise-2.0.1" // {
+ dependencies = [
+ sources."pinkie-2.0.4"
+ ];
+ })
+ (sources."strip-bom-2.0.0" // {
+ dependencies = [
+ sources."is-utf8-0.2.1"
+ ];
+ })
+ ];
+ })
+ (sources."normalize-package-data-2.3.5" // {
+ dependencies = [
+ sources."hosted-git-info-2.1.5"
+ (sources."is-builtin-module-1.0.0" // {
+ dependencies = [
+ sources."builtin-modules-1.1.1"
+ ];
+ })
+ (sources."validate-npm-package-license-3.0.1" // {
+ dependencies = [
+ (sources."spdx-correct-1.0.2" // {
+ dependencies = [
+ sources."spdx-license-ids-1.2.2"
+ ];
+ })
+ sources."spdx-expression-parse-1.0.4"
+ ];
+ })
+ ];
+ })
+ (sources."path-type-1.1.0" // {
+ dependencies = [
+ sources."graceful-fs-4.1.10"
+ sources."pify-2.3.0"
+ (sources."pinkie-promise-2.0.1" // {
+ dependencies = [
+ sources."pinkie-2.0.4"
+ ];
+ })
+ ];
+ })
+ ];
+ })
+ ];
+ })
+ sources."require-directory-2.1.1"
+ sources."require-main-filename-1.0.1"
+ sources."set-blocking-2.0.0"
+ (sources."string-width-1.0.2" // {
+ dependencies = [
+ sources."code-point-at-1.1.0"
+ (sources."is-fullwidth-code-point-1.0.0" // {
+ dependencies = [
+ sources."number-is-nan-1.0.1"
+ ];
+ })
+ (sources."strip-ansi-3.0.1" // {
+ dependencies = [
+ sources."ansi-regex-2.0.0"
+ ];
+ })
+ ];
+ })
+ sources."which-module-1.0.0"
+ sources."window-size-0.2.0"
+ sources."y18n-3.2.1"
+ (sources."yargs-parser-3.2.0" // {
+ dependencies = [
+ sources."camelcase-3.0.0"
+ ];
+ })
+ ];
+ })
+ ];
+ })
sources."simplediff-0.1.1"
- sources."yargs-1.3.3"
+ (sources."yargs-4.8.1" // {
+ dependencies = [
+ (sources."cliui-3.2.0" // {
+ dependencies = [
+ (sources."strip-ansi-3.0.1" // {
+ dependencies = [
+ sources."ansi-regex-2.0.0"
+ ];
+ })
+ sources."wrap-ansi-2.0.0"
+ ];
+ })
+ sources."decamelize-1.2.0"
+ sources."get-caller-file-1.0.2"
+ sources."lodash.assign-4.2.0"
+ (sources."os-locale-1.4.0" // {
+ dependencies = [
+ (sources."lcid-1.0.0" // {
+ dependencies = [
+ sources."invert-kv-1.0.0"
+ ];
+ })
+ ];
+ })
+ (sources."read-pkg-up-1.0.1" // {
+ dependencies = [
+ (sources."find-up-1.1.2" // {
+ dependencies = [
+ sources."path-exists-2.1.0"
+ (sources."pinkie-promise-2.0.1" // {
+ dependencies = [
+ sources."pinkie-2.0.4"
+ ];
+ })
+ ];
+ })
+ (sources."read-pkg-1.1.0" // {
+ dependencies = [
+ (sources."load-json-file-1.1.0" // {
+ dependencies = [
+ sources."graceful-fs-4.1.10"
+ (sources."parse-json-2.2.0" // {
+ dependencies = [
+ (sources."error-ex-1.3.0" // {
+ dependencies = [
+ sources."is-arrayish-0.2.1"
+ ];
+ })
+ ];
+ })
+ sources."pify-2.3.0"
+ (sources."pinkie-promise-2.0.1" // {
+ dependencies = [
+ sources."pinkie-2.0.4"
+ ];
+ })
+ (sources."strip-bom-2.0.0" // {
+ dependencies = [
+ sources."is-utf8-0.2.1"
+ ];
+ })
+ ];
+ })
+ (sources."normalize-package-data-2.3.5" // {
+ dependencies = [
+ sources."hosted-git-info-2.1.5"
+ (sources."is-builtin-module-1.0.0" // {
+ dependencies = [
+ sources."builtin-modules-1.1.1"
+ ];
+ })
+ (sources."validate-npm-package-license-3.0.1" // {
+ dependencies = [
+ (sources."spdx-correct-1.0.2" // {
+ dependencies = [
+ sources."spdx-license-ids-1.2.2"
+ ];
+ })
+ sources."spdx-expression-parse-1.0.4"
+ ];
+ })
+ ];
+ })
+ (sources."path-type-1.1.0" // {
+ dependencies = [
+ sources."graceful-fs-4.1.10"
+ sources."pify-2.3.0"
+ (sources."pinkie-promise-2.0.1" // {
+ dependencies = [
+ sources."pinkie-2.0.4"
+ ];
+ })
+ ];
+ })
+ ];
+ })
+ ];
+ })
+ sources."require-directory-2.1.1"
+ sources."require-main-filename-1.0.1"
+ sources."set-blocking-2.0.0"
+ (sources."string-width-1.0.2" // {
+ dependencies = [
+ sources."code-point-at-1.1.0"
+ (sources."is-fullwidth-code-point-1.0.0" // {
+ dependencies = [
+ sources."number-is-nan-1.0.1"
+ ];
+ })
+ (sources."strip-ansi-3.0.1" // {
+ dependencies = [
+ sources."ansi-regex-2.0.0"
+ ];
+ })
+ ];
+ })
+ sources."which-module-1.0.0"
+ sources."window-size-0.2.0"
+ sources."y18n-3.2.1"
+ (sources."yargs-parser-2.4.1" // {
+ dependencies = [
+ sources."camelcase-3.0.0"
+ ];
+ })
+ ];
+ })
];
buildInputs = globalBuildInputs;
meta = {
@@ -32457,7 +33112,7 @@ in
})
(sources."bplist-parser-0.1.1" // {
dependencies = [
- sources."big-integer-1.6.16"
+ sources."big-integer-1.6.17"
];
})
(sources."concat-stream-1.5.2" // {
@@ -32564,9 +33219,10 @@ in
})
(sources."multicast-dns-6.1.0" // {
dependencies = [
- (sources."dns-packet-1.1.0" // {
+ (sources."dns-packet-1.1.1" // {
dependencies = [
sources."ip-1.1.4"
+ sources."safe-buffer-5.0.1"
];
})
sources."thunky-0.1.0"
@@ -32704,7 +33360,7 @@ in
];
})
sources."clivas-0.2.0"
- (sources."inquirer-1.2.2" // {
+ (sources."inquirer-1.2.3" // {
dependencies = [
sources."ansi-escapes-1.4.0"
(sources."chalk-1.1.3" // {
@@ -32766,7 +33422,7 @@ in
sources."object-assign-4.1.0"
];
})
- sources."lodash-4.16.6"
+ sources."lodash-4.17.2"
sources."mute-stream-0.0.6"
(sources."pinkie-promise-2.0.1" // {
dependencies = [
@@ -32812,7 +33468,7 @@ in
dependencies = [
sources."blob-to-buffer-1.2.6"
sources."get-stdin-5.0.1"
- (sources."magnet-uri-5.1.4" // {
+ (sources."magnet-uri-5.1.5" // {
dependencies = [
sources."thirty-two-1.0.2"
sources."uniq-1.0.1"
@@ -33044,7 +33700,7 @@ in
dependencies = [
sources."get-browser-rtc-1.0.2"
sources."randombytes-2.0.3"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -33058,7 +33714,7 @@ in
})
(sources."simple-websocket-4.1.0" // {
dependencies = [
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -33085,9 +33741,9 @@ in
})
];
})
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
sources."inherits-2.0.3"
@@ -33112,10 +33768,10 @@ in
peerflix-server = nodeEnv.buildNodePackage {
name = "peerflix-server";
packageName = "peerflix-server";
- version = "0.0.30";
+ version = "0.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.0.30.tgz";
- sha1 = "858a78e9ad0bdffa91997a6f0ca0bd809320ad98";
+ url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.1.tgz";
+ sha1 = "683d54067d44699b2eff8bfc793e780df2912666";
};
dependencies = [
(sources."connect-multiparty-1.2.5" // {
@@ -33332,30 +33988,133 @@ in
sources."xtend-4.0.1"
];
})
- (sources."socket.io-0.9.17" // {
+ (sources."socket.io-1.6.0" // {
dependencies = [
- (sources."socket.io-client-0.9.16" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."uglify-js-1.2.5"
- (sources."ws-0.4.32" // {
- dependencies = [
- sources."commander-2.1.0"
- sources."nan-1.0.0"
- sources."tinycolor-0.0.1"
- sources."options-0.0.6"
- ];
- })
- sources."xmlhttprequest-1.4.2"
- (sources."active-x-obfuscator-0.0.1" // {
- dependencies = [
- sources."zeparser-0.0.5"
- ];
- })
+ sources."ms-0.7.2"
+ ];
+ })
+ (sources."engine.io-1.8.0" // {
+ dependencies = [
+ (sources."accepts-1.3.3" // {
+ dependencies = [
+ (sources."mime-types-2.1.13" // {
+ dependencies = [
+ sources."mime-db-1.25.0"
+ ];
+ })
+ sources."negotiator-0.6.1"
+ ];
+ })
+ sources."base64id-0.1.0"
+ (sources."engine.io-parser-1.3.1" // {
+ dependencies = [
+ sources."after-0.8.1"
+ sources."arraybuffer.slice-0.0.6"
+ sources."base64-arraybuffer-0.1.5"
+ sources."blob-0.0.4"
+ (sources."has-binary-0.1.6" // {
+ dependencies = [
+ sources."isarray-0.0.1"
+ ];
+ })
+ sources."wtf-8-1.0.0"
+ ];
+ })
+ (sources."ws-1.1.1" // {
+ dependencies = [
+ sources."options-0.0.6"
+ sources."ultron-1.0.2"
+ ];
+ })
+ sources."cookie-0.3.1"
+ ];
+ })
+ (sources."has-binary-0.1.7" // {
+ dependencies = [
+ sources."isarray-0.0.1"
+ ];
+ })
+ sources."object-assign-4.1.0"
+ sources."socket.io-adapter-0.5.0"
+ (sources."socket.io-client-1.6.0" // {
+ dependencies = [
+ sources."backo2-1.0.2"
+ sources."component-bind-1.0.0"
+ sources."component-emitter-1.2.1"
+ (sources."engine.io-client-1.8.0" // {
+ dependencies = [
+ sources."component-inherit-0.0.3"
+ (sources."engine.io-parser-1.3.1" // {
+ dependencies = [
+ sources."after-0.8.1"
+ sources."arraybuffer.slice-0.0.6"
+ sources."base64-arraybuffer-0.1.5"
+ sources."blob-0.0.4"
+ (sources."has-binary-0.1.6" // {
+ dependencies = [
+ sources."isarray-0.0.1"
+ ];
+ })
+ sources."wtf-8-1.0.0"
+ ];
+ })
+ sources."has-cors-1.1.0"
+ (sources."parsejson-0.0.3" // {
+ dependencies = [
+ (sources."better-assert-1.0.2" // {
+ dependencies = [
+ sources."callsite-1.0.0"
+ ];
+ })
+ ];
+ })
+ (sources."parseqs-0.0.5" // {
+ dependencies = [
+ (sources."better-assert-1.0.2" // {
+ dependencies = [
+ sources."callsite-1.0.0"
+ ];
+ })
+ ];
+ })
+ (sources."ws-1.1.1" // {
+ dependencies = [
+ sources."options-0.0.6"
+ sources."ultron-1.0.2"
+ ];
+ })
+ sources."xmlhttprequest-ssl-1.5.3"
+ sources."yeast-0.1.2"
+ ];
+ })
+ sources."indexof-0.0.1"
+ sources."object-component-0.0.3"
+ (sources."parseuri-0.0.5" // {
+ dependencies = [
+ (sources."better-assert-1.0.2" // {
+ dependencies = [
+ sources."callsite-1.0.0"
+ ];
+ })
+ ];
+ })
+ sources."to-array-0.1.4"
+ ];
+ })
+ (sources."socket.io-parser-2.3.1" // {
+ dependencies = [
+ (sources."debug-2.2.0" // {
+ dependencies = [
+ sources."ms-0.7.1"
+ ];
+ })
+ sources."json3-3.3.2"
+ sources."component-emitter-1.1.2"
+ sources."isarray-0.0.1"
];
})
- sources."policyfile-0.0.4"
- sources."base64id-0.1.0"
- sources."redis-0.7.3"
];
})
(sources."torrent-stream-0.18.1" // {
@@ -33366,9 +34125,9 @@ in
sources."addr-to-ip-port-1.4.2"
sources."bencode-0.7.0"
sources."buffer-equal-0.0.1"
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
sources."inherits-2.0.3"
@@ -33403,9 +34162,9 @@ in
sources."bencode-0.6.0"
sources."bn.js-1.3.0"
sources."buffer-equal-0.0.1"
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
sources."extend.js-0.0.2"
@@ -33547,10 +34306,10 @@ in
dependencies = [
(sources."async-2.1.2" // {
dependencies = [
- sources."lodash-4.16.6"
+ sources."lodash-4.17.2"
];
})
- (sources."which-1.2.11" // {
+ (sources."which-1.2.12" // {
dependencies = [
sources."isexe-1.1.2"
];
@@ -33682,15 +34441,15 @@ in
dependencies = [
(sources."async-2.1.2" // {
dependencies = [
- sources."lodash-4.16.6"
+ sources."lodash-4.17.2"
];
})
];
})
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
sources."node-uuid-1.4.7"
@@ -33790,7 +34549,7 @@ in
sources."throttleit-1.0.0"
];
})
- (sources."which-1.2.11" // {
+ (sources."which-1.2.12" // {
dependencies = [
sources."isexe-1.1.2"
];
@@ -33959,9 +34718,9 @@ in
];
})
sources."cookie-signature-1.0.1"
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
];
@@ -33988,7 +34747,7 @@ in
})
(sources."openid-2.0.6" // {
dependencies = [
- (sources."request-2.78.0" // {
+ (sources."request-2.79.0" // {
dependencies = [
sources."aws-sign2-0.6.0"
sources."aws4-1.5.0"
@@ -34000,7 +34759,7 @@ in
})
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- (sources."form-data-2.1.1" // {
+ (sources."form-data-2.1.2" // {
dependencies = [
sources."asynckit-0.4.0"
];
@@ -34084,12 +34843,11 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
- sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
@@ -34099,6 +34857,7 @@ in
];
})
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
];
})
];
@@ -34108,7 +34867,7 @@ in
sources."sax-1.2.1"
(sources."xmlbuilder-4.2.1" // {
dependencies = [
- sources."lodash-4.16.6"
+ sources."lodash-4.17.2"
];
})
];
@@ -34160,9 +34919,9 @@ in
dependencies = [
(sources."accepts-1.2.13" // {
dependencies = [
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
sources."negotiator-0.5.3"
@@ -34244,12 +35003,12 @@ in
})
];
})
- (sources."type-is-1.6.13" // {
+ (sources."type-is-1.6.14" // {
dependencies = [
sources."media-typer-0.3.0"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
];
@@ -34290,12 +35049,12 @@ in
sources."unpipe-1.0.0"
];
})
- (sources."type-is-1.6.13" // {
+ (sources."type-is-1.6.14" // {
dependencies = [
sources."media-typer-0.3.0"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
];
@@ -34306,9 +35065,9 @@ in
dependencies = [
(sources."accepts-1.3.3" // {
dependencies = [
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
sources."negotiator-0.6.1"
@@ -34317,7 +35076,7 @@ in
sources."bytes-2.3.0"
(sources."compressible-2.0.9" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
(sources."debug-2.2.0" // {
@@ -34334,7 +35093,7 @@ in
sources."graceful-readlink-1.0.1"
];
})
- (sources."js-yaml-3.6.1" // {
+ (sources."js-yaml-3.7.0" // {
dependencies = [
(sources."argparse-1.0.9" // {
dependencies = [
@@ -34344,13 +35103,13 @@ in
sources."esprima-2.7.3"
];
})
- (sources."cookies-0.6.1" // {
+ (sources."cookies-0.6.2" // {
dependencies = [
sources."depd-1.1.0"
sources."keygrip-1.0.1"
];
})
- (sources."request-2.78.0" // {
+ (sources."request-2.79.0" // {
dependencies = [
sources."aws-sign2-0.6.0"
sources."aws4-1.5.0"
@@ -34362,7 +35121,7 @@ in
})
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- (sources."form-data-2.1.1" // {
+ (sources."form-data-2.1.2" // {
dependencies = [
sources."asynckit-0.4.0"
];
@@ -34441,12 +35200,11 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
- sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
@@ -34456,6 +35214,7 @@ in
];
})
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
];
})
sources."async-0.9.2"
@@ -34467,9 +35226,9 @@ in
sources."sigmund-1.0.1"
];
})
- (sources."bunyan-1.8.4" // {
+ (sources."bunyan-1.8.5" // {
dependencies = [
- (sources."dtrace-provider-0.7.1" // {
+ (sources."dtrace-provider-0.8.0" // {
dependencies = [
sources."nan-2.4.0"
];
@@ -34510,7 +35269,7 @@ in
];
})
sources."safe-json-stringify-1.0.3"
- sources."moment-2.15.2"
+ sources."moment-2.16.0"
];
})
(sources."handlebars-2.0.0" // {
@@ -34566,7 +35325,7 @@ in
})
sources."entities-1.1.1"
sources."inherits-2.0.3"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -34597,11 +35356,11 @@ in
];
})
sources."sinopia-htpasswd-0.4.5"
- (sources."http-errors-1.5.0" // {
+ (sources."http-errors-1.5.1" // {
dependencies = [
- sources."inherits-2.0.1"
- sources."setprototypeof-1.0.1"
- sources."statuses-1.3.0"
+ sources."inherits-2.0.3"
+ sources."setprototypeof-1.0.2"
+ sources."statuses-1.3.1"
];
})
(sources."readable-stream-1.1.14" // {
@@ -34667,12 +35426,12 @@ in
})
];
})
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
- sources."inherits-2.0.3"
sources."isarray-1.0.0"
+ sources."inherits-2.0.3"
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
@@ -34752,7 +35511,7 @@ in
})
];
})
- (sources."verror-1.8.1" // {
+ (sources."verror-1.9.0" // {
dependencies = [
sources."assert-plus-1.0.0"
sources."core-util-is-1.0.2"
@@ -34838,12 +35597,12 @@ in
(sources."sshpk-agent-1.2.1" // {
dependencies = [
sources."assert-plus-0.1.5"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
- sources."inherits-2.0.3"
sources."isarray-1.0.0"
+ sources."inherits-2.0.3"
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
@@ -34882,7 +35641,7 @@ in
(sources."cmdln-3.2.1" // {
dependencies = [
sources."extsprintf-1.3.0"
- (sources."verror-1.8.1" // {
+ (sources."verror-1.9.0" // {
dependencies = [
sources."assert-plus-1.0.0"
sources."core-util-is-1.0.2"
@@ -34923,9 +35682,9 @@ in
sources."minimist-0.0.8"
];
})
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
sources."sax-0.5.8"
@@ -35040,13 +35799,17 @@ in
titanium = nodeEnv.buildNodePackage {
name = "titanium";
packageName = "titanium";
- version = "5.0.10";
+ version = "5.0.11";
src = fetchurl {
- url = "https://registry.npmjs.org/titanium/-/titanium-5.0.10.tgz";
- sha1 = "9bbae581957b33265a71774e8fd9f4766441bf1d";
+ url = "https://registry.npmjs.org/titanium/-/titanium-5.0.11.tgz";
+ sha1 = "dd0f7132475a5db6ea188222876d28538b47df27";
};
dependencies = [
- sources."async-1.4.2"
+ (sources."async-2.1.2" // {
+ dependencies = [
+ sources."lodash-4.17.2"
+ ];
+ })
sources."colors-1.1.2"
(sources."fields-0.1.24" // {
dependencies = [
@@ -35055,7 +35818,7 @@ in
];
})
sources."humanize-0.0.9"
- (sources."longjohn-0.2.9" // {
+ (sources."longjohn-0.2.11" // {
dependencies = [
(sources."source-map-support-0.3.2" // {
dependencies = [
@@ -35068,20 +35831,23 @@ in
})
];
})
- sources."moment-2.10.6"
- (sources."node-appc-0.2.31" // {
+ sources."moment-2.16.0"
+ (sources."node-appc-0.2.39" // {
dependencies = [
sources."adm-zip-0.4.7"
- sources."diff-2.1.0"
- sources."node-uuid-1.4.3"
+ sources."async-1.5.2"
+ sources."diff-2.2.1"
+ sources."node-uuid-1.4.7"
(sources."optimist-0.6.1" // {
dependencies = [
sources."wordwrap-0.0.3"
sources."minimist-0.0.10"
];
})
- (sources."request-2.61.0" // {
+ (sources."request-2.69.0" // {
dependencies = [
+ sources."aws-sign2-0.6.0"
+ sources."aws4-1.5.0"
(sources."bl-1.0.3" // {
dependencies = [
(sources."readable-stream-2.0.6" // {
@@ -35097,57 +35863,24 @@ in
];
})
sources."caseless-0.11.0"
+ (sources."combined-stream-1.0.5" // {
+ dependencies = [
+ sources."delayed-stream-1.0.0"
+ ];
+ })
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
(sources."form-data-1.0.1" // {
dependencies = [
(sources."async-2.1.2" // {
dependencies = [
- sources."lodash-4.16.6"
+ sources."lodash-4.17.2"
];
})
];
})
- sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."har-validator-2.0.6" // {
dependencies = [
- sources."mime-db-1.24.0"
- ];
- })
- sources."qs-4.0.0"
- sources."tunnel-agent-0.4.3"
- (sources."tough-cookie-2.3.2" // {
- dependencies = [
- sources."punycode-1.4.1"
- ];
- })
- (sources."http-signature-0.11.0" // {
- dependencies = [
- sources."assert-plus-0.1.5"
- sources."asn1-0.1.11"
- sources."ctype-0.5.3"
- ];
- })
- sources."oauth-sign-0.8.2"
- (sources."hawk-3.1.3" // {
- dependencies = [
- sources."hoek-2.16.3"
- sources."boom-2.10.1"
- sources."cryptiles-2.0.5"
- sources."sntp-1.0.9"
- ];
- })
- sources."aws-sign2-0.5.0"
- sources."stringstream-0.0.5"
- (sources."combined-stream-1.0.5" // {
- dependencies = [
- sources."delayed-stream-1.0.0"
- ];
- })
- sources."isstream-0.1.2"
- (sources."har-validator-1.8.0" // {
- dependencies = [
- sources."bluebird-2.11.0"
(sources."chalk-1.1.3" // {
dependencies = [
sources."ansi-styles-2.2.1"
@@ -35182,102 +35915,135 @@ in
sources."xtend-4.0.1"
];
})
+ (sources."pinkie-promise-2.0.1" // {
+ dependencies = [
+ sources."pinkie-2.0.4"
+ ];
+ })
];
})
+ (sources."hawk-3.1.3" // {
+ dependencies = [
+ sources."hoek-2.16.3"
+ sources."boom-2.10.1"
+ sources."cryptiles-2.0.5"
+ sources."sntp-1.0.9"
+ ];
+ })
+ (sources."http-signature-1.1.1" // {
+ dependencies = [
+ sources."assert-plus-0.2.0"
+ (sources."jsprim-1.3.1" // {
+ dependencies = [
+ sources."extsprintf-1.0.2"
+ sources."json-schema-0.2.3"
+ sources."verror-1.3.6"
+ ];
+ })
+ (sources."sshpk-1.10.1" // {
+ dependencies = [
+ sources."asn1-0.2.3"
+ sources."assert-plus-1.0.0"
+ sources."dashdash-1.14.0"
+ sources."getpass-0.1.6"
+ sources."jsbn-0.1.0"
+ sources."tweetnacl-0.14.3"
+ sources."jodid25519-1.0.2"
+ sources."ecc-jsbn-0.1.1"
+ sources."bcrypt-pbkdf-1.0.0"
+ ];
+ })
+ ];
+ })
+ sources."is-typedarray-1.0.0"
+ sources."isstream-0.1.2"
+ sources."json-stringify-safe-5.0.1"
+ (sources."mime-types-2.1.13" // {
+ dependencies = [
+ sources."mime-db-1.25.0"
+ ];
+ })
+ sources."oauth-sign-0.8.2"
+ sources."qs-6.0.2"
+ sources."stringstream-0.0.5"
+ sources."tough-cookie-2.2.2"
+ sources."tunnel-agent-0.4.3"
];
})
- sources."semver-5.0.1"
- (sources."uglify-js-2.4.24" // {
+ sources."semver-5.1.0"
+ sources."wrench-1.5.8"
+ (sources."uglify-js-2.6.1" // {
dependencies = [
sources."async-0.2.10"
- (sources."source-map-0.1.34" // {
- dependencies = [
- sources."amdefine-1.0.1"
- ];
- })
+ sources."source-map-0.5.6"
sources."uglify-to-browserify-1.0.2"
- (sources."yargs-3.5.4" // {
+ (sources."yargs-3.10.0" // {
dependencies = [
sources."camelcase-1.2.1"
+ (sources."cliui-2.1.0" // {
+ dependencies = [
+ (sources."center-align-0.1.3" // {
+ dependencies = [
+ (sources."align-text-0.1.4" // {
+ dependencies = [
+ (sources."kind-of-3.0.4" // {
+ dependencies = [
+ sources."is-buffer-1.1.4"
+ ];
+ })
+ sources."longest-1.0.1"
+ sources."repeat-string-1.6.1"
+ ];
+ })
+ sources."lazy-cache-1.0.4"
+ ];
+ })
+ (sources."right-align-0.1.3" // {
+ dependencies = [
+ (sources."align-text-0.1.4" // {
+ dependencies = [
+ (sources."kind-of-3.0.4" // {
+ dependencies = [
+ sources."is-buffer-1.1.4"
+ ];
+ })
+ sources."longest-1.0.1"
+ sources."repeat-string-1.6.1"
+ ];
+ })
+ ];
+ })
+ sources."wordwrap-0.0.2"
+ ];
+ })
sources."decamelize-1.2.0"
sources."window-size-0.1.0"
- sources."wordwrap-0.0.2"
];
})
];
})
- sources."xmldom-0.1.19"
+ sources."xmldom-0.1.22"
];
})
- (sources."request-2.62.0" // {
+ (sources."request-2.78.0" // {
dependencies = [
- (sources."bl-1.0.3" // {
- dependencies = [
- (sources."readable-stream-2.0.6" // {
- dependencies = [
- sources."core-util-is-1.0.2"
- sources."inherits-2.0.3"
- sources."isarray-1.0.0"
- sources."process-nextick-args-1.0.7"
- sources."string_decoder-0.10.31"
- sources."util-deprecate-1.0.2"
- ];
- })
- ];
- })
+ sources."aws-sign2-0.6.0"
+ sources."aws4-1.5.0"
sources."caseless-0.11.0"
- sources."extend-3.0.0"
- sources."forever-agent-0.6.1"
- (sources."form-data-1.0.1" // {
- dependencies = [
- (sources."async-2.1.2" // {
- dependencies = [
- sources."lodash-4.16.6"
- ];
- })
- ];
- })
- sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
- dependencies = [
- sources."mime-db-1.24.0"
- ];
- })
- sources."node-uuid-1.4.7"
- sources."qs-5.1.0"
- sources."tunnel-agent-0.4.3"
- (sources."tough-cookie-2.3.2" // {
- dependencies = [
- sources."punycode-1.4.1"
- ];
- })
- (sources."http-signature-0.11.0" // {
- dependencies = [
- sources."assert-plus-0.1.5"
- sources."asn1-0.1.11"
- sources."ctype-0.5.3"
- ];
- })
- sources."oauth-sign-0.8.2"
- (sources."hawk-3.1.3" // {
- dependencies = [
- sources."hoek-2.16.3"
- sources."boom-2.10.1"
- sources."cryptiles-2.0.5"
- sources."sntp-1.0.9"
- ];
- })
- sources."aws-sign2-0.5.0"
- sources."stringstream-0.0.5"
(sources."combined-stream-1.0.5" // {
dependencies = [
sources."delayed-stream-1.0.0"
];
})
- sources."isstream-0.1.2"
- (sources."har-validator-1.8.0" // {
+ sources."extend-3.0.0"
+ sources."forever-agent-0.6.1"
+ (sources."form-data-2.1.2" // {
+ dependencies = [
+ sources."asynckit-0.4.0"
+ ];
+ })
+ (sources."har-validator-2.0.6" // {
dependencies = [
- sources."bluebird-2.11.0"
(sources."chalk-1.1.3" // {
dependencies = [
sources."ansi-styles-2.2.1"
@@ -35312,11 +36078,67 @@ in
sources."xtend-4.0.1"
];
})
+ (sources."pinkie-promise-2.0.1" // {
+ dependencies = [
+ sources."pinkie-2.0.4"
+ ];
+ })
];
})
+ (sources."hawk-3.1.3" // {
+ dependencies = [
+ sources."hoek-2.16.3"
+ sources."boom-2.10.1"
+ sources."cryptiles-2.0.5"
+ sources."sntp-1.0.9"
+ ];
+ })
+ (sources."http-signature-1.1.1" // {
+ dependencies = [
+ sources."assert-plus-0.2.0"
+ (sources."jsprim-1.3.1" // {
+ dependencies = [
+ sources."extsprintf-1.0.2"
+ sources."json-schema-0.2.3"
+ sources."verror-1.3.6"
+ ];
+ })
+ (sources."sshpk-1.10.1" // {
+ dependencies = [
+ sources."asn1-0.2.3"
+ sources."assert-plus-1.0.0"
+ sources."dashdash-1.14.0"
+ sources."getpass-0.1.6"
+ sources."jsbn-0.1.0"
+ sources."tweetnacl-0.14.3"
+ sources."jodid25519-1.0.2"
+ sources."ecc-jsbn-0.1.1"
+ sources."bcrypt-pbkdf-1.0.0"
+ ];
+ })
+ ];
+ })
+ sources."is-typedarray-1.0.0"
+ sources."isstream-0.1.2"
+ sources."json-stringify-safe-5.0.1"
+ (sources."mime-types-2.1.13" // {
+ dependencies = [
+ sources."mime-db-1.25.0"
+ ];
+ })
+ sources."node-uuid-1.4.7"
+ sources."oauth-sign-0.8.2"
+ sources."qs-6.3.0"
+ sources."stringstream-0.0.5"
+ (sources."tough-cookie-2.3.2" // {
+ dependencies = [
+ sources."punycode-1.4.1"
+ ];
+ })
+ sources."tunnel-agent-0.4.3"
];
})
- sources."semver-5.0.3"
+ sources."semver-5.3.0"
sources."sprintf-0.1.5"
(sources."temp-0.8.3" // {
dependencies = [
@@ -35324,7 +36146,7 @@ in
sources."rimraf-2.2.8"
];
})
- (sources."winston-1.0.2" // {
+ (sources."winston-1.1.2" // {
dependencies = [
sources."async-1.0.0"
sources."colors-1.0.3"
@@ -35335,7 +36157,7 @@ in
sources."stack-trace-0.0.9"
];
})
- sources."wrench-1.5.8"
+ sources."wrench-1.5.9"
];
buildInputs = globalBuildInputs;
meta = {
@@ -35348,10 +36170,10 @@ in
typescript = nodeEnv.buildNodePackage {
name = "typescript";
packageName = "typescript";
- version = "2.0.6";
+ version = "2.0.10";
src = fetchurl {
- url = "https://registry.npmjs.org/typescript/-/typescript-2.0.6.tgz";
- sha1 = "5385499ac9811508c2c43e0ea07a1ddca435e111";
+ url = "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz";
+ sha1 = "ccdd4ed86fd5550a407101a0814012e1b3fac3dd";
};
buildInputs = globalBuildInputs;
meta = {
@@ -35447,11 +36269,11 @@ in
];
})
sources."depd-1.1.0"
- (sources."http-errors-1.5.0" // {
+ (sources."http-errors-1.5.1" // {
dependencies = [
- sources."inherits-2.0.1"
- sources."setprototypeof-1.0.1"
- sources."statuses-1.3.0"
+ sources."inherits-2.0.3"
+ sources."setprototypeof-1.0.2"
+ sources."statuses-1.3.1"
];
})
sources."iconv-lite-0.4.13"
@@ -35466,12 +36288,12 @@ in
sources."unpipe-1.0.0"
];
})
- (sources."type-is-1.6.13" // {
+ (sources."type-is-1.6.14" // {
dependencies = [
sources."media-typer-0.3.0"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
];
@@ -35481,7 +36303,7 @@ in
(sources."color-0.11.4" // {
dependencies = [
sources."clone-1.0.2"
- (sources."color-convert-1.6.0" // {
+ (sources."color-convert-1.8.2" // {
dependencies = [
sources."color-name-1.1.1"
];
@@ -35509,9 +36331,9 @@ in
dependencies = [
(sources."accepts-1.2.13" // {
dependencies = [
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
sources."negotiator-0.5.3"
@@ -35566,12 +36388,12 @@ in
sources."statuses-1.2.1"
];
})
- (sources."type-is-1.6.13" // {
+ (sources."type-is-1.6.14" // {
dependencies = [
sources."media-typer-0.3.0"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
];
@@ -35719,8 +36541,8 @@ in
(sources."extract-opts-3.3.1" // {
dependencies = [
sources."eachr-3.2.0"
- sources."editions-1.3.1"
- sources."typechecker-4.3.0"
+ sources."editions-1.3.3"
+ sources."typechecker-4.4.0"
];
})
];
@@ -35731,7 +36553,7 @@ in
sources."underscore-1.5.2"
];
})
- sources."knockout-3.4.0"
+ sources."knockout-3.4.1"
sources."lodash-4.12.0"
(sources."mkdirp-0.5.1" // {
dependencies = [
@@ -35891,9 +36713,9 @@ in
dependencies = [
(sources."array-index-1.0.0" // {
dependencies = [
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
(sources."es6-symbol-3.1.0" // {
@@ -36095,9 +36917,9 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
sources."node-uuid-1.4.7"
@@ -36132,7 +36954,7 @@ in
sources."builtins-0.0.7"
];
})
- (sources."which-1.2.11" // {
+ (sources."which-1.2.12" // {
dependencies = [
sources."isexe-1.1.2"
];
@@ -36210,7 +37032,7 @@ in
sources."wrappy-1.0.2"
];
})
- (sources."request-2.78.0" // {
+ (sources."request-2.79.0" // {
dependencies = [
sources."aws-sign2-0.6.0"
sources."aws4-1.5.0"
@@ -36222,7 +37044,7 @@ in
})
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- (sources."form-data-2.1.1" // {
+ (sources."form-data-2.1.2" // {
dependencies = [
sources."asynckit-0.4.0"
];
@@ -36306,12 +37128,11 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
- sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
@@ -36321,6 +37142,7 @@ in
];
})
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
];
})
sources."retry-0.8.0"
@@ -36330,12 +37152,12 @@ in
(sources."are-we-there-yet-1.1.2" // {
dependencies = [
sources."delegates-1.0.0"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
- sources."inherits-2.0.3"
sources."isarray-1.0.0"
+ sources."inherits-2.0.3"
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
@@ -36615,9 +37437,9 @@ in
sources."component-emitter-1.1.2"
sources."methods-1.0.1"
sources."cookiejar-2.0.1"
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
sources."reduce-component-1.0.1"
@@ -36974,15 +37796,15 @@ in
dependencies = [
(sources."async-2.1.2" // {
dependencies = [
- sources."lodash-4.16.6"
+ sources."lodash-4.17.2"
];
})
];
})
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
sources."node-uuid-1.4.7"
@@ -37082,7 +37904,7 @@ in
sources."throttleit-1.0.0"
];
})
- (sources."which-1.2.11" // {
+ (sources."which-1.2.12" // {
dependencies = [
sources."isexe-1.1.2"
];
@@ -37142,12 +37964,12 @@ in
sources."prr-0.0.0"
];
})
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
- sources."inherits-2.0.3"
sources."isarray-1.0.0"
+ sources."inherits-2.0.3"
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
@@ -37401,7 +38223,7 @@ in
})
];
})
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -37424,12 +38246,12 @@ in
sources."abbrev-1.0.9"
];
})
- (sources."npmlog-4.0.0" // {
+ (sources."npmlog-4.0.1" // {
dependencies = [
(sources."are-we-there-yet-1.1.2" // {
dependencies = [
sources."delegates-1.0.0"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -37442,7 +38264,7 @@ in
];
})
sources."console-control-strings-1.1.0"
- (sources."gauge-2.6.0" // {
+ (sources."gauge-2.7.1" // {
dependencies = [
sources."aproba-1.0.4"
sources."has-color-0.1.7"
@@ -37478,7 +38300,7 @@ in
sources."strip-json-comments-1.0.4"
];
})
- (sources."request-2.78.0" // {
+ (sources."request-2.79.0" // {
dependencies = [
sources."aws-sign2-0.6.0"
sources."aws4-1.5.0"
@@ -37490,7 +38312,7 @@ in
})
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- (sources."form-data-2.1.1" // {
+ (sources."form-data-2.1.2" // {
dependencies = [
sources."asynckit-0.4.0"
];
@@ -37574,12 +38396,11 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- (sources."mime-types-2.1.12" // {
+ (sources."mime-types-2.1.13" // {
dependencies = [
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
];
})
- sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
@@ -37589,6 +38410,7 @@ in
];
})
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
];
})
(sources."rimraf-2.5.4" // {
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index b2202168ef67..6ece606398ac 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -229,13 +229,13 @@ let
sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
};
};
- "amdefine-1.0.0" = {
+ "amdefine-1.0.1" = {
name = "amdefine";
packageName = "amdefine";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz";
- sha1 = "fd17474700cb5cc9c2b709f0be9d23ce3c198c33";
+ url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
+ sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
};
};
"wordwrap-0.0.3" = {
@@ -310,13 +310,13 @@ let
sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217";
};
};
- "which-1.2.11" = {
+ "which-1.2.12" = {
name = "which";
packageName = "which";
- version = "1.2.11";
+ version = "1.2.12";
src = fetchurl {
- url = "https://registry.npmjs.org/which/-/which-1.2.11.tgz";
- sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b";
+ url = "https://registry.npmjs.org/which/-/which-1.2.12.tgz";
+ sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192";
};
};
"os-homedir-1.0.2" = {
@@ -418,13 +418,13 @@ let
sha1 = "afccda7d6e46632bf3e4016e573e2da1c8874b3a";
};
};
- "azure-arm-commerce-0.1.1" = {
+ "azure-arm-commerce-0.2.0" = {
name = "azure-arm-commerce";
packageName = "azure-arm-commerce";
- version = "0.1.1";
+ version = "0.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-0.1.1.tgz";
- sha1 = "3329693b8aba7d1b84e10ae2655d54262a1f1c59";
+ url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-0.2.0.tgz";
+ sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd";
};
};
"azure-arm-compute-0.19.0" = {
@@ -436,13 +436,13 @@ let
sha1 = "7dce93299d8f25f9fa689323b11565f9c774c83e";
};
};
- "azure-arm-hdinsight-0.2.0" = {
+ "azure-arm-hdinsight-0.2.2" = {
name = "azure-arm-hdinsight";
packageName = "azure-arm-hdinsight";
- version = "0.2.0";
+ version = "0.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.2.0.tgz";
- sha1 = "13d2cff9110485970bf063c7411eefe148e3790f";
+ url = "https://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.2.2.tgz";
+ sha1 = "3daeade6d26f6b115d8598320541ad2dcaa9516d";
};
};
"azure-arm-hdinsight-jobs-0.1.0" = {
@@ -463,13 +463,13 @@ let
sha1 = "4e38f8d72cd532e8ad3982d26f43f73f8fb2149f";
};
};
- "azure-arm-iothub-0.1.1" = {
+ "azure-arm-iothub-0.1.4" = {
name = "azure-arm-iothub";
packageName = "azure-arm-iothub";
- version = "0.1.1";
+ version = "0.1.4";
src = fetchurl {
- url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.1.tgz";
- sha1 = "edce480a3e1836745d0fcf8f0f1d8e0b2c022535";
+ url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.4.tgz";
+ sha1 = "58a0ba627216257a05d77f6aeeff8d0b45f9463d";
};
};
"azure-arm-servermanagement-0.1.2" = {
@@ -868,13 +868,13 @@ let
sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a";
};
};
- "moment-2.15.2" = {
+ "moment-2.16.0" = {
name = "moment";
packageName = "moment";
- version = "2.15.2";
+ version = "2.16.0";
src = fetchurl {
- url = "https://registry.npmjs.org/moment/-/moment-2.15.2.tgz";
- sha1 = "1bfdedf6a6e345f322fe956d5df5bd08a8ce84dc";
+ url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz";
+ sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e";
};
};
"ms-rest-1.15.2" = {
@@ -1102,13 +1102,13 @@ let
sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64";
};
};
- "jws-3.1.3" = {
+ "jws-3.1.4" = {
name = "jws";
packageName = "jws";
- version = "3.1.3";
+ version = "3.1.4";
src = fetchurl {
- url = "https://registry.npmjs.org/jws/-/jws-3.1.3.tgz";
- sha1 = "b88f1b4581a2c5ee8813c06b3fdf90ea9b5c7e6c";
+ url = "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz";
+ sha1 = "f9e8b9338e8a847277d6444b1464f61880e050a2";
};
};
"node-uuid-1.4.7" = {
@@ -1138,184 +1138,31 @@ let
sha1 = "fe4b81c1b152ebd8e1395265fedc5b00fca29b90";
};
};
- "base64url-1.0.6" = {
+ "base64url-2.0.0" = {
name = "base64url";
packageName = "base64url";
- version = "1.0.6";
- src = fetchurl {
- url = "https://registry.npmjs.org/base64url/-/base64url-1.0.6.tgz";
- sha1 = "d64d375d68a7c640d912e2358d170dca5bb54681";
- };
- };
- "jwa-1.1.3" = {
- name = "jwa";
- packageName = "jwa";
- version = "1.1.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/jwa/-/jwa-1.1.3.tgz";
- sha1 = "fa9f2f005ff0c630e7c41526a31f37f79733cd6d";
- };
- };
- "concat-stream-1.4.10" = {
- name = "concat-stream";
- packageName = "concat-stream";
- version = "1.4.10";
- src = fetchurl {
- url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz";
- sha1 = "acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36";
- };
- };
- "meow-2.0.0" = {
- name = "meow";
- packageName = "meow";
version = "2.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/meow/-/meow-2.0.0.tgz";
- sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1";
+ url = "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz";
+ sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb";
};
};
- "inherits-2.0.3" = {
- name = "inherits";
- packageName = "inherits";
- version = "2.0.3";
+ "jwa-1.1.4" = {
+ name = "jwa";
+ packageName = "jwa";
+ version = "1.1.4";
src = fetchurl {
- url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
- sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+ url = "https://registry.npmjs.org/jwa/-/jwa-1.1.4.tgz";
+ sha1 = "dbb01bd38cd409899fa715107e90d90f9bcb161e";
};
};
- "typedarray-0.0.6" = {
- name = "typedarray";
- packageName = "typedarray";
- version = "0.0.6";
+ "safe-buffer-5.0.1" = {
+ name = "safe-buffer";
+ packageName = "safe-buffer";
+ version = "5.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
- sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
- };
- };
- "readable-stream-1.1.14" = {
- name = "readable-stream";
- packageName = "readable-stream";
- version = "1.1.14";
- src = fetchurl {
- url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz";
- sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
- };
- };
- "core-util-is-1.0.2" = {
- name = "core-util-is";
- packageName = "core-util-is";
- version = "1.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
- sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
- };
- };
- "isarray-0.0.1" = {
- name = "isarray";
- packageName = "isarray";
- version = "0.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
- sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
- };
- };
- "string_decoder-0.10.31" = {
- name = "string_decoder";
- packageName = "string_decoder";
- version = "0.10.31";
- src = fetchurl {
- url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
- sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
- };
- };
- "camelcase-keys-1.0.0" = {
- name = "camelcase-keys";
- packageName = "camelcase-keys";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz";
- sha1 = "bd1a11bf9b31a1ce493493a930de1a0baf4ad7ec";
- };
- };
- "indent-string-1.2.2" = {
- name = "indent-string";
- packageName = "indent-string";
- version = "1.2.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/indent-string/-/indent-string-1.2.2.tgz";
- sha1 = "db99bcc583eb6abbb1e48dcbb1999a986041cb6b";
- };
- };
- "minimist-1.2.0" = {
- name = "minimist";
- packageName = "minimist";
- version = "1.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
- sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
- };
- };
- "object-assign-1.0.0" = {
- name = "object-assign";
- packageName = "object-assign";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz";
- sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6";
- };
- };
- "camelcase-1.2.1" = {
- name = "camelcase";
- packageName = "camelcase";
- version = "1.2.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
- sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
- };
- };
- "map-obj-1.0.1" = {
- name = "map-obj";
- packageName = "map-obj";
- version = "1.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz";
- sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d";
- };
- };
- "get-stdin-4.0.1" = {
- name = "get-stdin";
- packageName = "get-stdin";
- version = "4.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
- sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
- };
- };
- "repeating-1.1.3" = {
- name = "repeating";
- packageName = "repeating";
- version = "1.1.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz";
- sha1 = "3d4114218877537494f97f77f9785fab810fa4ac";
- };
- };
- "is-finite-1.0.2" = {
- name = "is-finite";
- packageName = "is-finite";
- version = "1.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
- sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
- };
- };
- "number-is-nan-1.0.1" = {
- name = "number-is-nan";
- packageName = "number-is-nan";
- version = "1.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
- sha1 = "097b602b53422a522c1afb8790318336941a011d";
+ url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
+ sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
};
};
"buffer-equal-constant-time-1.0.1" = {
@@ -1462,6 +1309,24 @@ let
sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd";
};
};
+ "core-util-is-1.0.2" = {
+ name = "core-util-is";
+ packageName = "core-util-is";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+ sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+ };
+ };
+ "inherits-2.0.3" = {
+ name = "inherits";
+ packageName = "inherits";
+ version = "2.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+ sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+ };
+ };
"isarray-1.0.0" = {
name = "isarray";
packageName = "isarray";
@@ -1480,6 +1345,15 @@ let
sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
};
};
+ "string_decoder-0.10.31" = {
+ name = "string_decoder";
+ packageName = "string_decoder";
+ version = "0.10.31";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+ sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+ };
+ };
"util-deprecate-1.0.2" = {
name = "util-deprecate";
packageName = "util-deprecate";
@@ -1831,6 +1705,15 @@ let
sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21";
};
};
+ "isarray-0.0.1" = {
+ name = "isarray";
+ packageName = "isarray";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+ sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+ };
+ };
"aws-sign2-0.6.0" = {
name = "aws-sign2";
packageName = "aws-sign2";
@@ -1948,13 +1831,13 @@ let
sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
};
};
- "mime-types-2.1.12" = {
+ "mime-types-2.1.13" = {
name = "mime-types";
packageName = "mime-types";
- version = "2.1.12";
+ version = "2.1.13";
src = fetchurl {
- url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz";
- sha1 = "152ba256777020dd4663f54c2e7bc26381e71729";
+ url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz";
+ sha1 = "e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88";
};
};
"oauth-sign-0.8.2" = {
@@ -2020,13 +1903,13 @@ let
sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385";
};
};
- "lodash-4.16.4" = {
+ "lodash-4.17.2" = {
name = "lodash";
packageName = "lodash";
- version = "4.16.4";
+ version = "4.17.2";
src = fetchurl {
- url = "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz";
- sha1 = "01ce306b9bad1319f2a5528674f88297aeb70127";
+ url = "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz";
+ sha1 = "34a3055babe04ce42467b607d700072c7ff6bf42";
};
};
"chalk-1.1.3" = {
@@ -2353,13 +2236,13 @@ let
sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4";
};
};
- "mime-db-1.24.0" = {
+ "mime-db-1.25.0" = {
name = "mime-db";
packageName = "mime-db";
- version = "1.24.0";
+ version = "1.25.0";
src = fetchurl {
- url = "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz";
- sha1 = "e2d13f939f0016c6e4e9ad25a8652f126c467f0c";
+ url = "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz";
+ sha1 = "c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392";
};
};
"punycode-1.4.1" = {
@@ -2416,6 +2299,15 @@ let
sha1 = "0c989774f2870c69378aa665648cdc60f343aa53";
};
};
+ "concat-stream-1.5.2" = {
+ name = "concat-stream";
+ packageName = "concat-stream";
+ version = "1.5.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz";
+ sha1 = "708978624d856af41a5a741defdd261da752c266";
+ };
+ };
"http-response-object-1.1.0" = {
name = "http-response-object";
packageName = "http-response-object";
@@ -2434,6 +2326,15 @@ let
sha1 = "6678b32fa0ca218fe569981bbd8871b594060d81";
};
};
+ "typedarray-0.0.6" = {
+ name = "typedarray";
+ packageName = "typedarray";
+ version = "0.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
+ sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
+ };
+ };
"http-basic-2.5.1" = {
name = "http-basic";
packageName = "http-basic";
@@ -2497,13 +2398,13 @@ let
sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4";
};
};
- "bower-1.7.9" = {
+ "bower-1.8.0" = {
name = "bower";
packageName = "bower";
- version = "1.7.9";
+ version = "1.8.0";
src = fetchurl {
- url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz";
- sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0";
+ url = "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz";
+ sha1 = "55dbebef0ad9155382d9e9d3e497c1372345b44a";
};
};
"bower-endpoint-parser-0.2.1" = {
@@ -2749,13 +2650,13 @@ let
sha1 = "6b83370546c55ab6ade2bf75e83c66e45989bbf0";
};
};
- "statuses-1.3.0" = {
+ "statuses-1.3.1" = {
name = "statuses";
packageName = "statuses";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz";
- sha1 = "8e55758cb20e7682c1f4fce8dcab30bf01d1e07a";
+ url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz";
+ sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e";
};
};
"timed-out-2.0.0" = {
@@ -2776,13 +2677,13 @@ let
sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e";
};
};
- "readable-stream-2.1.5" = {
+ "readable-stream-2.2.2" = {
name = "readable-stream";
packageName = "readable-stream";
- version = "2.1.5";
+ version = "2.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz";
- sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0";
+ url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz";
+ sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e";
};
};
"stream-shift-1.0.0" = {
@@ -2839,6 +2740,24 @@ let
sha1 = "5b46f80147edee578870f086d04821cf998e551f";
};
};
+ "map-obj-1.0.1" = {
+ name = "map-obj";
+ packageName = "map-obj";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz";
+ sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d";
+ };
+ };
+ "minimist-1.2.0" = {
+ name = "minimist";
+ packageName = "minimist";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
+ sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+ };
+ };
"normalize-package-data-2.3.5" = {
name = "normalize-package-data";
packageName = "normalize-package-data";
@@ -3028,13 +2947,13 @@ let
sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441";
};
};
- "graceful-fs-4.1.9" = {
+ "graceful-fs-4.1.10" = {
name = "graceful-fs";
packageName = "graceful-fs";
- version = "4.1.9";
+ version = "4.1.10";
src = fetchurl {
- url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.9.tgz";
- sha1 = "baacba37d19d11f9d146d3578bc99958c3787e29";
+ url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.10.tgz";
+ sha1 = "f2d720c22092f743228775c75e3612632501f131";
};
};
"parse-json-2.2.0" = {
@@ -3118,6 +3037,33 @@ let
sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
};
};
+ "is-finite-1.0.2" = {
+ name = "is-finite";
+ packageName = "is-finite";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
+ sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
+ };
+ };
+ "number-is-nan-1.0.1" = {
+ name = "number-is-nan";
+ packageName = "number-is-nan";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
+ sha1 = "097b602b53422a522c1afb8790318336941a011d";
+ };
+ };
+ "get-stdin-4.0.1" = {
+ name = "get-stdin";
+ packageName = "get-stdin";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
+ sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
+ };
+ };
"sort-keys-1.1.2" = {
name = "sort-keys";
packageName = "sort-keys";
@@ -3172,22 +3118,22 @@ let
sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e";
};
};
- "debug-2.2.0" = {
+ "debug-2.3.3" = {
name = "debug";
packageName = "debug";
- version = "2.2.0";
+ version = "2.3.3";
src = fetchurl {
- url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
- sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
+ url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
+ sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
};
};
- "ms-0.7.1" = {
+ "ms-0.7.2" = {
name = "ms";
packageName = "ms";
- version = "0.7.1";
+ version = "0.7.2";
src = fetchurl {
- url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
- sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
+ url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz";
+ sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765";
};
};
"rimraf-2.2.8" = {
@@ -3262,15 +3208,6 @@ let
sha1 = "d1094c577fbd9a8b8bd43c96af6188aa205d05f4";
};
};
- "concat-stream-1.5.2" = {
- name = "concat-stream";
- packageName = "concat-stream";
- version = "1.5.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz";
- sha1 = "708978624d856af41a5a741defdd261da752c266";
- };
- };
"console-browserify-1.1.0" = {
name = "console-browserify";
packageName = "console-browserify";
@@ -3487,13 +3424,13 @@ let
sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
};
};
- "stream-http-2.4.1" = {
+ "stream-http-2.5.0" = {
name = "stream-http";
packageName = "stream-http";
- version = "2.4.1";
+ version = "2.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/stream-http/-/stream-http-2.4.1.tgz";
- sha1 = "8ee5689ae69169e8eb8edd6aeb2ca08ab47e8f59";
+ url = "https://registry.npmjs.org/stream-http/-/stream-http-2.5.0.tgz";
+ sha1 = "585eee513217ed98fe199817e7313b6f772a6802";
};
};
"subarg-1.0.0" = {
@@ -3865,13 +3802,13 @@ let
sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573";
};
};
- "asn1.js-4.8.1" = {
+ "asn1.js-4.9.0" = {
name = "asn1.js";
packageName = "asn1.js";
- version = "4.8.1";
+ version = "4.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.8.1.tgz";
- sha1 = "3949b7f5fd1e8bedc13be3abebf477f93490c810";
+ url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.0.tgz";
+ sha1 = "f71a1243f3e79d46d7b07d7fbf4824ee73af054a";
};
};
"ripemd160-1.0.1" = {
@@ -3883,13 +3820,13 @@ let
sha1 = "93a4bbd4942bc574b69a8fa57c71de10ecca7d6e";
};
};
- "sha.js-2.4.5" = {
+ "sha.js-2.4.8" = {
name = "sha.js";
packageName = "sha.js";
- version = "2.4.5";
+ version = "2.4.8";
src = fetchurl {
- url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz";
- sha1 = "27d171efcc82a118b99639ff581660242b506e7c";
+ url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz";
+ sha1 = "37068c2c476b6baf402d14a49c67f597921f634f";
};
};
"miller-rabin-4.0.0" = {
@@ -4468,6 +4405,15 @@ let
sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78";
};
};
+ "object-assign-1.0.0" = {
+ name = "object-assign";
+ packageName = "object-assign";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz";
+ sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6";
+ };
+ };
"airplay-js-0.2.16" = {
name = "airplay-js";
packageName = "airplay-js";
@@ -4576,13 +4522,13 @@ let
sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb";
};
};
- "mdns-js-0.5.0" = {
+ "mdns-js-0.5.1" = {
name = "mdns-js";
packageName = "mdns-js";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.0.tgz";
- sha1 = "4c8abb6ba7cabdc892d39228c3faa2556e09cf87";
+ url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.1.tgz";
+ sha1 = "a7ffa47e506e1c0f39bb9cd47c8fa4999e7bc4ec";
};
};
"plist-2.0.1" = {
@@ -4594,13 +4540,13 @@ let
sha1 = "0a32ca9481b1c364e92e18dc55c876de9d01da8b";
};
};
- "mdns-js-packet-0.2.0" = {
- name = "mdns-js-packet";
- packageName = "mdns-js-packet";
- version = "0.2.0";
+ "dns-js-0.2.1" = {
+ name = "dns-js";
+ packageName = "dns-js";
+ version = "0.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.2.0.tgz";
- sha1 = "642409e8183c7561cc60615bbd1420ec2fad7616";
+ url = "https://registry.npmjs.org/dns-js/-/dns-js-0.2.1.tgz";
+ sha1 = "5d66629b3c0e6a5eb0e14f0ae701d05f6ea46673";
};
};
"semver-5.1.1" = {
@@ -4720,13 +4666,13 @@ let
sha1 = "122e161591e21ff4c52530305693f20e6393a398";
};
};
- "magnet-uri-5.1.4" = {
+ "magnet-uri-5.1.5" = {
name = "magnet-uri";
packageName = "magnet-uri";
- version = "5.1.4";
+ version = "5.1.5";
src = fetchurl {
- url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.4.tgz";
- sha1 = "225db1f8670a944db87a5fbe27e2d90350513403";
+ url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.5.tgz";
+ sha1 = "be6abbf2648796c6d6e36e66416f7e0feecf2df8";
};
};
"parse-torrent-file-4.0.0" = {
@@ -4981,13 +4927,13 @@ let
sha1 = "3db1525aac0367b67bd2e532d2773e7c40be2e68";
};
};
- "ip-1.1.3" = {
+ "ip-1.1.4" = {
name = "ip";
packageName = "ip";
- version = "1.1.3";
+ version = "1.1.4";
src = fetchurl {
- url = "https://registry.npmjs.org/ip/-/ip-1.1.3.tgz";
- sha1 = "12b16294a38925486d618a1103506e4eb4f8b296";
+ url = "https://registry.npmjs.org/ip/-/ip-1.1.4.tgz";
+ sha1 = "de8247ffef940451832550fba284945e6e039bfb";
};
};
"magnet-uri-4.2.3" = {
@@ -5071,6 +5017,15 @@ let
sha1 = "ae43eb7745f5fe63dcc2f277cb4164ad27087f30";
};
};
+ "readable-stream-1.1.14" = {
+ name = "readable-stream";
+ packageName = "readable-stream";
+ version = "1.1.14";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz";
+ sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
+ };
+ };
"bncode-0.2.3" = {
name = "bncode";
packageName = "bncode";
@@ -5557,13 +5512,13 @@ let
sha1 = "be6ca7c76e4a57d930cc80f6b31fbd80ca86045c";
};
};
- "exit-on-epipe-0.0.1" = {
+ "exit-on-epipe-0.1.0" = {
name = "exit-on-epipe";
packageName = "exit-on-epipe";
- version = "0.0.1";
+ version = "0.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-0.0.1.tgz";
- sha1 = "ea41650007098c8444519a5d48958170c4ad929b";
+ url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-0.1.0.tgz";
+ sha1 = "aa2f0155b78b34fe60dd2b462e84637ba5ed0697";
};
};
"sax-1.2.1" = {
@@ -5719,13 +5674,13 @@ let
sha1 = "364200d5f13646ca8bcd44490271335614792300";
};
};
- "big-integer-1.6.16" = {
+ "big-integer-1.6.17" = {
name = "big-integer";
packageName = "big-integer";
- version = "1.6.16";
+ version = "1.6.17";
src = fetchurl {
- url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.16.tgz";
- sha1 = "0ca30b58013db46b10084a09242ca1d8954724cc";
+ url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.17.tgz";
+ sha1 = "f0dcf5109a949e42a993ee3e8fb2070452817b51";
};
};
"sax-0.3.5" = {
@@ -6052,13 +6007,22 @@ let
sha1 = "d5b680a165b6201739acb611542aabc2d8ceb070";
};
};
- "compressible-2.0.8" = {
+ "compressible-2.0.9" = {
name = "compressible";
packageName = "compressible";
- version = "2.0.8";
+ version = "2.0.9";
src = fetchurl {
- url = "https://registry.npmjs.org/compressible/-/compressible-2.0.8.tgz";
- sha1 = "7162e6c46d3b9d200ffb45cb4e4a0f7832732503";
+ url = "https://registry.npmjs.org/compressible/-/compressible-2.0.9.tgz";
+ sha1 = "6daab4e2b599c2770dd9e21e7a891b1c5a755425";
+ };
+ };
+ "debug-2.2.0" = {
+ name = "debug";
+ packageName = "debug";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
+ sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
};
};
"on-headers-1.0.1" = {
@@ -6088,6 +6052,15 @@ let
sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9";
};
};
+ "ms-0.7.1" = {
+ name = "ms";
+ packageName = "ms";
+ version = "0.7.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
+ sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
+ };
+ };
"array-flatten-1.1.1" = {
name = "array-flatten";
packageName = "array-flatten";
@@ -6268,13 +6241,13 @@ let
sha1 = "d6cce7693505f733c759de57befc1af76c0f0805";
};
};
- "type-is-1.6.13" = {
+ "type-is-1.6.14" = {
name = "type-is";
packageName = "type-is";
- version = "1.6.13";
+ version = "1.6.14";
src = fetchurl {
- url = "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz";
- sha1 = "6e83ba7bc30cd33a7bb0b7fb00737a2085bf9d08";
+ url = "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz";
+ sha1 = "e219639c17ded1ca0789092dd54a03826b817cb2";
};
};
"utils-merge-1.0.0" = {
@@ -6331,22 +6304,22 @@ let
sha1 = "978857442c44749e4206613e37946205826abd80";
};
};
- "http-errors-1.5.0" = {
+ "http-errors-1.5.1" = {
name = "http-errors";
packageName = "http-errors";
- version = "1.5.0";
+ version = "1.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz";
- sha1 = "b1cb3d8260fd8e2386cad3189045943372d48211";
+ url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz";
+ sha1 = "788c0d2c1de2c81b9e6e8c01843b6b97eb920750";
};
};
- "setprototypeof-1.0.1" = {
+ "setprototypeof-1.0.2" = {
name = "setprototypeof";
packageName = "setprototypeof";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz";
- sha1 = "52009b27888c4dc48f591949c0a8275834c1ca7e";
+ url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz";
+ sha1 = "81a552141ec104b88e89ce383103ad5c66564d08";
};
};
"media-typer-0.3.0" = {
@@ -6727,6 +6700,15 @@ let
sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067";
};
};
+ "readable-stream-2.1.5" = {
+ name = "readable-stream";
+ packageName = "readable-stream";
+ version = "2.1.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz";
+ sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0";
+ };
+ };
"realize-package-specifier-3.0.3" = {
name = "realize-package-specifier";
packageName = "realize-package-specifier";
@@ -6952,22 +6934,22 @@ let
sha1 = "bd968567d61635e33c0b80727613c9cb4b096bac";
};
};
- "request-2.76.0" = {
+ "request-2.79.0" = {
name = "request";
packageName = "request";
- version = "2.76.0";
+ version = "2.79.0";
src = fetchurl {
- url = "https://registry.npmjs.org/request/-/request-2.76.0.tgz";
- sha1 = "be44505afef70360a0436955106be3945d95560e";
+ url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz";
+ sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de";
};
};
- "form-data-2.1.1" = {
+ "form-data-2.1.2" = {
name = "form-data";
packageName = "form-data";
- version = "2.1.1";
+ version = "2.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/form-data/-/form-data-2.1.1.tgz";
- sha1 = "4adf0342e1a79afa1e84c8c320a9ffc82392a1f3";
+ url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz";
+ sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4";
};
};
"qs-6.3.0" = {
@@ -6979,6 +6961,15 @@ let
sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442";
};
};
+ "uuid-3.0.0" = {
+ name = "uuid";
+ packageName = "uuid";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz";
+ sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
+ };
+ };
"asynckit-0.4.0" = {
name = "asynckit";
packageName = "asynckit";
@@ -7411,13 +7402,13 @@ let
sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789";
};
};
- "code-point-at-1.0.1" = {
+ "code-point-at-1.1.0" = {
name = "code-point-at";
packageName = "code-point-at";
- version = "1.0.1";
+ version = "1.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.1.tgz";
- sha1 = "1104cd34f9b5b45d3eba88f1babc1924e1ce35fb";
+ url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
+ sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
};
};
"is-fullwidth-code-point-1.0.0" = {
@@ -7483,6 +7474,15 @@ let
sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb";
};
};
+ "repeating-1.1.3" = {
+ name = "repeating";
+ packageName = "repeating";
+ version = "1.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz";
+ sha1 = "3d4114218877537494f97f77f9785fab810fa4ac";
+ };
+ };
"semver-diff-2.1.0" = {
name = "semver-diff";
packageName = "semver-diff";
@@ -8126,13 +8126,13 @@ let
sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779";
};
};
- "verror-1.8.1" = {
+ "verror-1.9.0" = {
name = "verror";
packageName = "verror";
- version = "1.8.1";
+ version = "1.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/verror/-/verror-1.8.1.tgz";
- sha1 = "157589400a2d14570a62f2d5dd6a0f6214be3029";
+ url = "https://registry.npmjs.org/verror/-/verror-1.9.0.tgz";
+ sha1 = "107a8a2d14c33586fc4bb830057cd2d19ae2a6ee";
};
};
"extsprintf-1.3.0" = {
@@ -8225,13 +8225,13 @@ let
sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd";
};
};
- "basic-auth-1.0.4" = {
+ "basic-auth-1.1.0" = {
name = "basic-auth";
packageName = "basic-auth";
- version = "1.0.4";
+ version = "1.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz";
- sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290";
+ url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz";
+ sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884";
};
};
"cors-2.8.1" = {
@@ -8477,13 +8477,13 @@ let
sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b";
};
};
- "ltgt-2.1.2" = {
+ "ltgt-2.1.3" = {
name = "ltgt";
packageName = "ltgt";
- version = "2.1.2";
+ version = "2.1.3";
src = fetchurl {
- url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.2.tgz";
- sha1 = "e7472324fee690afc0d5ecf900403ce5788a311d";
+ url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.3.tgz";
+ sha1 = "10851a06d9964b971178441c23c9e52698eece34";
};
};
"pull-level-2.0.3" = {
@@ -8495,13 +8495,13 @@ let
sha1 = "9500635e257945d6feede185f5d7a24773455b17";
};
};
- "pull-stream-3.4.5" = {
+ "pull-stream-3.5.0" = {
name = "pull-stream";
packageName = "pull-stream";
- version = "3.4.5";
+ version = "3.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.4.5.tgz";
- sha1 = "dab04df30f28d1da8db0f236805f25436b01ba72";
+ url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.5.0.tgz";
+ sha1 = "1ee5b6f76fd3b3a49a5afb6ded5c0320acb3cfc7";
};
};
"typewiselite-1.0.0" = {
@@ -8729,13 +8729,13 @@ let
sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25";
};
};
- "got-6.5.0" = {
+ "got-6.6.3" = {
name = "got";
packageName = "got";
- version = "6.5.0";
+ version = "6.6.3";
src = fetchurl {
- url = "https://registry.npmjs.org/got/-/got-6.5.0.tgz";
- sha1 = "67dcc727db871c7b250320860180e24d2db18a04";
+ url = "https://registry.npmjs.org/got/-/got-6.6.3.tgz";
+ sha1 = "ff72c56d7f040eb8918ffb80fb62bcaf489d4eec";
};
};
"lodash.debounce-4.0.8" = {
@@ -8810,6 +8810,15 @@ let
sha1 = "298067659cb68a2b4670abbefde02a3819981f5b";
};
};
+ "timed-out-3.0.0" = {
+ name = "timed-out";
+ packageName = "timed-out";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/timed-out/-/timed-out-3.0.0.tgz";
+ sha1 = "ff88de96030ce960eabd42487db61d3add229273";
+ };
+ };
"url-parse-lax-1.0.0" = {
name = "url-parse-lax";
packageName = "url-parse-lax";
@@ -8891,13 +8900,13 @@ let
sha1 = "c392990c3e684783d838b8c84a45d8a048458361";
};
};
- "globals-9.12.0" = {
+ "globals-9.14.0" = {
name = "globals";
packageName = "globals";
- version = "9.12.0";
+ version = "9.14.0";
src = fetchurl {
- url = "https://registry.npmjs.org/globals/-/globals-9.12.0.tgz";
- sha1 = "992ce90828c3a55fa8f16fada177adb64664cf9d";
+ url = "https://registry.npmjs.org/globals/-/globals-9.14.0.tgz";
+ sha1 = "8859936af0038741263053b39d0e76ca241e4034";
};
};
"ignore-3.2.0" = {
@@ -8927,13 +8936,13 @@ let
sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62";
};
};
- "js-yaml-3.6.1" = {
+ "js-yaml-3.7.0" = {
name = "js-yaml";
packageName = "js-yaml";
- version = "3.6.1";
+ version = "3.7.0";
src = fetchurl {
- url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz";
- sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30";
+ url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
+ sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
};
};
"json-stable-stringify-1.0.1" = {
@@ -8981,13 +8990,13 @@ let
sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45";
};
};
- "require-uncached-1.0.2" = {
+ "require-uncached-1.0.3" = {
name = "require-uncached";
packageName = "require-uncached";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.2.tgz";
- sha1 = "67dad3b733089e77030124678a459589faf6a7ec";
+ url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz";
+ sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3";
};
};
"strip-bom-3.0.0" = {
@@ -9305,13 +9314,13 @@ let
sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
};
};
- "ajv-4.8.2" = {
+ "ajv-4.9.0" = {
name = "ajv";
packageName = "ajv";
- version = "4.8.2";
+ version = "4.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/ajv/-/ajv-4.8.2.tgz";
- sha1 = "65486936ca36fea39a1504332a78bebd5d447bdc";
+ url = "https://registry.npmjs.org/ajv/-/ajv-4.9.0.tgz";
+ sha1 = "5a358085747b134eb567d6d15e015f1d7802f45c";
};
};
"ajv-keywords-1.1.1" = {
@@ -9404,13 +9413,13 @@ let
sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6";
};
};
- "forever-monitor-1.6.0" = {
+ "forever-monitor-1.7.1" = {
name = "forever-monitor";
packageName = "forever-monitor";
- version = "1.6.0";
+ version = "1.7.1";
src = fetchurl {
- url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.6.0.tgz";
- sha1 = "3de1afd3e49f25712987281a252c02cb2463ad40";
+ url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.7.1.tgz";
+ sha1 = "5d820f4a3a78db2d81ae2671f158b9e86a091bb8";
};
};
"nconf-0.6.9" = {
@@ -9512,15 +9521,6 @@ let
sha1 = "2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2";
};
};
- "minimatch-2.0.10" = {
- name = "minimatch";
- packageName = "minimatch";
- version = "2.0.10";
- src = fetchurl {
- url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz";
- sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7";
- };
- };
"ps-tree-0.0.3" = {
name = "ps-tree";
packageName = "ps-tree";
@@ -9584,13 +9584,13 @@ let
sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78";
};
};
- "fsevents-1.0.14" = {
+ "fsevents-1.0.15" = {
name = "fsevents";
packageName = "fsevents";
- version = "1.0.14";
+ version = "1.0.15";
src = fetchurl {
- url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.14.tgz";
- sha1 = "558e8cc38643d8ef40fe45158486d0d25758eee4";
+ url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.15.tgz";
+ sha1 = "fa63f590f3c2ad91275e4972a6cea545fb0aae44";
};
};
"micromatch-2.3.11" = {
@@ -9881,13 +9881,13 @@ let
sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017";
};
};
- "npmlog-4.0.0" = {
+ "npmlog-4.0.1" = {
name = "npmlog";
packageName = "npmlog";
- version = "4.0.0";
+ version = "4.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.0.tgz";
- sha1 = "e094503961c70c1774eb76692080e8d578a9f88f";
+ url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.1.tgz";
+ sha1 = "d14f503b4cd79710375553004ba96e6662fbc0b8";
};
};
"tar-pack-3.3.0" = {
@@ -9908,13 +9908,13 @@ let
sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
};
};
- "gauge-2.6.0" = {
+ "gauge-2.7.1" = {
name = "gauge";
packageName = "gauge";
- version = "2.6.0";
+ version = "2.7.1";
src = fetchurl {
- url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz";
- sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46";
+ url = "https://registry.npmjs.org/gauge/-/gauge-2.7.1.tgz";
+ sha1 = "388473894fe8be5e13ffcdb8b93e4ed0616428c7";
};
};
"set-blocking-2.0.0" = {
@@ -10116,13 +10116,13 @@ let
sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6";
};
};
- "clean-css-3.4.20" = {
+ "clean-css-3.4.21" = {
name = "clean-css";
packageName = "clean-css";
- version = "3.4.20";
+ version = "3.4.21";
src = fetchurl {
- url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.20.tgz";
- sha1 = "c0d8963b5448e030f0bcd3ddd0dac4dfe3dea501";
+ url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.21.tgz";
+ sha1 = "2101d5dbd19d63dbc16a75ebd570e7c33948f65b";
};
};
"commander-2.6.0" = {
@@ -10296,6 +10296,15 @@ let
sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
};
};
+ "camelcase-1.2.1" = {
+ name = "camelcase";
+ packageName = "camelcase";
+ version = "1.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
+ sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
+ };
+ };
"cliui-2.1.0" = {
name = "cliui";
packageName = "cliui";
@@ -10413,22 +10422,22 @@ let
sha1 = "a98f2ff67183d8ba7cfaca10548bd7ff0550b385";
};
};
- "orchestrator-0.3.7" = {
+ "orchestrator-0.3.8" = {
name = "orchestrator";
packageName = "orchestrator";
- version = "0.3.7";
+ version = "0.3.8";
src = fetchurl {
- url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz";
- sha1 = "c45064e22c5a2a7b99734f409a95ffedc7d3c3df";
+ url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz";
+ sha1 = "14e7e9e2764f7315fbac184e506c7aa6df94ad7e";
};
};
- "pretty-hrtime-1.0.2" = {
+ "pretty-hrtime-1.0.3" = {
name = "pretty-hrtime";
packageName = "pretty-hrtime";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.2.tgz";
- sha1 = "70ca96f4d0628a443b918758f79416a9a7bc9fa8";
+ url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz";
+ sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1";
};
};
"tildify-1.2.0" = {
@@ -10467,13 +10476,13 @@ let
sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031";
};
};
- "beeper-1.1.0" = {
+ "beeper-1.1.1" = {
name = "beeper";
packageName = "beeper";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz";
- sha1 = "9ee6fc1ce7f54feaace7ce73588b056037866a2c";
+ url = "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz";
+ sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809";
};
};
"dateformat-1.0.12" = {
@@ -10980,6 +10989,15 @@ let
sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f";
};
};
+ "minimatch-2.0.10" = {
+ name = "minimatch";
+ packageName = "minimatch";
+ version = "2.0.10";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz";
+ sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7";
+ };
+ };
"ordered-read-streams-0.1.0" = {
name = "ordered-read-streams";
packageName = "ordered-read-streams";
@@ -11277,13 +11295,13 @@ let
sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018";
};
};
- "handlebars-4.0.5" = {
+ "handlebars-4.0.6" = {
name = "handlebars";
packageName = "handlebars";
- version = "4.0.5";
+ version = "4.0.6";
src = fetchurl {
- url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz";
- sha1 = "92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7";
+ url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.6.tgz";
+ sha1 = "2ce4484850537f9c97a8026d5399b935c4ed4ed7";
};
};
"supports-color-3.1.2" = {
@@ -11943,6 +11961,15 @@ let
sha1 = "a73f04d88e7292d7fd2f2d7d691a0cdeeed141a9";
};
};
+ "basic-auth-1.0.4" = {
+ name = "basic-auth";
+ packageName = "basic-auth";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz";
+ sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290";
+ };
+ };
"connect-2.30.2" = {
name = "connect";
packageName = "connect";
@@ -12087,13 +12114,13 @@ let
sha1 = "197e22cdebd4198585e8694ef6786197b91ed942";
};
};
- "method-override-2.3.6" = {
+ "method-override-2.3.7" = {
name = "method-override";
packageName = "method-override";
- version = "2.3.6";
+ version = "2.3.7";
src = fetchurl {
- url = "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz";
- sha1 = "209261cc588d45d9d5a022ff20d7d5eb8e92179e";
+ url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz";
+ sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5";
};
};
"morgan-1.6.1" = {
@@ -12132,22 +12159,22 @@ let
sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607";
};
};
- "response-time-2.3.1" = {
+ "response-time-2.3.2" = {
name = "response-time";
packageName = "response-time";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchurl {
- url = "https://registry.npmjs.org/response-time/-/response-time-2.3.1.tgz";
- sha1 = "2bde19181de6c81ab95e3207a28d61d965b31797";
+ url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz";
+ sha1 = "ffa71bab952d62f7c1d49b7434355fbc68dffc5a";
};
};
- "serve-favicon-2.3.0" = {
+ "serve-favicon-2.3.2" = {
name = "serve-favicon";
packageName = "serve-favicon";
- version = "2.3.0";
+ version = "2.3.2";
src = fetchurl {
- url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz";
- sha1 = "aed36cc6834069a6f189cc7222c6a1a811dc5b39";
+ url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz";
+ sha1 = "dd419e268de012ab72b319d337f2105013f9381f";
};
};
"serve-index-1.7.3" = {
@@ -12186,22 +12213,13 @@ let
sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade";
};
};
- "csrf-3.0.3" = {
+ "csrf-3.0.4" = {
name = "csrf";
packageName = "csrf";
- version = "3.0.3";
+ version = "3.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/csrf/-/csrf-3.0.3.tgz";
- sha1 = "69d13220de95762808bb120f7533a994fc4293b5";
- };
- };
- "base64-url-1.2.2" = {
- name = "base64-url";
- packageName = "base64-url";
- version = "1.2.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz";
- sha1 = "90af26ef8b0b67bc801b05eccf943345649008b3";
+ url = "https://registry.npmjs.org/csrf/-/csrf-3.0.4.tgz";
+ sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5";
};
};
"rndm-1.2.0" = {
@@ -12222,13 +12240,13 @@ let
sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97";
};
};
- "uid-safe-2.1.1" = {
+ "uid-safe-2.1.3" = {
name = "uid-safe";
packageName = "uid-safe";
- version = "2.1.1";
+ version = "2.1.3";
src = fetchurl {
- url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.1.tgz";
- sha1 = "3dbf9436b528be9f52882c05a6216c3763db3666";
+ url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.3.tgz";
+ sha1 = "077e264a00b3187936b270bb7376a26473631071";
};
};
"random-bytes-1.0.0" = {
@@ -12771,6 +12789,15 @@ let
sha1 = "2d46fa874337af9498a2f12bb43d8d0be4a36873";
};
};
+ "gauge-2.6.0" = {
+ name = "gauge";
+ packageName = "gauge";
+ version = "2.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz";
+ sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46";
+ };
+ };
"uid-number-0.0.5" = {
name = "uid-number";
packageName = "uid-number";
@@ -13302,49 +13329,49 @@ let
sha1 = "6b65273b99193c5f067a4cf5809598f777e3b759";
};
};
- "node-red-node-feedparser-0.1.6" = {
+ "node-red-node-feedparser-0.1.7" = {
name = "node-red-node-feedparser";
packageName = "node-red-node-feedparser";
- version = "0.1.6";
- src = fetchurl {
- url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.6.tgz";
- sha1 = "42eb2e11a010904e6af7257feb27a2a64a1b578d";
- };
- };
- "node-red-node-email-0.1.11" = {
- name = "node-red-node-email";
- packageName = "node-red-node-email";
- version = "0.1.11";
- src = fetchurl {
- url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.11.tgz";
- sha1 = "4a64070f3fc5596fdc50e988813dd4ff003b3fd8";
- };
- };
- "node-red-node-twitter-0.1.7" = {
- name = "node-red-node-twitter";
- packageName = "node-red-node-twitter";
version = "0.1.7";
src = fetchurl {
- url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.7.tgz";
- sha1 = "8cef1e54df6217d83b49fd48684e6ca2ee1cf595";
+ url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.7.tgz";
+ sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f";
};
};
- "node-red-node-rbe-0.1.5" = {
+ "node-red-node-email-0.1.12" = {
+ name = "node-red-node-email";
+ packageName = "node-red-node-email";
+ version = "0.1.12";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.12.tgz";
+ sha1 = "ada28233b92e60907ab53a6edc0bb4c17d27d4f5";
+ };
+ };
+ "node-red-node-twitter-0.1.9" = {
+ name = "node-red-node-twitter";
+ packageName = "node-red-node-twitter";
+ version = "0.1.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.9.tgz";
+ sha1 = "e0ad7f654aab3ff8e7c3d001ec3cee030d33d217";
+ };
+ };
+ "node-red-node-rbe-0.1.6" = {
name = "node-red-node-rbe";
packageName = "node-red-node-rbe";
- version = "0.1.5";
+ version = "0.1.6";
src = fetchurl {
- url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.5.tgz";
- sha1 = "9df9b13b8828c9396319a54ad7c0fbb1a4005e9d";
+ url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.6.tgz";
+ sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539";
};
};
- "node-red-node-serialport-0.4.0" = {
+ "node-red-node-serialport-0.4.1" = {
name = "node-red-node-serialport";
packageName = "node-red-node-serialport";
- version = "0.4.0";
+ version = "0.4.1";
src = fetchurl {
- url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.0.tgz";
- sha1 = "dfa63bedd535fa9debef754c373e439f8bc73abe";
+ url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.1.tgz";
+ sha1 = "1c59ea7d2b25612dd0cb53956ab8edf28c74d45c";
};
};
"bcrypt-0.8.7" = {
@@ -13500,13 +13527,13 @@ let
sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4";
};
};
- "moment-timezone-0.5.7" = {
+ "moment-timezone-0.5.9" = {
name = "moment-timezone";
packageName = "moment-timezone";
- version = "0.5.7";
+ version = "0.5.9";
src = fetchurl {
- url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.7.tgz";
- sha1 = "1305bcada16f046dbbc7ac89abf66effff886cb5";
+ url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.9.tgz";
+ sha1 = "e0ea82036d67d21d793544a91b5057f480eda2dd";
};
};
"retry-0.6.1" = {
@@ -13518,13 +13545,13 @@ let
sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918";
};
};
- "cookies-0.6.1" = {
+ "cookies-0.6.2" = {
name = "cookies";
packageName = "cookies";
- version = "0.6.1";
+ version = "0.6.2";
src = fetchurl {
- url = "https://registry.npmjs.org/cookies/-/cookies-0.6.1.tgz";
- sha1 = "ef693b1bc6f01f567d46e2f504e9c15fb70cba90";
+ url = "https://registry.npmjs.org/cookies/-/cookies-0.6.2.tgz";
+ sha1 = "6ac1b052895208e8fc4c4f5f86a9ed31b9cb5ccf";
};
};
"i18next-client-1.10.3" = {
@@ -13608,13 +13635,13 @@ let
sha1 = "7382c148cb622c4b28af7c727f9673730b73f474";
};
};
- "websocket-stream-3.3.0" = {
+ "websocket-stream-3.3.3" = {
name = "websocket-stream";
packageName = "websocket-stream";
- version = "3.3.0";
+ version = "3.3.3";
src = fetchurl {
- url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.0.tgz";
- sha1 = "69ced776afca68688ed5be73d28511a2c329c8ed";
+ url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.3.tgz";
+ sha1 = "361da5404a337e60cfbc29b4a46368762679df0b";
};
};
"leven-1.0.2" = {
@@ -13887,13 +13914,13 @@ let
sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb";
};
};
- "uue-3.0.0" = {
+ "uue-3.1.0" = {
name = "uue";
packageName = "uue";
- version = "3.0.0";
+ version = "3.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/uue/-/uue-3.0.0.tgz";
- sha1 = "07af69344defa9851b7b845c1c18110b8264e51e";
+ url = "https://registry.npmjs.org/uue/-/uue-3.1.0.tgz";
+ sha1 = "5d67d37030e66efebbb4b8aac46daf9b55befbf6";
};
};
"utf7-1.0.2" = {
@@ -13914,13 +13941,13 @@ let
sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4";
};
};
- "serialport-4.0.3" = {
+ "serialport-4.0.6" = {
name = "serialport";
packageName = "serialport";
- version = "4.0.3";
+ version = "4.0.6";
src = fetchurl {
- url = "https://registry.npmjs.org/serialport/-/serialport-4.0.3.tgz";
- sha1 = "31339c4a13f9009852975204f6068c1a6a20a4a1";
+ url = "https://registry.npmjs.org/serialport/-/serialport-4.0.6.tgz";
+ sha1 = "2ea4c1a2b6ad91d9cacd78e8e530f8969ac650ae";
};
};
"lie-3.1.0" = {
@@ -14193,13 +14220,13 @@ let
sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81";
};
};
- "buffer-crc32-0.2.5" = {
+ "buffer-crc32-0.2.6" = {
name = "buffer-crc32";
packageName = "buffer-crc32";
- version = "0.2.5";
+ version = "0.2.6";
src = fetchurl {
- url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz";
- sha1 = "db003ac2671e62ebd6ece78ea2c2e1b405736e91";
+ url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.6.tgz";
+ sha1 = "612b318074fc6c4c30504b297247a1f91641253b";
};
};
"fresh-0.1.0" = {
@@ -14508,13 +14535,13 @@ let
sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2";
};
};
- "raw-socket-1.5.0" = {
+ "raw-socket-1.5.1" = {
name = "raw-socket";
packageName = "raw-socket";
- version = "1.5.0";
+ version = "1.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.0.tgz";
- sha1 = "7a0fba1aef118609011a1205e830e626ca522ae9";
+ url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.1.tgz";
+ sha1 = "a85466c7984c0f0c3842ee562dc61b9873977528";
};
};
"argparse-0.1.16" = {
@@ -14598,6 +14625,15 @@ let
sha1 = "3cd4574a00b67bae373a94b748772640507b7aac";
};
};
+ "mississippi-1.2.0" = {
+ name = "mississippi";
+ packageName = "mississippi";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz";
+ sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
+ };
+ };
"npm-install-checks-3.0.0" = {
name = "npm-install-checks";
packageName = "npm-install-checks";
@@ -14607,6 +14643,15 @@ let
sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
};
};
+ "npm-registry-client-7.3.0" = {
+ name = "npm-registry-client";
+ packageName = "npm-registry-client";
+ version = "7.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.3.0.tgz";
+ sha1 = "f2a390e8b13b78fafe26e9fa9d8bc74e17bcaa50";
+ };
+ };
"opener-1.4.2" = {
name = "opener";
packageName = "opener";
@@ -14634,13 +14679,22 @@ let
sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6";
};
};
- "request-2.75.0" = {
+ "request-2.78.0" = {
name = "request";
packageName = "request";
- version = "2.75.0";
+ version = "2.78.0";
src = fetchurl {
- url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz";
- sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93";
+ url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz";
+ sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc";
+ };
+ };
+ "sorted-union-stream-2.1.3" = {
+ name = "sorted-union-stream";
+ packageName = "sorted-union-stream";
+ version = "2.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sorted-union-stream/-/sorted-union-stream-2.1.3.tgz";
+ sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7";
};
};
"unique-filename-1.1.0" = {
@@ -14688,13 +14742,40 @@ let
sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26";
};
};
- "form-data-2.0.0" = {
- name = "form-data";
- packageName = "form-data";
- version = "2.0.0";
+ "flush-write-stream-1.0.2" = {
+ name = "flush-write-stream";
+ packageName = "flush-write-stream";
+ version = "1.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz";
- sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25";
+ url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz";
+ sha1 = "c81b90d8746766f1a609a46809946c45dd8ae417";
+ };
+ };
+ "from2-2.3.0" = {
+ name = "from2";
+ packageName = "from2";
+ version = "2.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz";
+ sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
+ };
+ };
+ "stream-each-1.2.0" = {
+ name = "stream-each";
+ packageName = "stream-each";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.0.tgz";
+ sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991";
+ };
+ };
+ "stream-iterate-1.2.0" = {
+ name = "stream-iterate";
+ packageName = "stream-iterate";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/stream-iterate/-/stream-iterate-1.2.0.tgz";
+ sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1";
};
};
"unique-slug-2.0.0" = {
@@ -14922,13 +15003,13 @@ let
sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292";
};
};
- "npm-3.10.9" = {
+ "npm-3.10.10" = {
name = "npm";
packageName = "npm";
- version = "3.10.9";
+ version = "3.10.10";
src = fetchurl {
- url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz";
- sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3";
+ url = "https://registry.npmjs.org/npm/-/npm-3.10.10.tgz";
+ sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e";
};
};
"npmi-2.0.1" = {
@@ -14976,6 +15057,24 @@ let
sha1 = "27c90519196dc15015be02a34ea52986feab8877";
};
};
+ "request-2.75.0" = {
+ name = "request";
+ packageName = "request";
+ version = "2.75.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz";
+ sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93";
+ };
+ };
+ "form-data-2.0.0" = {
+ name = "form-data";
+ packageName = "form-data";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz";
+ sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25";
+ };
+ };
"boxen-0.6.0" = {
name = "boxen";
packageName = "boxen";
@@ -15075,13 +15174,13 @@ let
sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb";
};
};
- "got-5.6.0" = {
+ "got-5.7.1" = {
name = "got";
packageName = "got";
- version = "5.6.0";
+ version = "5.7.1";
src = fetchurl {
- url = "https://registry.npmjs.org/got/-/got-5.6.0.tgz";
- sha1 = "bb1d7ee163b78082bbc8eb836f3f395004ea6fbf";
+ url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz";
+ sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35";
};
};
"registry-auth-token-3.1.0" = {
@@ -15102,13 +15201,458 @@ let
sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
};
};
- "unzip-response-1.0.1" = {
+ "unzip-response-1.0.2" = {
name = "unzip-response";
packageName = "unzip-response";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz";
+ sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe";
+ };
+ };
+ "babybird-0.0.1" = {
+ name = "babybird";
+ packageName = "babybird";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babybird/-/babybird-0.0.1.tgz";
+ sha1 = "da80c79c6d7441cdfec7c2ff2dcbd7c13ebdbea2";
+ };
+ };
+ "connect-busboy-0.0.2" = {
+ name = "connect-busboy";
+ packageName = "connect-busboy";
+ version = "0.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/connect-busboy/-/connect-busboy-0.0.2.tgz";
+ sha1 = "ac5c9c96672171885e576c66b2bfd95d3bb11097";
+ };
+ };
+ "content-type-git+https://github.com/wikimedia/content-type.git#master" = {
+ name = "content-type";
+ packageName = "content-type";
+ version = "1.0.1";
+ src = fetchgit {
+ url = "https://github.com/wikimedia/content-type.git";
+ rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b";
+ sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04";
+ };
+ };
+ "diff-1.4.0" = {
+ name = "diff";
+ packageName = "diff";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz";
+ sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
+ };
+ };
+ "domino-1.0.27" = {
+ name = "domino";
+ packageName = "domino";
+ version = "1.0.27";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/domino/-/domino-1.0.27.tgz";
+ sha1 = "26bc01f739707505c51456af7f59e3373369475d";
+ };
+ };
+ "express-handlebars-3.0.0" = {
+ name = "express-handlebars";
+ packageName = "express-handlebars";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-3.0.0.tgz";
+ sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f";
+ };
+ };
+ "finalhandler-0.5.1" = {
+ name = "finalhandler";
+ packageName = "finalhandler";
+ version = "0.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz";
+ sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd";
+ };
+ };
+ "gelf-stream-0.2.4" = {
+ name = "gelf-stream";
+ packageName = "gelf-stream";
+ version = "0.2.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-0.2.4.tgz";
+ sha1 = "a418c8c2e39b85b7932a3e8523f6022d6852e013";
+ };
+ };
+ "mediawiki-title-0.5.6" = {
+ name = "mediawiki-title";
+ packageName = "mediawiki-title";
+ version = "0.5.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.5.6.tgz";
+ sha1 = "549069294e27728a1f13bed3d705d6beecf4ea24";
+ };
+ };
+ "negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = {
+ name = "negotiator";
+ packageName = "negotiator";
+ version = "0.6.1";
+ src = fetchgit {
+ url = "https://github.com/arlolra/negotiator.git";
+ rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a";
+ sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394";
+ };
+ };
+ "pegjs-git+https://github.com/tstarling/pegjs.git#fork" = {
+ name = "pegjs";
+ packageName = "pegjs";
+ version = "0.8.0";
+ src = fetchgit {
+ url = "https://github.com/tstarling/pegjs.git";
+ rev = "36d584bd7bbc564c86c058c5dfe8053b1fe1d584";
+ sha256 = "df0bf31b132e63beae73a28f1edfe0a2e9edf01660632c72834c682e2b484905";
+ };
+ };
+ "prfun-2.1.4" = {
+ name = "prfun";
+ packageName = "prfun";
+ version = "2.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/prfun/-/prfun-2.1.4.tgz";
+ sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0";
+ };
+ };
+ "service-runner-2.1.11" = {
+ name = "service-runner";
+ packageName = "service-runner";
+ version = "2.1.11";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.11.tgz";
+ sha1 = "1b0c83666beef6cc0637f0573a5107d107eac5bb";
+ };
+ };
+ "simplediff-0.1.1" = {
+ name = "simplediff";
+ packageName = "simplediff";
+ version = "0.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/simplediff/-/simplediff-0.1.1.tgz";
+ sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c";
+ };
+ };
+ "yargs-4.8.1" = {
+ name = "yargs";
+ packageName = "yargs";
+ version = "4.8.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz";
+ sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0";
+ };
+ };
+ "is-arguments-1.0.2" = {
+ name = "is-arguments";
+ packageName = "is-arguments";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.2.tgz";
+ sha1 = "07e30ad79531844179b642d2d8399435182c8727";
+ };
+ };
+ "busboy-0.2.13" = {
+ name = "busboy";
+ packageName = "busboy";
+ version = "0.2.13";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz";
+ sha1 = "90fc4f6a3967d815616fc976bfa8e56aed0c58b6";
+ };
+ };
+ "dicer-0.2.5" = {
+ name = "dicer";
+ packageName = "dicer";
+ version = "0.2.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz";
+ sha1 = "5996c086bb33218c812c090bddc09cd12facb70f";
+ };
+ };
+ "streamsearch-0.1.2" = {
+ name = "streamsearch";
+ packageName = "streamsearch";
+ version = "0.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz";
+ sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
+ };
+ };
+ "gelfling-0.2.0" = {
+ name = "gelfling";
+ packageName = "gelfling";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz";
+ sha1 = "23a13c366883adae32ecfd252a566be302b88dc3";
+ };
+ };
+ "bunyan-1.8.5" = {
+ name = "bunyan";
+ packageName = "bunyan";
+ version = "1.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.5.tgz";
+ sha1 = "0d619e83005fb89070f5f47982fc1bf00600878a";
+ };
+ };
+ "bunyan-syslog-udp-0.1.0" = {
+ name = "bunyan-syslog-udp";
+ packageName = "bunyan-syslog-udp";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bunyan-syslog-udp/-/bunyan-syslog-udp-0.1.0.tgz";
+ sha1 = "fbfaee03a81cd2a95abc18f92c99f2bb87e2429c";
+ };
+ };
+ "gelf-stream-1.1.1" = {
+ name = "gelf-stream";
+ packageName = "gelf-stream";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-1.1.1.tgz";
+ sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669";
+ };
+ };
+ "hot-shots-4.3.1" = {
+ name = "hot-shots";
+ packageName = "hot-shots";
+ version = "4.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.3.1.tgz";
+ sha1 = "58a6c1ff717f25673be4d2f736d1c94d5d79e239";
+ };
+ };
+ "limitation-0.1.9" = {
+ name = "limitation";
+ packageName = "limitation";
+ version = "0.1.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/limitation/-/limitation-0.1.9.tgz";
+ sha1 = "ba055ff7dd3a267a65cc6be2deca4ea6bebbdb03";
+ };
+ };
+ "yargs-5.0.0" = {
+ name = "yargs";
+ packageName = "yargs";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz";
+ sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e";
+ };
+ };
+ "dtrace-provider-0.8.0" = {
+ name = "dtrace-provider";
+ packageName = "dtrace-provider";
+ version = "0.8.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.0.tgz";
+ sha1 = "fa95fbf67ed3ae3e97364f9664af7302e5ff5625";
+ };
+ };
+ "mv-2.1.1" = {
+ name = "mv";
+ packageName = "mv";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz";
+ sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2";
+ };
+ };
+ "safe-json-stringify-1.0.3" = {
+ name = "safe-json-stringify";
+ packageName = "safe-json-stringify";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz";
+ sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e";
+ };
+ };
+ "ncp-2.0.0" = {
+ name = "ncp";
+ packageName = "ncp";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz";
+ sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3";
+ };
+ };
+ "rimraf-2.4.5" = {
+ name = "rimraf";
+ packageName = "rimraf";
+ version = "2.4.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz";
+ sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da";
+ };
+ };
+ "gelfling-0.3.1" = {
+ name = "gelfling";
+ packageName = "gelfling";
+ version = "0.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/gelfling/-/gelfling-0.3.1.tgz";
+ sha1 = "336a98f81510f9ae0af2a494e17468a116a9dc04";
+ };
+ };
+ "kad-git+https://github.com/gwicke/kad.git#master" = {
+ name = "kad";
+ packageName = "kad";
+ version = "1.3.6";
+ src = fetchgit {
+ url = "https://github.com/gwicke/kad.git";
+ rev = "f35971036f43814043245da82b12d035b7bbfd16";
+ sha256 = "9529b2615547db37851d15b39155c608d6b8d0641366d14cce728824b6135a35";
+ };
+ };
+ "clarinet-0.11.0" = {
+ name = "clarinet";
+ packageName = "clarinet";
+ version = "0.11.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/clarinet/-/clarinet-0.11.0.tgz";
+ sha1 = "6cc912b93138dc867fc273cd34ea90e83e054719";
+ };
+ };
+ "kad-fs-0.0.4" = {
+ name = "kad-fs";
+ packageName = "kad-fs";
+ version = "0.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/kad-fs/-/kad-fs-0.0.4.tgz";
+ sha1 = "02ea5aa5cf22225725579627ccfd6d266372289a";
+ };
+ };
+ "kad-localstorage-0.0.7" = {
+ name = "kad-localstorage";
+ packageName = "kad-localstorage";
+ version = "0.0.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/kad-localstorage/-/kad-localstorage-0.0.7.tgz";
+ sha1 = "f7a2e780da53fb28b943c2c5a894c279aa810f17";
+ };
+ };
+ "kad-memstore-0.0.1" = {
+ name = "kad-memstore";
+ packageName = "kad-memstore";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/kad-memstore/-/kad-memstore-0.0.1.tgz";
+ sha1 = "83cb748496ac491c7135104cbe56b88ca7392477";
+ };
+ };
+ "merge-1.2.0" = {
+ name = "merge";
+ packageName = "merge";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz";
+ sha1 = "7531e39d4949c281a66b8c5a6e0265e8b05894da";
+ };
+ };
+ "msgpack5-3.4.1" = {
+ name = "msgpack5";
+ packageName = "msgpack5";
+ version = "3.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.4.1.tgz";
+ sha1 = "350ef35899c6c8773710fd84d881ddd3340a8114";
+ };
+ };
+ "dom-storage-2.0.2" = {
+ name = "dom-storage";
+ packageName = "dom-storage";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.0.2.tgz";
+ sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0";
+ };
+ };
+ "get-caller-file-1.0.2" = {
+ name = "get-caller-file";
+ packageName = "get-caller-file";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz";
+ sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5";
+ };
+ };
+ "lodash.assign-4.2.0" = {
+ name = "lodash.assign";
+ packageName = "lodash.assign";
+ version = "4.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
+ sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
+ };
+ };
+ "require-directory-2.1.1" = {
+ name = "require-directory";
+ packageName = "require-directory";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
+ sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
+ };
+ };
+ "require-main-filename-1.0.1" = {
+ name = "require-main-filename";
+ packageName = "require-main-filename";
version = "1.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.1.tgz";
- sha1 = "4a73959f2989470fa503791cefb54e1dbbc68412";
+ url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
+ sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
+ };
+ };
+ "which-module-1.0.0" = {
+ name = "which-module";
+ packageName = "which-module";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz";
+ sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
+ };
+ };
+ "window-size-0.2.0" = {
+ name = "window-size";
+ packageName = "window-size";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz";
+ sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075";
+ };
+ };
+ "yargs-parser-3.2.0" = {
+ name = "yargs-parser";
+ packageName = "yargs-parser";
+ version = "3.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz";
+ sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f";
+ };
+ };
+ "camelcase-3.0.0" = {
+ name = "camelcase";
+ packageName = "camelcase";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
+ sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
+ };
+ };
+ "yargs-parser-2.4.1" = {
+ name = "yargs-parser";
+ packageName = "yargs-parser";
+ version = "2.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz";
+ sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4";
};
};
"airplayer-2.0.0" = {
@@ -15129,13 +15673,13 @@ let
sha1 = "b8d19188b3243e390f302410bd0cb1622db82649";
};
};
- "inquirer-1.2.2" = {
+ "inquirer-1.2.3" = {
name = "inquirer";
packageName = "inquirer";
- version = "1.2.2";
+ version = "1.2.3";
src = fetchurl {
- url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.2.tgz";
- sha1 = "f725c1316f0020e7f3d538c8c5ad0c2732c1c451";
+ url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz";
+ sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918";
};
};
"network-address-1.1.0" = {
@@ -15309,13 +15853,13 @@ let
sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901";
};
};
- "dns-packet-1.1.0" = {
+ "dns-packet-1.1.1" = {
name = "dns-packet";
packageName = "dns-packet";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.0.tgz";
- sha1 = "c11ce43bd9977aa789af72de06b6e4ad6e84730d";
+ url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.1.tgz";
+ sha1 = "2369d45038af045f3898e6fa56862aed3f40296c";
};
};
"external-editor-1.1.1" = {
@@ -15390,13 +15934,13 @@ let
sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad";
};
};
- "socket.io-0.9.17" = {
+ "socket.io-1.6.0" = {
name = "socket.io";
packageName = "socket.io";
- version = "0.9.17";
+ version = "1.6.0";
src = fetchurl {
- url = "https://registry.npmjs.org/socket.io/-/socket.io-0.9.17.tgz";
- sha1 = "ca389268fb2cd5df4b59218490a08c907581c9ec";
+ url = "https://registry.npmjs.org/socket.io/-/socket.io-1.6.0.tgz";
+ sha1 = "3e40d932637e6bd923981b25caf7c53e83b6e2e1";
};
};
"torrent-stream-0.18.1" = {
@@ -15768,13 +16312,121 @@ let
sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0";
};
};
- "socket.io-client-0.9.16" = {
+ "engine.io-1.8.0" = {
+ name = "engine.io";
+ packageName = "engine.io";
+ version = "1.8.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.0.tgz";
+ sha1 = "3eeb5f264cb75dbbec1baaea26d61f5a4eace2aa";
+ };
+ };
+ "socket.io-adapter-0.5.0" = {
+ name = "socket.io-adapter";
+ packageName = "socket.io-adapter";
+ version = "0.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz";
+ sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b";
+ };
+ };
+ "socket.io-client-1.6.0" = {
name = "socket.io-client";
packageName = "socket.io-client";
- version = "0.9.16";
+ version = "1.6.0";
src = fetchurl {
- url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz";
- sha1 = "4da7515c5e773041d1b423970415bcc430f35fc6";
+ url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.6.0.tgz";
+ sha1 = "5b668f4f771304dfeed179064708386fa6717853";
+ };
+ };
+ "socket.io-parser-2.3.1" = {
+ name = "socket.io-parser";
+ packageName = "socket.io-parser";
+ version = "2.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz";
+ sha1 = "dd532025103ce429697326befd64005fcfe5b4a0";
+ };
+ };
+ "engine.io-parser-1.3.1" = {
+ name = "engine.io-parser";
+ packageName = "engine.io-parser";
+ version = "1.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.1.tgz";
+ sha1 = "9554f1ae33107d6fbd170ca5466d2f833f6a07cf";
+ };
+ };
+ "base64-arraybuffer-0.1.5" = {
+ name = "base64-arraybuffer";
+ packageName = "base64-arraybuffer";
+ version = "0.1.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz";
+ sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8";
+ };
+ };
+ "wtf-8-1.0.0" = {
+ name = "wtf-8";
+ packageName = "wtf-8";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz";
+ sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a";
+ };
+ };
+ "component-emitter-1.2.1" = {
+ name = "component-emitter";
+ packageName = "component-emitter";
+ version = "1.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
+ sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
+ };
+ };
+ "engine.io-client-1.8.0" = {
+ name = "engine.io-client";
+ packageName = "engine.io-client";
+ version = "1.8.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.0.tgz";
+ sha1 = "7b730e4127414087596d9be3c88d2bc5fdb6cf5c";
+ };
+ };
+ "parseuri-0.0.5" = {
+ name = "parseuri";
+ packageName = "parseuri";
+ version = "0.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz";
+ sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a";
+ };
+ };
+ "parsejson-0.0.3" = {
+ name = "parsejson";
+ packageName = "parsejson";
+ version = "0.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz";
+ sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab";
+ };
+ };
+ "parseqs-0.0.5" = {
+ name = "parseqs";
+ packageName = "parseqs";
+ version = "0.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz";
+ sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
+ };
+ };
+ "xmlhttprequest-ssl-1.5.3" = {
+ name = "xmlhttprequest-ssl";
+ packageName = "xmlhttprequest-ssl";
+ version = "1.5.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz";
+ sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d";
};
};
"bittorrent-dht-3.2.6" = {
@@ -16390,15 +17042,6 @@ let
sha1 = "6621bce72e1ac80a6e1f002abd4e789f12489fd2";
};
};
- "bunyan-1.8.4" = {
- name = "bunyan";
- packageName = "bunyan";
- version = "1.8.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.4.tgz";
- sha1 = "98013acc812ebc3806364049edf6c9129d8b8d73";
- };
- };
"handlebars-2.0.0" = {
name = "handlebars";
packageName = "handlebars";
@@ -16543,51 +17186,6 @@ let
sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20";
};
};
- "dtrace-provider-0.7.1" = {
- name = "dtrace-provider";
- packageName = "dtrace-provider";
- version = "0.7.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.7.1.tgz";
- sha1 = "c06b308f2f10d5d5838aec9c571e5d588dc71d04";
- };
- };
- "mv-2.1.1" = {
- name = "mv";
- packageName = "mv";
- version = "2.1.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz";
- sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2";
- };
- };
- "safe-json-stringify-1.0.3" = {
- name = "safe-json-stringify";
- packageName = "safe-json-stringify";
- version = "1.0.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz";
- sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e";
- };
- };
- "ncp-2.0.0" = {
- name = "ncp";
- packageName = "ncp";
- version = "2.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz";
- sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3";
- };
- };
- "rimraf-2.4.5" = {
- name = "rimraf";
- packageName = "rimraf";
- version = "2.4.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz";
- sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da";
- };
- };
"uglify-js-2.3.6" = {
name = "uglify-js";
packageName = "uglify-js";
@@ -17002,6 +17600,15 @@ let
sha1 = "7f959346cfc8719e3f7233cd6852854a7c67d8a3";
};
};
+ "js-yaml-3.6.1" = {
+ name = "js-yaml";
+ packageName = "js-yaml";
+ version = "3.6.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz";
+ sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30";
+ };
+ };
"whet.extend-0.9.9" = {
name = "whet.extend";
packageName = "whet.extend";
@@ -17047,31 +17654,22 @@ let
sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4";
};
};
- "longjohn-0.2.9" = {
+ "longjohn-0.2.11" = {
name = "longjohn";
packageName = "longjohn";
- version = "0.2.9";
+ version = "0.2.11";
src = fetchurl {
- url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.9.tgz";
- sha1 = "db1bf175fcfffcfce099132d1470f52f41a31519";
+ url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.11.tgz";
+ sha1 = "83736a15ae5f48711b625153e98012f2de659e69";
};
};
- "node-appc-0.2.31" = {
+ "node-appc-0.2.39" = {
name = "node-appc";
packageName = "node-appc";
- version = "0.2.31";
+ version = "0.2.39";
src = fetchurl {
- url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.31.tgz";
- sha1 = "8d8d0052fd8b8ce4bc44f06883009f7c950bc8c2";
- };
- };
- "request-2.62.0" = {
- name = "request";
- packageName = "request";
- version = "2.62.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/request/-/request-2.62.0.tgz";
- sha1 = "55c165f702a146f1e21e0725c0b75e1136487b0f";
+ url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.39.tgz";
+ sha1 = "c8ffb1e4e1c85b0df3a443889d765de0d963a1f4";
};
};
"sprintf-0.1.5" = {
@@ -17083,22 +17681,22 @@ let
sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf";
};
};
- "winston-1.0.2" = {
+ "winston-1.1.2" = {
name = "winston";
packageName = "winston";
- version = "1.0.2";
+ version = "1.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/winston/-/winston-1.0.2.tgz";
- sha1 = "351c58e2323f8a4ca29a45195aa9aa3b4c35d76f";
+ url = "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz";
+ sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c";
};
};
- "wrench-1.5.8" = {
+ "wrench-1.5.9" = {
name = "wrench";
packageName = "wrench";
- version = "1.5.8";
+ version = "1.5.9";
src = fetchurl {
- url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz";
- sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5";
+ url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz";
+ sha1 = "411691c63a9b2531b1700267279bdeca23b2142a";
};
};
"source-map-support-0.3.2" = {
@@ -17128,85 +17726,58 @@ let
sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1";
};
};
- "diff-2.1.0" = {
+ "diff-2.2.1" = {
name = "diff";
packageName = "diff";
- version = "2.1.0";
+ version = "2.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/diff/-/diff-2.1.0.tgz";
- sha1 = "39b5aa97f0d1600b428ad0a91dc8efcc9b29e288";
+ url = "https://registry.npmjs.org/diff/-/diff-2.2.1.tgz";
+ sha1 = "76ec8ea33535344078079fbe8cf03435ffb185ec";
};
};
- "node-uuid-1.4.3" = {
- name = "node-uuid";
- packageName = "node-uuid";
- version = "1.4.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz";
- sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9";
- };
- };
- "request-2.61.0" = {
+ "request-2.69.0" = {
name = "request";
packageName = "request";
- version = "2.61.0";
+ version = "2.69.0";
src = fetchurl {
- url = "https://registry.npmjs.org/request/-/request-2.61.0.tgz";
- sha1 = "6973cb2ac94885f02693f554eec64481d6013f9f";
+ url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz";
+ sha1 = "cf91d2e000752b1217155c005241911991a2346a";
};
};
- "semver-5.0.1" = {
+ "semver-5.1.0" = {
name = "semver";
packageName = "semver";
- version = "5.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/semver/-/semver-5.0.1.tgz";
- sha1 = "9fb3f4004f900d83c47968fe42f7583e05832cc9";
- };
- };
- "uglify-js-2.4.24" = {
- name = "uglify-js";
- packageName = "uglify-js";
- version = "2.4.24";
- src = fetchurl {
- url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz";
- sha1 = "fad5755c1e1577658bb06ff9ab6e548c95bebd6e";
- };
- };
- "har-validator-1.8.0" = {
- name = "har-validator";
- packageName = "har-validator";
- version = "1.8.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz";
- sha1 = "d83842b0eb4c435960aeb108a067a3aa94c0eeb2";
- };
- };
- "bluebird-2.11.0" = {
- name = "bluebird";
- packageName = "bluebird";
- version = "2.11.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz";
- sha1 = "534b9033c022c9579c56ba3b3e5a5caafbb650e1";
- };
- };
- "yargs-3.5.4" = {
- name = "yargs";
- packageName = "yargs";
- version = "3.5.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz";
- sha1 = "d8aff8f665e94c34bd259bdebd1bfaf0ddd35361";
- };
- };
- "qs-5.1.0" = {
- name = "qs";
- packageName = "qs";
version = "5.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz";
- sha1 = "4d932e5c7ea411cca76a312d39a606200fd50cd9";
+ url = "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz";
+ sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5";
+ };
+ };
+ "wrench-1.5.8" = {
+ name = "wrench";
+ packageName = "wrench";
+ version = "1.5.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz";
+ sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5";
+ };
+ };
+ "uglify-js-2.6.1" = {
+ name = "uglify-js";
+ packageName = "uglify-js";
+ version = "2.6.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz";
+ sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b";
+ };
+ };
+ "qs-6.0.2" = {
+ name = "qs";
+ packageName = "qs";
+ version = "6.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz";
+ sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd";
};
};
"bluebird-3.3.5" = {
@@ -17227,13 +17798,13 @@ let
sha1 = "992a6737733b9da1edd641550dc3acab2e9cfc5a";
};
};
- "color-0.11.3" = {
+ "color-0.11.4" = {
name = "color";
packageName = "color";
- version = "0.11.3";
+ version = "0.11.4";
src = fetchurl {
- url = "https://registry.npmjs.org/color/-/color-0.11.3.tgz";
- sha1 = "4bad1d0d52499dd00dbd6f0868442467e49394e6";
+ url = "https://registry.npmjs.org/color/-/color-0.11.4.tgz";
+ sha1 = "6d7b5c74fb65e841cd48792ad1ed5e07b904d764";
};
};
"crossroads-0.12.2" = {
@@ -17308,13 +17879,13 @@ let
sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3";
};
};
- "knockout-3.4.0" = {
+ "knockout-3.4.1" = {
name = "knockout";
packageName = "knockout";
- version = "3.4.0";
+ version = "3.4.1";
src = fetchurl {
- url = "https://registry.npmjs.org/knockout/-/knockout-3.4.0.tgz";
- sha1 = "59d7261815a11eb7c1a3f3c7077ca898a44caadb";
+ url = "https://registry.npmjs.org/knockout/-/knockout-3.4.1.tgz";
+ sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0";
};
};
"lodash-4.12.0" = {
@@ -17416,13 +17987,13 @@ let
sha1 = "e60432658a3387ff269c028eacde4a512e438dff";
};
};
- "color-convert-1.5.0" = {
+ "color-convert-1.8.2" = {
name = "color-convert";
packageName = "color-convert";
- version = "1.5.0";
+ version = "1.8.2";
src = fetchurl {
- url = "https://registry.npmjs.org/color-convert/-/color-convert-1.5.0.tgz";
- sha1 = "7a2b4efb4488df85bca6443cb038b7100fbe7de1";
+ url = "https://registry.npmjs.org/color-convert/-/color-convert-1.8.2.tgz";
+ sha1 = "be868184d7c8631766d54e7078e2672d7c7e3339";
};
};
"color-string-0.3.0" = {
@@ -17596,22 +18167,22 @@ let
sha1 = "2c35e43ea086516f7997cf80b7aa64d55a4a4484";
};
};
- "editions-1.3.1" = {
+ "editions-1.3.3" = {
name = "editions";
packageName = "editions";
- version = "1.3.1";
+ version = "1.3.3";
src = fetchurl {
- url = "https://registry.npmjs.org/editions/-/editions-1.3.1.tgz";
- sha1 = "008425f64dc1401db45ec110e06aa602562419c0";
+ url = "https://registry.npmjs.org/editions/-/editions-1.3.3.tgz";
+ sha1 = "0907101bdda20fac3cbe334c27cbd0688dc99a5b";
};
};
- "typechecker-4.3.0" = {
+ "typechecker-4.4.0" = {
name = "typechecker";
packageName = "typechecker";
- version = "4.3.0";
+ version = "4.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/typechecker/-/typechecker-4.3.0.tgz";
- sha1 = "6f6d6815753e88d6812aa80de4a3fd18948e6e62";
+ url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.0.tgz";
+ sha1 = "efc56882d36e435c6eb978200e22b88278a3f7fc";
};
};
"underscore-1.5.2" = {
@@ -17785,24 +18356,6 @@ let
sha1 = "7d250d8fa1c218119ecde51390458a57d5171376";
};
};
- "camelcase-3.0.0" = {
- name = "camelcase";
- packageName = "camelcase";
- version = "3.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
- sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
- };
- };
- "lodash.assign-4.2.0" = {
- name = "lodash.assign";
- packageName = "lodash.assign";
- version = "4.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
- sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
- };
- };
"pkg-conf-1.1.3" = {
name = "pkg-conf";
packageName = "pkg-conf";
@@ -17812,15 +18365,6 @@ let
sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b";
};
};
- "require-main-filename-1.0.1" = {
- name = "require-main-filename";
- packageName = "require-main-filename";
- version = "1.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
- sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
- };
- };
"set-blocking-1.0.0" = {
name = "set-blocking";
packageName = "set-blocking";
@@ -17830,24 +18374,6 @@ let
sha1 = "cd5e5d938048df1ac92dfe92e1f16add656f5ec5";
};
};
- "window-size-0.2.0" = {
- name = "window-size";
- packageName = "window-size";
- version = "0.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz";
- sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075";
- };
- };
- "yargs-parser-2.4.1" = {
- name = "yargs-parser";
- packageName = "yargs-parser";
- version = "2.4.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz";
- sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4";
- };
- };
"symbol-0.2.3" = {
name = "symbol";
packageName = "symbol";
@@ -17884,6 +18410,15 @@ let
sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d";
};
};
+ "tmp-0.0.30" = {
+ name = "tmp";
+ packageName = "tmp";
+ version = "0.0.30";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz";
+ sha1 = "72419d4a8be7d6ce75148fd8b324e593a711c2ed";
+ };
+ };
"follow-redirects-0.0.3" = {
name = "follow-redirects";
packageName = "follow-redirects";
@@ -18149,7 +18684,7 @@ in
sources."async-0.2.10"
sources."optimist-0.3.7"
sources."uglify-to-browserify-1.0.2"
- sources."amdefine-1.0.0"
+ sources."amdefine-1.0.1"
sources."wordwrap-0.0.3"
sources."array-unique-0.2.1"
(sources."global-modules-0.2.3" // {
@@ -18165,7 +18700,7 @@ in
})
sources."ini-1.3.4"
sources."osenv-0.1.3"
- sources."which-1.2.11"
+ sources."which-1.2.12"
sources."os-homedir-1.0.2"
sources."os-tmpdir-1.0.2"
sources."isexe-1.1.2"
@@ -18184,10 +18719,10 @@ in
azure-cli = nodeEnv.buildNodePackage {
name = "azure-cli";
packageName = "azure-cli";
- version = "0.10.6";
+ version = "0.10.7";
src = fetchurl {
- url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.6.tgz";
- sha1 = "02c79f5337a1d981e14ef6b2529ac09a42436328";
+ url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.7.tgz";
+ sha1 = "48e59f6be202122c0d71153efab4f924065da586";
};
dependencies = [
(sources."adal-node-0.1.21" // {
@@ -18204,12 +18739,12 @@ in
})
sources."azure-arm-authorization-2.0.0"
sources."azure-arm-cdn-0.2.1"
- sources."azure-arm-commerce-0.1.1"
+ sources."azure-arm-commerce-0.2.0"
sources."azure-arm-compute-0.19.0"
- sources."azure-arm-hdinsight-0.2.0"
+ sources."azure-arm-hdinsight-0.2.2"
sources."azure-arm-hdinsight-jobs-0.1.0"
sources."azure-arm-insights-0.11.3"
- sources."azure-arm-iothub-0.1.1"
+ sources."azure-arm-iothub-0.1.4"
sources."azure-arm-servermanagement-0.1.2"
sources."azure-arm-network-0.17.0"
sources."azure-arm-powerbiembedded-0.1.0"
@@ -18250,7 +18785,6 @@ in
sources."readable-stream-2.0.6"
sources."validator-3.22.2"
sources."xml2js-0.2.7"
- sources."isarray-1.0.0"
];
})
sources."azure-arm-batch-0.3.0"
@@ -18275,7 +18809,7 @@ in
sources."streamline-0.4.11"
];
})
- sources."moment-2.15.2"
+ sources."moment-2.16.0"
sources."ms-rest-1.15.2"
(sources."ms-rest-azure-1.15.2" // {
dependencies = [
@@ -18299,7 +18833,11 @@ in
sources."colors-0.6.2"
];
})
- sources."readable-stream-1.0.34"
+ (sources."readable-stream-1.0.34" // {
+ dependencies = [
+ sources."isarray-0.0.1"
+ ];
+ })
(sources."request-2.74.0" // {
dependencies = [
sources."extend-3.0.0"
@@ -18331,32 +18869,12 @@ in
sources."xmlbuilder-0.4.3"
sources."read-1.0.7"
sources."date-utils-1.2.21"
- sources."jws-3.1.3"
+ sources."jws-3.1.4"
sources."xmldom-0.1.22"
sources."xpath.js-1.0.6"
- sources."base64url-1.0.6"
- sources."jwa-1.1.3"
- (sources."concat-stream-1.4.10" // {
- dependencies = [
- sources."readable-stream-1.1.14"
- ];
- })
- sources."meow-2.0.0"
- sources."inherits-2.0.3"
- sources."typedarray-0.0.6"
- sources."core-util-is-1.0.2"
- sources."isarray-0.0.1"
- sources."string_decoder-0.10.31"
- sources."camelcase-keys-1.0.0"
- sources."indent-string-1.2.2"
- sources."minimist-1.2.0"
- sources."object-assign-1.0.0"
- sources."camelcase-1.2.1"
- sources."map-obj-1.0.1"
- sources."get-stdin-4.0.1"
- sources."repeating-1.1.3"
- sources."is-finite-1.0.2"
- sources."number-is-nan-1.0.1"
+ sources."base64url-2.0.0"
+ sources."jwa-1.1.4"
+ sources."safe-buffer-5.0.1"
sources."buffer-equal-constant-time-1.0.1"
sources."ecdsa-sig-formatter-1.0.7"
sources."base64-url-1.3.3"
@@ -18368,7 +18886,11 @@ in
sources."browserify-mime-1.2.9"
sources."json-edm-parser-0.1.2"
sources."jsonparse-1.2.0"
+ sources."core-util-is-1.0.2"
+ sources."inherits-2.0.3"
+ sources."isarray-1.0.0"
sources."process-nextick-args-1.0.7"
+ sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
sources."stack-trace-0.0.9"
sources."keypress-0.1.0"
@@ -18399,13 +18921,10 @@ in
})
sources."deep-equal-1.0.1"
sources."i-0.3.5"
- (sources."mkdirp-0.5.1" // {
- dependencies = [
- sources."minimist-0.0.8"
- ];
- })
+ sources."mkdirp-0.5.1"
sources."ncp-0.4.2"
sources."rimraf-2.5.4"
+ sources."minimist-0.0.8"
sources."glob-7.1.1"
sources."fs.realpath-1.0.0"
sources."inflight-1.0.6"
@@ -18423,7 +18942,6 @@ in
(sources."bl-1.1.2" // {
dependencies = [
sources."readable-stream-2.0.6"
- sources."isarray-1.0.0"
];
})
sources."caseless-0.11.0"
@@ -18446,14 +18964,14 @@ in
sources."http-signature-1.1.1"
sources."is-typedarray-1.0.0"
sources."json-stringify-safe-5.0.1"
- sources."mime-types-2.1.12"
+ sources."mime-types-2.1.13"
sources."oauth-sign-0.8.2"
sources."qs-6.2.1"
sources."stringstream-0.0.5"
sources."tough-cookie-2.3.2"
sources."tunnel-agent-0.4.3"
sources."delayed-stream-1.0.0"
- sources."lodash-4.16.4"
+ sources."lodash-4.17.2"
sources."is-my-json-valid-2.15.0"
sources."pinkie-promise-2.0.1"
sources."escape-string-regexp-1.0.5"
@@ -18497,15 +19015,21 @@ in
sources."jodid25519-1.0.2"
sources."ecc-jsbn-0.1.1"
sources."bcrypt-pbkdf-1.0.0"
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
sources."punycode-1.4.1"
sources."ctype-0.5.2"
sources."source-map-0.1.43"
sources."fibers-1.0.15"
sources."galaxy-0.1.12"
- sources."amdefine-1.0.0"
+ sources."amdefine-1.0.1"
+ (sources."concat-stream-1.5.2" // {
+ dependencies = [
+ sources."readable-stream-2.0.6"
+ ];
+ })
sources."http-response-object-1.1.0"
sources."then-request-2.2.0"
+ sources."typedarray-0.0.6"
sources."http-basic-2.5.1"
sources."promise-7.1.1"
sources."asap-2.0.5"
@@ -18523,10 +19047,10 @@ in
bower = nodeEnv.buildNodePackage {
name = "bower";
packageName = "bower";
- version = "1.7.9";
+ version = "1.8.0";
src = fetchurl {
- url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz";
- sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0";
+ url = "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz";
+ sha1 = "55dbebef0ad9155382d9e9d3e497c1372345b44a";
};
buildInputs = globalBuildInputs;
meta = {
@@ -18546,13 +19070,13 @@ in
};
dependencies = [
sources."argparse-1.0.4"
- sources."bower-1.7.9"
+ sources."bower-1.8.0"
sources."bower-endpoint-parser-0.2.1"
sources."bower-json-0.6.0"
sources."bower-logger-0.2.1"
(sources."fs-extra-0.26.7" // {
dependencies = [
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
];
})
sources."lodash-4.2.1"
@@ -18586,11 +19110,11 @@ in
sources."object-assign-2.1.1"
sources."prepend-http-1.0.4"
sources."read-all-stream-2.2.0"
- sources."statuses-1.3.0"
+ sources."statuses-1.3.1"
sources."timed-out-2.0.0"
sources."end-of-stream-1.0.0"
sources."inherits-2.0.3"
- sources."readable-stream-2.1.5"
+ sources."readable-stream-2.2.2"
sources."stream-shift-1.0.0"
sources."once-1.3.3"
sources."wrappy-1.0.2"
@@ -18627,12 +19151,12 @@ in
sources."pinkie-2.0.4"
(sources."load-json-file-1.1.0" // {
dependencies = [
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
];
})
(sources."path-type-1.1.0" // {
dependencies = [
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
];
})
sources."parse-json-2.2.0"
@@ -18652,12 +19176,12 @@ in
sources."natives-1.1.0"
(sources."jsonfile-2.4.0" // {
dependencies = [
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
];
})
(sources."klaw-1.3.1" // {
dependencies = [
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
];
})
sources."path-is-absolute-1.0.1"
@@ -18673,13 +19197,13 @@ in
sources."balanced-match-0.4.2"
sources."concat-map-0.0.1"
sources."q-1.4.1"
- sources."debug-2.2.0"
+ sources."debug-2.3.3"
(sources."mkdirp-0.5.1" // {
dependencies = [
sources."minimist-0.0.8"
];
})
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
sources."os-tmpdir-1.0.2"
];
buildInputs = globalBuildInputs;
@@ -18738,12 +19262,12 @@ in
sources."punycode-1.4.1"
sources."querystring-es3-0.2.1"
sources."read-only-stream-2.0.0"
- sources."readable-stream-2.1.5"
+ sources."readable-stream-2.2.2"
sources."resolve-1.1.7"
sources."shasum-1.0.2"
sources."shell-quote-1.6.1"
sources."stream-browserify-2.0.1"
- sources."stream-http-2.4.1"
+ sources."stream-http-2.5.0"
sources."string_decoder-0.10.31"
sources."subarg-1.0.0"
(sources."syntax-error-1.1.6" // {
@@ -18809,9 +19333,9 @@ in
sources."parse-asn1-5.0.0"
sources."brorand-1.0.6"
sources."hash.js-1.0.3"
- sources."asn1.js-4.8.1"
+ sources."asn1.js-4.9.0"
sources."ripemd160-1.0.1"
- sources."sha.js-2.4.5"
+ sources."sha.js-2.4.8"
sources."miller-rabin-4.0.0"
sources."inflight-1.0.6"
sources."minimatch-3.0.3"
@@ -18868,7 +19392,7 @@ in
sources."chalk-1.0.0"
sources."chromecast-player-0.2.3"
sources."debounced-seeker-1.0.0"
- sources."debug-2.2.0"
+ sources."debug-2.3.3"
sources."fs-extended-0.2.1"
sources."got-1.2.2"
sources."internal-ip-1.2.0"
@@ -18907,7 +19431,7 @@ in
(sources."xml2js-0.4.17" // {
dependencies = [
sources."xmlbuilder-4.2.1"
- sources."lodash-4.16.4"
+ sources."lodash-4.17.2"
];
})
sources."xtend-4.0.1"
@@ -18936,7 +19460,7 @@ in
sources."thunky-0.1.0"
sources."wrap-fn-0.1.5"
sources."co-3.1.0"
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
sources."object-assign-1.0.0"
(sources."meow-3.7.0" // {
dependencies = [
@@ -18970,7 +19494,7 @@ in
sources."pinkie-2.0.4"
sources."load-json-file-1.1.0"
sources."path-type-1.1.0"
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
sources."parse-json-2.2.0"
sources."pify-2.3.0"
sources."strip-bom-2.0.0"
@@ -19020,13 +19544,13 @@ in
];
})
sources."windows-no-runnable-0.0.6"
- (sources."mdns-js-0.5.0" // {
+ (sources."mdns-js-0.5.1" // {
dependencies = [
sources."semver-5.1.1"
];
})
sources."plist-2.0.1"
- sources."mdns-js-packet-0.2.0"
+ sources."dns-js-0.2.1"
sources."qap-3.1.3"
sources."base64-js-1.1.2"
sources."xmlbuilder-8.2.2"
@@ -19044,7 +19568,7 @@ in
sources."mute-stream-0.0.4"
sources."wordwrap-0.0.3"
sources."blob-to-buffer-1.2.6"
- sources."magnet-uri-5.1.4"
+ sources."magnet-uri-5.1.5"
sources."parse-torrent-file-4.0.0"
sources."simple-get-2.3.0"
sources."thirty-two-1.0.2"
@@ -19091,7 +19615,7 @@ in
sources."randombytes-2.0.3"
sources."run-parallel-1.1.6"
sources."inherits-2.0.3"
- sources."ip-1.1.3"
+ sources."ip-1.1.4"
sources."flatten-0.0.1"
sources."fifo-0.1.4"
(sources."peer-wire-protocol-0.7.0" // {
@@ -19141,13 +19665,13 @@ in
sources."run-series-1.1.4"
(sources."simple-peer-6.0.7" // {
dependencies = [
- sources."readable-stream-2.1.5"
+ sources."readable-stream-2.2.2"
sources."isarray-1.0.0"
];
})
(sources."simple-websocket-4.1.0" // {
dependencies = [
- sources."readable-stream-2.1.5"
+ sources."readable-stream-2.2.2"
sources."isarray-1.0.0"
];
})
@@ -19198,7 +19722,7 @@ in
sources."isarray-1.0.0"
];
})
- sources."exit-on-epipe-0.0.1"
+ sources."exit-on-epipe-0.1.0"
sources."commander-2.9.0"
sources."typedarray-0.0.6"
sources."graceful-readlink-1.0.1"
@@ -19254,7 +19778,7 @@ in
(sources."insight-0.8.3" // {
dependencies = [
sources."async-1.5.2"
- sources."request-2.76.0"
+ sources."request-2.79.0"
sources."qs-6.3.0"
];
})
@@ -19273,7 +19797,7 @@ in
sources."semver-5.3.0"
sources."shelljs-0.5.3"
sources."unorm-1.4.1"
- sources."big-integer-1.6.16"
+ sources."big-integer-1.6.17"
sources."sax-0.3.5"
sources."inflight-1.0.6"
sources."inherits-2.0.3"
@@ -19324,9 +19848,11 @@ in
sources."glob-7.0.6"
sources."nopt-3.0.6"
sources."npm-package-arg-4.1.1"
+ sources."readable-stream-2.1.5"
sources."request-2.74.0"
sources."semver-5.1.1"
sources."tar-2.2.1"
+ sources."isarray-1.0.0"
sources."form-data-1.0.1"
];
})
@@ -19417,7 +19943,7 @@ in
sources."punycode-1.4.1"
sources."querystring-es3-0.2.1"
sources."read-only-stream-2.0.0"
- (sources."readable-stream-2.1.5" // {
+ (sources."readable-stream-2.2.2" // {
dependencies = [
sources."isarray-1.0.0"
];
@@ -19425,7 +19951,7 @@ in
sources."shasum-1.0.2"
sources."shell-quote-1.6.1"
sources."stream-browserify-2.0.1"
- sources."stream-http-2.4.1"
+ sources."stream-http-2.5.0"
sources."string_decoder-0.10.31"
sources."subarg-1.0.0"
(sources."syntax-error-1.1.6" // {
@@ -19488,9 +20014,9 @@ in
sources."parse-asn1-5.0.0"
sources."brorand-1.0.6"
sources."hash.js-1.0.3"
- sources."asn1.js-4.8.1"
+ sources."asn1.js-4.9.0"
sources."ripemd160-1.0.1"
- sources."sha.js-2.4.5"
+ sources."sha.js-2.4.8"
sources."miller-rabin-4.0.0"
sources."function-bind-1.1.0"
sources."is-buffer-1.1.4"
@@ -19527,13 +20053,13 @@ in
sources."ansi-regex-2.0.0"
sources."accepts-1.3.3"
sources."bytes-2.3.0"
- sources."compressible-2.0.8"
+ sources."compressible-2.0.9"
sources."debug-2.2.0"
sources."on-headers-1.0.1"
sources."vary-1.1.0"
- sources."mime-types-2.1.12"
+ sources."mime-types-2.1.13"
sources."negotiator-0.6.1"
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
sources."ms-0.7.1"
sources."array-flatten-1.1.1"
sources."content-disposition-0.5.1"
@@ -19556,21 +20082,17 @@ in
sources."range-parser-1.2.0"
sources."send-0.14.1"
sources."serve-static-1.11.1"
- sources."type-is-1.6.13"
+ sources."type-is-1.6.14"
sources."utils-merge-1.0.0"
- sources."statuses-1.3.0"
+ sources."statuses-1.3.1"
sources."unpipe-1.0.0"
sources."ee-first-1.1.1"
sources."forwarded-0.1.0"
sources."ipaddr.js-1.1.1"
sources."destroy-1.0.4"
- (sources."http-errors-1.5.0" // {
- dependencies = [
- sources."inherits-2.0.1"
- ];
- })
+ sources."http-errors-1.5.1"
sources."mime-1.3.4"
- sources."setprototypeof-1.0.1"
+ sources."setprototypeof-1.0.2"
sources."media-typer-0.3.0"
sources."npm-package-arg-4.2.0"
sources."promzard-0.3.0"
@@ -19586,7 +20108,7 @@ in
sources."mute-stream-0.0.6"
sources."json-parse-helpfulerror-1.0.3"
sources."normalize-package-data-2.3.5"
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
sources."jju-1.3.0"
sources."is-builtin-module-1.0.0"
sources."builtin-modules-1.1.1"
@@ -19633,7 +20155,7 @@ in
sources."npm-install-checks-1.0.7"
(sources."npm-registry-client-7.2.1" // {
dependencies = [
- sources."request-2.76.0"
+ sources."request-2.79.0"
sources."qs-6.3.0"
];
})
@@ -19654,7 +20176,7 @@ in
sources."text-table-0.2.0"
sources."uid-number-0.0.6"
sources."umask-1.1.0"
- sources."which-1.2.11"
+ sources."which-1.2.12"
sources."write-file-atomic-1.1.4"
sources."imurmurhash-0.1.4"
sources."wcwidth-1.0.1"
@@ -19678,18 +20200,18 @@ in
sources."combined-stream-1.0.5"
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- sources."form-data-2.1.1"
+ sources."form-data-2.1.2"
sources."har-validator-2.0.6"
sources."hawk-3.1.3"
sources."http-signature-1.1.1"
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
sources."stringstream-0.0.5"
sources."tough-cookie-2.3.2"
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
sources."delayed-stream-1.0.0"
sources."asynckit-0.4.0"
sources."commander-2.9.0"
@@ -19747,9 +20269,10 @@ in
sources."isarray-1.0.0"
];
})
+ sources."node-uuid-1.4.7"
(sources."async-2.1.2" // {
dependencies = [
- sources."lodash-4.16.4"
+ sources."lodash-4.17.2"
];
})
sources."isexe-1.1.2"
@@ -19762,12 +20285,15 @@ in
})
sources."bplist-creator-0.0.4"
sources."stream-buffers-0.2.6"
- sources."configstore-1.4.0"
+ (sources."configstore-1.4.0" // {
+ dependencies = [
+ sources."uuid-2.0.3"
+ ];
+ })
sources."inquirer-0.10.1"
sources."lodash.debounce-3.1.1"
sources."object-assign-4.1.0"
sources."os-name-1.0.3"
- sources."uuid-2.0.3"
sources."xdg-basedir-2.0.0"
sources."ansi-escapes-1.4.0"
sources."cli-cursor-1.0.2"
@@ -19783,7 +20309,7 @@ in
sources."restore-cursor-1.0.1"
sources."exit-hook-1.1.1"
sources."onetime-1.1.0"
- sources."code-point-at-1.0.1"
+ sources."code-point-at-1.1.0"
sources."is-fullwidth-code-point-1.0.0"
sources."number-is-nan-1.0.1"
sources."lodash._getnative-3.9.1"
@@ -19927,9 +20453,9 @@ in
sources."cookie-0.1.2"
sources."merge-descriptors-0.0.2"
sources."utils-merge-1.0.0"
- sources."mime-types-2.1.12"
+ sources."mime-types-2.1.13"
sources."negotiator-0.5.3"
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
sources."ms-0.7.0"
sources."crc-3.2.1"
sources."ee-first-1.1.0"
@@ -19953,7 +20479,7 @@ in
})
sources."binaryheap-0.0.3"
sources."buffercursor-0.0.12"
- sources."verror-1.8.1"
+ sources."verror-1.9.0"
sources."assert-plus-1.0.0"
sources."core-util-is-1.0.2"
sources."extsprintf-1.3.0"
@@ -19998,7 +20524,7 @@ in
};
dependencies = [
sources."JSONStream-0.8.4"
- sources."basic-auth-1.0.4"
+ sources."basic-auth-1.1.0"
sources."cookie-signature-1.0.6"
sources."cors-2.8.1"
sources."docker-parse-image-3.0.1"
@@ -20055,7 +20581,7 @@ in
sources."readable-stream-2.0.6"
];
})
- sources."readable-stream-2.1.5"
+ sources."readable-stream-2.2.2"
sources."isarray-1.0.0"
];
})
@@ -20079,7 +20605,7 @@ in
(sources."duplexify-3.5.0" // {
dependencies = [
sources."end-of-stream-1.0.0"
- sources."readable-stream-2.1.5"
+ sources."readable-stream-2.2.2"
sources."isarray-1.0.0"
];
})
@@ -20090,9 +20616,9 @@ in
sources."util-deprecate-1.0.2"
sources."level-packager-0.18.0"
sources."bytewise-1.1.0"
- sources."ltgt-2.1.2"
+ sources."ltgt-2.1.3"
sources."pull-level-2.0.3"
- sources."pull-stream-3.4.5"
+ sources."pull-stream-3.5.0"
sources."typewiselite-1.0.0"
sources."bytewise-core-1.2.3"
sources."typewise-1.0.3"
@@ -20149,10 +20675,10 @@ in
sources."async-2.0.1"
sources."aws4-1.5.0"
sources."optimist-0.6.1"
- sources."request-2.76.0"
+ sources."request-2.79.0"
sources."jsonparse-1.2.0"
sources."through-2.3.8"
- sources."lodash-4.16.4"
+ sources."lodash-4.17.2"
sources."wordwrap-0.0.3"
sources."minimist-0.0.10"
sources."aws-sign2-0.6.0"
@@ -20160,20 +20686,20 @@ in
sources."combined-stream-1.0.5"
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- sources."form-data-2.1.1"
+ sources."form-data-2.1.2"
sources."har-validator-2.0.6"
sources."hawk-3.1.3"
sources."http-signature-1.1.1"
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- sources."mime-types-2.1.12"
- sources."node-uuid-1.4.7"
+ sources."mime-types-2.1.13"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
sources."tough-cookie-2.3.2"
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
sources."delayed-stream-1.0.0"
sources."asynckit-0.4.0"
sources."chalk-1.1.3"
@@ -20223,7 +20749,7 @@ in
sources."jodid25519-1.0.2"
sources."ecc-jsbn-0.1.1"
sources."bcrypt-pbkdf-1.0.0"
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
sources."punycode-1.4.1"
];
buildInputs = globalBuildInputs;
@@ -20244,7 +20770,7 @@ in
};
dependencies = [
sources."chalk-1.1.3"
- sources."got-6.5.0"
+ sources."got-6.6.3"
sources."has-ansi-2.0.0"
sources."lodash.debounce-4.0.8"
sources."log-update-1.0.2"
@@ -20263,7 +20789,7 @@ in
sources."is-stream-1.1.0"
sources."lowercase-keys-1.0.0"
sources."node-status-codes-2.0.1"
- sources."timed-out-2.0.0"
+ sources."timed-out-3.0.0"
sources."unzip-response-2.0.1"
sources."url-parse-lax-1.0.0"
sources."capture-stack-trace-1.0.0"
@@ -20302,7 +20828,7 @@ in
sources."path-exists-2.1.0"
sources."load-json-file-1.1.0"
sources."path-type-1.1.0"
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
sources."parse-json-2.2.0"
sources."pify-2.3.0"
sources."strip-bom-2.0.0"
@@ -20327,16 +20853,16 @@ in
eslint = nodeEnv.buildNodePackage {
name = "eslint";
packageName = "eslint";
- version = "3.9.0";
+ version = "3.10.2";
src = fetchurl {
- url = "https://registry.npmjs.org/eslint/-/eslint-3.9.0.tgz";
- sha1 = "68c8fa86b1e0a3f038040f3b5808b7508c128f8e";
+ url = "https://registry.npmjs.org/eslint/-/eslint-3.10.2.tgz";
+ sha1 = "c9a10e8bf6e9d65651204778c503341f1eac3ce7";
};
dependencies = [
sources."babel-code-frame-6.16.0"
sources."chalk-1.1.3"
sources."concat-stream-1.5.2"
- sources."debug-2.2.0"
+ sources."debug-2.3.3"
sources."doctrine-1.5.0"
sources."escope-3.6.0"
sources."espree-3.3.2"
@@ -20344,23 +20870,23 @@ in
sources."esutils-2.0.2"
sources."file-entry-cache-2.0.0"
sources."glob-7.1.1"
- sources."globals-9.12.0"
+ sources."globals-9.14.0"
sources."ignore-3.2.0"
sources."imurmurhash-0.1.4"
sources."inquirer-0.12.0"
sources."is-my-json-valid-2.15.0"
sources."is-resolvable-1.0.0"
- sources."js-yaml-3.6.1"
+ sources."js-yaml-3.7.0"
sources."json-stable-stringify-1.0.1"
sources."levn-0.3.0"
- sources."lodash-4.16.4"
+ sources."lodash-4.17.2"
sources."mkdirp-0.5.1"
sources."natural-compare-1.4.0"
sources."optionator-0.8.2"
sources."path-is-inside-1.0.2"
sources."pluralize-1.2.1"
sources."progress-1.1.8"
- sources."require-uncached-1.0.2"
+ sources."require-uncached-1.0.3"
sources."shelljs-0.7.5"
sources."strip-bom-3.0.0"
sources."strip-json-comments-1.0.4"
@@ -20387,7 +20913,7 @@ in
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
sources."es6-map-0.1.4"
sources."es6-weak-map-2.0.1"
(sources."esrecurse-4.1.0" // {
@@ -20411,7 +20937,7 @@ in
sources."flat-cache-1.2.1"
sources."circular-json-0.3.1"
sources."del-2.2.2"
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
sources."write-0.2.1"
sources."globby-5.0.0"
sources."is-path-cwd-1.0.0"
@@ -20445,7 +20971,7 @@ in
sources."restore-cursor-1.0.1"
sources."exit-hook-1.1.1"
sources."onetime-1.1.0"
- sources."code-point-at-1.0.1"
+ sources."code-point-at-1.1.0"
sources."is-fullwidth-code-point-1.0.0"
sources."mute-stream-0.0.5"
sources."number-is-nan-1.0.1"
@@ -20471,7 +20997,7 @@ in
sources."interpret-1.0.1"
sources."rechoir-0.6.2"
sources."resolve-1.1.7"
- sources."ajv-4.8.2"
+ sources."ajv-4.9.0"
sources."ajv-keywords-1.1.1"
sources."slice-ansi-0.0.4"
sources."co-4.6.0"
@@ -20511,7 +21037,7 @@ in
dependencies = [
sources."bower-endpoint-parser-0.2.1"
sources."bower-logger-0.2.1"
- sources."bower-1.7.9"
+ sources."bower-1.8.0"
sources."glob-3.2.11"
sources."inherits-2.0.3"
sources."minimatch-0.3.0"
@@ -20528,10 +21054,10 @@ in
forever = nodeEnv.buildNodePackage {
name = "forever";
packageName = "forever";
- version = "0.15.2";
+ version = "0.15.3";
src = fetchurl {
- url = "https://registry.npmjs.org/forever/-/forever-0.15.2.tgz";
- sha1 = "fbf21a791ac76bc1a9149a322bc177f338cf5cf9";
+ url = "https://registry.npmjs.org/forever/-/forever-0.15.3.tgz";
+ sha1 = "77d9d7e15fd2f511ad9d84a110c7dd8fc8ecebc2";
};
dependencies = [
(sources."cliff-0.1.10" // {
@@ -20546,7 +21072,7 @@ in
sources."optimist-0.6.0"
];
})
- sources."forever-monitor-1.6.0"
+ sources."forever-monitor-1.7.1"
(sources."nconf-0.6.9" // {
dependencies = [
sources."async-0.2.9"
@@ -20591,7 +21117,7 @@ in
sources."revalidator-0.1.8"
sources."mute-stream-0.0.6"
sources."chokidar-1.6.1"
- sources."minimatch-2.0.10"
+ sources."minimatch-3.0.3"
sources."ps-tree-0.0.3"
sources."anymatch-1.3.0"
sources."async-each-1.0.1"
@@ -20599,12 +21125,8 @@ in
sources."inherits-2.0.3"
sources."is-binary-path-1.0.1"
sources."is-glob-2.0.1"
- (sources."readdirp-2.1.0" // {
- dependencies = [
- sources."minimatch-3.0.3"
- ];
- })
- sources."fsevents-1.0.14"
+ sources."readdirp-2.1.0"
+ sources."fsevents-1.0.15"
sources."arrify-1.0.1"
sources."micromatch-2.3.11"
sources."arr-diff-2.0.0"
@@ -20639,12 +21161,9 @@ in
sources."is-equal-shallow-0.1.3"
sources."is-primitive-2.0.0"
sources."binary-extensions-1.7.0"
- sources."graceful-fs-4.1.9"
- sources."readable-stream-2.1.5"
+ sources."graceful-fs-4.1.10"
+ sources."readable-stream-2.2.2"
sources."set-immediate-shim-1.0.1"
- sources."brace-expansion-1.1.6"
- sources."balanced-match-0.4.2"
- sources."concat-map-0.0.1"
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
sources."process-nextick-args-1.0.7"
@@ -20658,25 +21177,26 @@ in
];
})
sources."nopt-3.0.6"
- sources."npmlog-4.0.0"
+ sources."npmlog-4.0.1"
(sources."rc-1.1.6" // {
dependencies = [
sources."minimist-1.2.0"
];
})
- sources."request-2.76.0"
+ sources."request-2.79.0"
sources."rimraf-2.5.4"
sources."semver-5.3.0"
sources."tar-2.2.1"
(sources."tar-pack-3.3.0" // {
dependencies = [
sources."once-1.3.3"
+ sources."readable-stream-2.1.5"
];
})
sources."abbrev-1.0.9"
sources."are-we-there-yet-1.1.2"
sources."console-control-strings-1.1.0"
- (sources."gauge-2.6.0" // {
+ (sources."gauge-2.7.1" // {
dependencies = [
sources."object-assign-4.1.0"
];
@@ -20690,7 +21210,7 @@ in
sources."string-width-1.0.2"
sources."strip-ansi-3.0.1"
sources."wide-align-1.1.0"
- sources."code-point-at-1.0.1"
+ sources."code-point-at-1.1.0"
sources."is-fullwidth-code-point-1.0.0"
sources."number-is-nan-1.0.1"
sources."ansi-regex-2.0.0"
@@ -20703,20 +21223,20 @@ in
sources."combined-stream-1.0.5"
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- sources."form-data-2.1.1"
+ sources."form-data-2.1.2"
sources."har-validator-2.0.6"
sources."hawk-3.1.3"
sources."http-signature-1.1.1"
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- sources."mime-types-2.1.12"
- sources."node-uuid-1.4.7"
+ sources."mime-types-2.1.13"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
sources."tough-cookie-2.3.2"
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
sources."delayed-stream-1.0.0"
sources."asynckit-0.4.0"
sources."chalk-1.1.3"
@@ -20764,13 +21284,9 @@ in
sources."jodid25519-1.0.2"
sources."ecc-jsbn-0.1.1"
sources."bcrypt-pbkdf-1.0.0"
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
sources."punycode-1.4.1"
- (sources."glob-7.1.1" // {
- dependencies = [
- sources."minimatch-3.0.3"
- ];
- })
+ sources."glob-7.1.1"
sources."fs.realpath-1.0.0"
sources."inflight-1.0.6"
sources."once-1.4.0"
@@ -20778,13 +21294,12 @@ in
sources."block-stream-0.0.9"
sources."fstream-1.0.10"
sources."debug-2.2.0"
- (sources."fstream-ignore-1.0.5" // {
- dependencies = [
- sources."minimatch-3.0.3"
- ];
- })
+ sources."fstream-ignore-1.0.5"
sources."uid-number-0.0.6"
sources."ms-0.7.1"
+ sources."brace-expansion-1.1.6"
+ sources."balanced-match-0.4.2"
+ sources."concat-map-0.0.1"
(sources."event-stream-0.5.3" // {
dependencies = [
sources."optimist-0.2.8"
@@ -20883,7 +21398,7 @@ in
sources."xml2js-0.4.17"
sources."msgpack-1.0.2"
sources."character-parser-1.2.1"
- (sources."clean-css-3.4.20" // {
+ (sources."clean-css-3.4.21" // {
dependencies = [
sources."commander-2.8.1"
];
@@ -20913,7 +21428,7 @@ in
})
sources."source-map-0.4.4"
sources."graceful-readlink-1.0.1"
- sources."amdefine-1.0.0"
+ sources."amdefine-1.0.1"
sources."acorn-2.7.0"
sources."is-promise-2.1.0"
sources."promise-6.1.0"
@@ -20948,7 +21463,7 @@ in
sources."weak-map-1.0.5"
sources."sax-1.2.1"
sources."xmlbuilder-4.2.1"
- sources."lodash-4.16.4"
+ sources."lodash-4.17.2"
sources."nan-2.4.0"
];
buildInputs = globalBuildInputs;
@@ -20974,8 +21489,8 @@ in
sources."interpret-1.0.1"
sources."liftoff-2.3.0"
sources."minimist-1.2.0"
- sources."orchestrator-0.3.7"
- sources."pretty-hrtime-1.0.2"
+ sources."orchestrator-0.3.8"
+ sources."pretty-hrtime-1.0.3"
sources."semver-4.3.6"
sources."tildify-1.2.0"
sources."v8flags-2.0.11"
@@ -20997,7 +21512,7 @@ in
sources."ansi-regex-2.0.0"
sources."array-differ-1.0.0"
sources."array-uniq-1.0.3"
- sources."beeper-1.1.0"
+ sources."beeper-1.1.1"
sources."dateformat-1.0.12"
sources."fancy-log-1.2.0"
sources."gulplog-1.0.0"
@@ -21048,7 +21563,7 @@ in
sources."pinkie-2.0.4"
sources."load-json-file-1.1.0"
sources."path-type-1.1.0"
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
sources."parse-json-2.2.0"
sources."pify-2.3.0"
sources."strip-bom-2.0.0"
@@ -21142,7 +21657,7 @@ in
sources."is-windows-0.2.0"
sources."ini-1.3.4"
sources."osenv-0.1.3"
- sources."which-1.2.11"
+ sources."which-1.2.12"
sources."os-tmpdir-1.0.2"
sources."isexe-1.1.2"
sources."lodash.assignwith-4.2.0"
@@ -21319,12 +21834,12 @@ in
sources."escodegen-1.8.1"
sources."esprima-2.7.3"
sources."glob-5.0.15"
- (sources."handlebars-4.0.5" // {
+ (sources."handlebars-4.0.6" // {
dependencies = [
sources."source-map-0.4.4"
];
})
- sources."js-yaml-3.6.1"
+ sources."js-yaml-3.7.0"
(sources."mkdirp-0.5.1" // {
dependencies = [
sources."minimist-0.0.8"
@@ -21334,7 +21849,7 @@ in
sources."once-1.4.0"
sources."resolve-1.1.7"
sources."supports-color-3.1.2"
- sources."which-1.2.11"
+ sources."which-1.2.12"
sources."wordwrap-1.0.0"
sources."estraverse-1.9.3"
sources."esutils-2.0.2"
@@ -21345,7 +21860,7 @@ in
sources."type-check-0.3.2"
sources."levn-0.3.0"
sources."fast-levenshtein-2.0.5"
- sources."amdefine-1.0.0"
+ sources."amdefine-1.0.1"
sources."inflight-1.0.6"
sources."inherits-2.0.3"
sources."minimatch-3.0.3"
@@ -21500,10 +22015,10 @@ in
js-yaml = nodeEnv.buildNodePackage {
name = "js-yaml";
packageName = "js-yaml";
- version = "3.6.1";
+ version = "3.7.0";
src = fetchurl {
- url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz";
- sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30";
+ url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
+ sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
};
dependencies = [
sources."argparse-1.0.9"
@@ -21533,7 +22048,7 @@ in
sources."colors-1.1.2"
(sources."combine-lists-1.0.1" // {
dependencies = [
- sources."lodash-4.16.4"
+ sources."lodash-4.17.2"
];
})
sources."connect-3.5.0"
@@ -21549,7 +22064,7 @@ in
];
})
sources."glob-7.1.1"
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
sources."http-proxy-1.15.2"
sources."isbinaryfile-3.0.1"
sources."lodash-3.10.1"
@@ -21574,21 +22089,21 @@ in
sources."content-type-1.0.2"
sources."debug-2.2.0"
sources."depd-1.1.0"
- sources."http-errors-1.5.0"
+ sources."http-errors-1.5.1"
sources."iconv-lite-0.4.13"
sources."on-finished-2.3.0"
sources."qs-6.2.0"
sources."raw-body-2.1.7"
- sources."type-is-1.6.13"
+ sources."type-is-1.6.14"
sources."ms-0.7.1"
- sources."inherits-2.0.1"
- sources."setprototypeof-1.0.1"
- sources."statuses-1.3.0"
+ sources."inherits-2.0.3"
+ sources."setprototypeof-1.0.2"
+ sources."statuses-1.3.1"
sources."ee-first-1.1.1"
sources."unpipe-1.0.0"
sources."media-typer-0.3.0"
- sources."mime-types-2.1.12"
- sources."mime-db-1.24.0"
+ sources."mime-types-2.1.13"
+ sources."mime-db-1.25.0"
sources."anymatch-1.3.0"
sources."async-each-1.0.1"
sources."glob-parent-2.0.0"
@@ -21596,7 +22111,7 @@ in
sources."is-glob-2.0.1"
sources."path-is-absolute-1.0.1"
sources."readdirp-2.1.0"
- sources."fsevents-1.0.14"
+ sources."fsevents-1.0.15"
sources."arrify-1.0.1"
sources."micromatch-2.3.11"
sources."arr-diff-2.0.0"
@@ -21631,7 +22146,7 @@ in
sources."is-equal-shallow-0.1.3"
sources."is-primitive-2.0.0"
sources."binary-extensions-1.7.0"
- sources."readable-stream-2.1.5"
+ sources."readable-stream-2.2.2"
sources."set-immediate-shim-1.0.1"
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -21642,25 +22157,29 @@ in
sources."node-pre-gyp-0.6.31"
sources."mkdirp-0.5.1"
sources."nopt-3.0.6"
- sources."npmlog-4.0.0"
+ sources."npmlog-4.0.1"
(sources."rc-1.1.6" // {
dependencies = [
sources."minimist-1.2.0"
];
})
- (sources."request-2.76.0" // {
+ (sources."request-2.79.0" // {
dependencies = [
sources."qs-6.3.0"
];
})
sources."semver-5.3.0"
sources."tar-2.2.1"
- sources."tar-pack-3.3.0"
+ (sources."tar-pack-3.3.0" // {
+ dependencies = [
+ sources."readable-stream-2.1.5"
+ ];
+ })
sources."minimist-0.0.8"
sources."abbrev-1.0.9"
sources."are-we-there-yet-1.1.2"
sources."console-control-strings-1.1.0"
- sources."gauge-2.6.0"
+ sources."gauge-2.7.1"
sources."set-blocking-2.0.0"
sources."delegates-1.0.0"
sources."aproba-1.0.4"
@@ -21671,7 +22190,7 @@ in
sources."string-width-1.0.2"
sources."strip-ansi-3.0.1"
sources."wide-align-1.1.0"
- sources."code-point-at-1.0.1"
+ sources."code-point-at-1.1.0"
sources."is-fullwidth-code-point-1.0.0"
sources."number-is-nan-1.0.1"
sources."ansi-regex-2.0.0"
@@ -21684,18 +22203,18 @@ in
sources."combined-stream-1.0.5"
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- sources."form-data-2.1.1"
+ sources."form-data-2.1.2"
sources."har-validator-2.0.6"
sources."hawk-3.1.3"
sources."http-signature-1.1.1"
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
sources."stringstream-0.0.5"
sources."tough-cookie-2.3.2"
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
sources."delayed-stream-1.0.0"
sources."asynckit-0.4.0"
sources."chalk-1.1.3"
@@ -21911,9 +22430,11 @@ in
})
sources."finalhandler-0.4.0"
sources."http-errors-1.3.1"
- (sources."method-override-2.3.6" // {
+ (sources."method-override-2.3.7" // {
dependencies = [
+ sources."debug-2.3.3"
sources."vary-1.1.0"
+ sources."ms-0.7.2"
];
})
sources."morgan-1.6.1"
@@ -21921,8 +22442,16 @@ in
sources."on-headers-1.0.1"
sources."pause-0.1.0"
sources."qs-4.0.0"
- sources."response-time-2.3.1"
- sources."serve-favicon-2.3.0"
+ (sources."response-time-2.3.2" // {
+ dependencies = [
+ sources."depd-1.1.0"
+ ];
+ })
+ (sources."serve-favicon-2.3.2" // {
+ dependencies = [
+ sources."ms-0.7.2"
+ ];
+ })
(sources."serve-index-1.7.3" // {
dependencies = [
sources."escape-html-1.0.3"
@@ -21936,7 +22465,7 @@ in
sources."statuses-1.2.1"
];
})
- sources."type-is-1.6.13"
+ sources."type-is-1.6.14"
sources."vhost-3.0.2"
sources."iconv-lite-0.4.11"
sources."on-finished-2.3.0"
@@ -21949,20 +22478,20 @@ in
sources."ee-first-1.1.1"
sources."unpipe-1.0.0"
sources."accepts-1.2.13"
- sources."compressible-2.0.8"
- sources."mime-types-2.1.12"
+ sources."compressible-2.0.9"
+ sources."mime-types-2.1.13"
sources."negotiator-0.5.3"
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
sources."ms-0.7.1"
- sources."csrf-3.0.3"
- sources."base64-url-1.2.2"
+ sources."csrf-3.0.4"
+ sources."base64-url-1.3.3"
sources."rndm-1.2.0"
sources."tsscmp-1.0.5"
- sources."uid-safe-2.1.1"
+ sources."uid-safe-2.1.3"
sources."random-bytes-1.0.0"
sources."crc-3.3.0"
sources."inherits-2.0.3"
- sources."statuses-1.3.0"
+ sources."statuses-1.3.1"
sources."readable-stream-1.1.14"
sources."stream-counter-0.2.0"
sources."core-util-is-1.0.2"
@@ -21984,7 +22513,7 @@ in
sources."uid2-0.0.3"
sources."sax-1.2.1"
sources."xmlbuilder-4.2.1"
- sources."lodash-4.16.4"
+ sources."lodash-4.17.2"
];
buildInputs = globalBuildInputs;
meta = {
@@ -22024,7 +22553,7 @@ in
sources."isarray-0.0.1"
];
})
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
sources."gulp-sourcemaps-1.6.0"
sources."is-valid-glob-0.3.0"
sources."lazystream-1.0.0"
@@ -22211,7 +22740,7 @@ in
sources."nijs-0.0.23"
sources."chownr-1.0.1"
sources."concat-stream-1.5.2"
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
sources."mkdirp-0.5.1"
sources."normalize-package-data-2.3.5"
(sources."npm-package-arg-4.2.0" // {
@@ -22220,7 +22749,7 @@ in
];
})
sources."once-1.4.0"
- sources."request-2.76.0"
+ sources."request-2.79.0"
sources."retry-0.8.0"
sources."rimraf-2.5.4"
sources."slide-1.1.6"
@@ -22248,20 +22777,20 @@ in
sources."combined-stream-1.0.5"
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- sources."form-data-2.1.1"
+ sources."form-data-2.1.2"
sources."har-validator-2.0.6"
sources."hawk-3.1.3"
sources."http-signature-1.1.1"
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- sources."mime-types-2.1.12"
- sources."node-uuid-1.4.7"
+ sources."mime-types-2.1.13"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
sources."tough-cookie-2.3.2"
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
sources."delayed-stream-1.0.0"
sources."asynckit-0.4.0"
sources."chalk-1.1.3"
@@ -22311,7 +22840,7 @@ in
sources."jodid25519-1.0.2"
sources."ecc-jsbn-0.1.1"
sources."bcrypt-pbkdf-1.0.0"
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
sources."punycode-1.4.1"
sources."glob-7.1.1"
sources."fs.realpath-1.0.0"
@@ -22333,7 +22862,7 @@ in
sources."signal-exit-3.0.1"
sources."string-width-1.0.2"
sources."wide-align-1.1.0"
- sources."code-point-at-1.0.1"
+ sources."code-point-at-1.1.0"
sources."is-fullwidth-code-point-1.0.0"
sources."number-is-nan-1.0.1"
sources."config-chain-1.1.11"
@@ -22377,18 +22906,18 @@ in
dependencies = [
sources."fstream-1.0.10"
sources."glob-7.1.1"
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
sources."minimatch-3.0.3"
sources."mkdirp-0.5.1"
sources."nopt-3.0.6"
sources."npmlog-3.1.2"
sources."osenv-0.1.3"
sources."path-array-1.0.1"
- sources."request-2.76.0"
+ sources."request-2.79.0"
sources."rimraf-2.5.4"
sources."semver-5.3.0"
sources."tar-2.2.1"
- sources."which-1.2.11"
+ sources."which-1.2.12"
sources."inherits-2.0.3"
sources."fs.realpath-1.0.0"
sources."inflight-1.0.6"
@@ -22405,7 +22934,7 @@ in
sources."gauge-2.6.0"
sources."set-blocking-2.0.0"
sources."delegates-1.0.0"
- sources."readable-stream-2.1.5"
+ sources."readable-stream-2.2.2"
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
sources."isarray-1.0.0"
@@ -22420,16 +22949,16 @@ in
sources."string-width-1.0.2"
sources."strip-ansi-3.0.1"
sources."wide-align-1.1.0"
- sources."code-point-at-1.0.1"
+ sources."code-point-at-1.1.0"
sources."is-fullwidth-code-point-1.0.0"
sources."number-is-nan-1.0.1"
sources."ansi-regex-2.0.0"
sources."os-homedir-1.0.2"
sources."os-tmpdir-1.0.2"
sources."array-index-1.0.0"
- sources."debug-2.2.0"
+ sources."debug-2.3.3"
sources."es6-symbol-3.1.0"
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
sources."d-0.1.1"
sources."es5-ext-0.10.12"
sources."es6-iterator-2.0.0"
@@ -22439,20 +22968,20 @@ in
sources."combined-stream-1.0.5"
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- sources."form-data-2.1.1"
+ sources."form-data-2.1.2"
sources."har-validator-2.0.6"
sources."hawk-3.1.3"
sources."http-signature-1.1.1"
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- sources."mime-types-2.1.12"
- sources."node-uuid-1.4.7"
+ sources."mime-types-2.1.13"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
sources."tough-cookie-2.3.2"
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
sources."delayed-stream-1.0.0"
sources."asynckit-0.4.0"
sources."chalk-1.1.3"
@@ -22500,7 +23029,7 @@ in
sources."jodid25519-1.0.2"
sources."ecc-jsbn-0.1.1"
sources."bcrypt-pbkdf-1.0.0"
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
sources."punycode-1.4.1"
sources."block-stream-0.0.9"
sources."isexe-1.1.2"
@@ -22524,17 +23053,22 @@ in
dependencies = [
sources."async-0.9.2"
sources."biased-opener-0.2.8"
- sources."debug-2.2.0"
- sources."express-4.14.0"
+ sources."debug-2.3.3"
+ (sources."express-4.14.0" // {
+ dependencies = [
+ sources."debug-2.2.0"
+ sources."ms-0.7.1"
+ ];
+ })
sources."glob-5.0.15"
sources."path-is-absolute-1.0.1"
sources."rc-1.1.6"
sources."semver-4.3.6"
- sources."serve-favicon-2.3.0"
+ sources."serve-favicon-2.3.2"
sources."strong-data-uri-1.0.4"
sources."v8-debug-0.7.7"
sources."v8-profiler-5.6.5"
- sources."which-1.2.11"
+ sources."which-1.2.12"
sources."ws-1.1.1"
sources."yargs-3.32.0"
sources."browser-launcher2-0.4.6"
@@ -22572,7 +23106,7 @@ in
sources."bplist-parser-0.1.1"
sources."meow-3.7.0"
sources."untildify-2.1.0"
- sources."big-integer-1.6.16"
+ sources."big-integer-1.6.17"
sources."camelcase-keys-2.1.0"
sources."decamelize-1.2.0"
sources."loud-rejection-1.6.0"
@@ -22600,7 +23134,7 @@ in
sources."pinkie-2.0.4"
sources."load-json-file-1.1.0"
sources."path-type-1.1.0"
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
sources."parse-json-2.2.0"
sources."pify-2.3.0"
sources."strip-bom-2.0.0"
@@ -22613,7 +23147,7 @@ in
sources."is-finite-1.0.2"
sources."number-is-nan-1.0.1"
sources."get-stdin-4.0.1"
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
sources."accepts-1.3.3"
sources."array-flatten-1.1.1"
sources."content-disposition-0.5.1"
@@ -22624,7 +23158,12 @@ in
sources."encodeurl-1.0.1"
sources."escape-html-1.0.3"
sources."etag-1.7.0"
- sources."finalhandler-0.5.0"
+ (sources."finalhandler-0.5.0" // {
+ dependencies = [
+ sources."debug-2.2.0"
+ sources."ms-0.7.1"
+ ];
+ })
sources."fresh-0.3.0"
sources."merge-descriptors-1.0.1"
sources."methods-1.1.2"
@@ -22634,24 +23173,29 @@ in
sources."proxy-addr-1.1.2"
sources."qs-6.2.0"
sources."range-parser-1.2.0"
- sources."send-0.14.1"
+ (sources."send-0.14.1" // {
+ dependencies = [
+ sources."debug-2.2.0"
+ sources."ms-0.7.1"
+ ];
+ })
sources."serve-static-1.11.1"
- sources."type-is-1.6.13"
+ sources."type-is-1.6.14"
sources."utils-merge-1.0.0"
sources."vary-1.1.0"
- sources."mime-types-2.1.12"
+ sources."mime-types-2.1.13"
sources."negotiator-0.6.1"
- sources."mime-db-1.24.0"
- sources."statuses-1.3.0"
+ sources."mime-db-1.25.0"
+ sources."statuses-1.3.1"
sources."unpipe-1.0.0"
sources."ee-first-1.1.1"
sources."forwarded-0.1.0"
sources."ipaddr.js-1.1.1"
sources."destroy-1.0.4"
- sources."http-errors-1.5.0"
+ sources."http-errors-1.5.1"
sources."mime-1.3.4"
- sources."inherits-2.0.1"
- sources."setprototypeof-1.0.1"
+ sources."inherits-2.0.3"
+ sources."setprototypeof-1.0.2"
sources."media-typer-0.3.0"
sources."inflight-1.0.6"
sources."minimatch-3.0.3"
@@ -22673,8 +23217,8 @@ in
];
})
sources."nopt-3.0.6"
- sources."npmlog-4.0.0"
- (sources."request-2.76.0" // {
+ sources."npmlog-4.0.1"
+ (sources."request-2.79.0" // {
dependencies = [
sources."qs-6.3.0"
];
@@ -22682,18 +23226,21 @@ in
sources."tar-2.2.1"
(sources."tar-pack-3.3.0" // {
dependencies = [
+ sources."debug-2.2.0"
sources."once-1.3.3"
+ sources."readable-stream-2.1.5"
sources."rimraf-2.5.4"
+ sources."ms-0.7.1"
sources."glob-7.1.1"
];
})
sources."abbrev-1.0.9"
sources."are-we-there-yet-1.1.2"
sources."console-control-strings-1.1.0"
- sources."gauge-2.6.0"
+ sources."gauge-2.7.1"
sources."set-blocking-2.0.0"
sources."delegates-1.0.0"
- sources."readable-stream-2.1.5"
+ sources."readable-stream-2.2.2"
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
sources."isarray-1.0.0"
@@ -22705,7 +23252,7 @@ in
sources."string-width-1.0.2"
sources."strip-ansi-3.0.1"
sources."wide-align-1.1.0"
- sources."code-point-at-1.0.1"
+ sources."code-point-at-1.1.0"
sources."is-fullwidth-code-point-1.0.0"
sources."ansi-regex-2.0.0"
sources."aws-sign2-0.6.0"
@@ -22714,18 +23261,18 @@ in
sources."combined-stream-1.0.5"
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- sources."form-data-2.1.1"
+ sources."form-data-2.1.2"
sources."har-validator-2.0.6"
sources."hawk-3.1.3"
sources."http-signature-1.1.1"
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
sources."stringstream-0.0.5"
sources."tough-cookie-2.3.2"
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
sources."delayed-stream-1.0.0"
sources."asynckit-0.4.0"
sources."chalk-1.1.3"
@@ -22805,33 +23352,34 @@ in
dependencies = [
sources."mkdirp-0.5.1"
sources."nopt-3.0.6"
- sources."npmlog-4.0.0"
+ sources."npmlog-4.0.1"
(sources."rc-1.1.6" // {
dependencies = [
sources."minimist-1.2.0"
];
})
- sources."request-2.76.0"
+ sources."request-2.79.0"
sources."rimraf-2.5.4"
sources."semver-5.3.0"
sources."tar-2.2.1"
(sources."tar-pack-3.3.0" // {
dependencies = [
sources."once-1.3.3"
+ sources."readable-stream-2.1.5"
];
})
sources."minimist-0.0.8"
sources."abbrev-1.0.9"
sources."are-we-there-yet-1.1.2"
sources."console-control-strings-1.1.0"
- sources."gauge-2.6.0"
+ sources."gauge-2.7.1"
sources."set-blocking-2.0.0"
sources."delegates-1.0.0"
- sources."readable-stream-2.1.5"
+ sources."readable-stream-2.2.2"
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
- sources."inherits-2.0.3"
sources."isarray-1.0.0"
+ sources."inherits-2.0.3"
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
@@ -22843,7 +23391,7 @@ in
sources."string-width-1.0.2"
sources."strip-ansi-3.0.1"
sources."wide-align-1.1.0"
- sources."code-point-at-1.0.1"
+ sources."code-point-at-1.1.0"
sources."is-fullwidth-code-point-1.0.0"
sources."number-is-nan-1.0.1"
sources."ansi-regex-2.0.0"
@@ -22856,20 +23404,20 @@ in
sources."combined-stream-1.0.5"
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- sources."form-data-2.1.1"
+ sources."form-data-2.1.2"
sources."har-validator-2.0.6"
sources."hawk-3.1.3"
sources."http-signature-1.1.1"
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- sources."mime-types-2.1.12"
- sources."node-uuid-1.4.7"
+ sources."mime-types-2.1.13"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
sources."tough-cookie-2.3.2"
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
sources."delayed-stream-1.0.0"
sources."asynckit-0.4.0"
sources."chalk-1.1.3"
@@ -22917,7 +23465,7 @@ in
sources."jodid25519-1.0.2"
sources."ecc-jsbn-0.1.1"
sources."bcrypt-pbkdf-1.0.0"
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
sources."punycode-1.4.1"
sources."glob-7.1.1"
sources."fs.realpath-1.0.0"
@@ -22931,7 +23479,7 @@ in
sources."concat-map-0.0.1"
sources."block-stream-0.0.9"
sources."fstream-1.0.10"
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
sources."debug-2.2.0"
sources."fstream-ignore-1.0.5"
sources."uid-number-0.0.6"
@@ -22955,7 +23503,11 @@ in
};
dependencies = [
sources."chokidar-1.6.1"
- sources."debug-2.2.0"
+ (sources."debug-2.3.3" // {
+ dependencies = [
+ sources."ms-0.7.2"
+ ];
+ })
sources."es6-promise-3.3.1"
sources."ignore-by-default-1.0.1"
sources."lodash.defaults-3.1.2"
@@ -22976,7 +23528,7 @@ in
sources."is-glob-2.0.1"
sources."path-is-absolute-1.0.1"
sources."readdirp-2.1.0"
- sources."fsevents-1.0.14"
+ sources."fsevents-1.0.15"
sources."arrify-1.0.1"
sources."micromatch-2.3.11"
sources."arr-diff-2.0.0"
@@ -23011,8 +23563,8 @@ in
sources."is-equal-shallow-0.1.3"
sources."is-primitive-2.0.0"
sources."binary-extensions-1.7.0"
- sources."graceful-fs-4.1.9"
- sources."readable-stream-2.1.5"
+ sources."graceful-fs-4.1.10"
+ sources."readable-stream-2.2.2"
sources."set-immediate-shim-1.0.1"
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
@@ -23023,26 +23575,28 @@ in
sources."node-pre-gyp-0.6.31"
sources."mkdirp-0.5.1"
sources."nopt-3.0.6"
- sources."npmlog-4.0.0"
+ sources."npmlog-4.0.1"
(sources."rc-1.1.6" // {
dependencies = [
sources."minimist-1.2.0"
];
})
- sources."request-2.76.0"
+ sources."request-2.79.0"
sources."rimraf-2.5.4"
sources."semver-5.3.0"
sources."tar-2.2.1"
(sources."tar-pack-3.3.0" // {
dependencies = [
+ sources."debug-2.2.0"
sources."once-1.3.3"
+ sources."readable-stream-2.1.5"
];
})
sources."minimist-0.0.8"
sources."abbrev-1.0.9"
sources."are-we-there-yet-1.1.2"
sources."console-control-strings-1.1.0"
- sources."gauge-2.6.0"
+ sources."gauge-2.7.1"
sources."set-blocking-2.0.0"
sources."delegates-1.0.0"
sources."aproba-1.0.4"
@@ -23053,7 +23607,7 @@ in
sources."string-width-1.0.2"
sources."strip-ansi-3.0.1"
sources."wide-align-1.1.0"
- sources."code-point-at-1.0.1"
+ sources."code-point-at-1.1.0"
sources."is-fullwidth-code-point-1.0.0"
sources."number-is-nan-1.0.1"
sources."ansi-regex-2.0.0"
@@ -23066,20 +23620,20 @@ in
sources."combined-stream-1.0.5"
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- sources."form-data-2.1.1"
+ sources."form-data-2.1.2"
sources."har-validator-2.0.6"
sources."hawk-3.1.3"
sources."http-signature-1.1.1"
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- sources."mime-types-2.1.12"
- sources."node-uuid-1.4.7"
+ sources."mime-types-2.1.13"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
sources."tough-cookie-2.3.2"
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
sources."delayed-stream-1.0.0"
sources."asynckit-0.4.0"
sources."chalk-1.1.3"
@@ -23127,7 +23681,7 @@ in
sources."jodid25519-1.0.2"
sources."ecc-jsbn-0.1.1"
sources."bcrypt-pbkdf-1.0.0"
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
sources."punycode-1.4.1"
sources."glob-7.1.1"
sources."fs.realpath-1.0.0"
@@ -23161,7 +23715,11 @@ in
sources."pause-stream-0.0.11"
sources."split-0.3.3"
sources."stream-combiner-0.0.4"
- sources."configstore-1.4.0"
+ (sources."configstore-1.4.0" // {
+ dependencies = [
+ sources."uuid-2.0.3"
+ ];
+ })
sources."is-npm-1.0.0"
sources."latest-version-1.0.1"
sources."repeating-1.1.3"
@@ -23169,7 +23727,6 @@ in
sources."string-length-1.0.1"
sources."os-tmpdir-1.0.2"
sources."osenv-0.1.3"
- sources."uuid-2.0.3"
sources."write-file-atomic-1.2.0"
sources."xdg-basedir-2.0.0"
sources."os-homedir-1.0.2"
@@ -23255,17 +23812,17 @@ in
sources."when-3.7.7"
sources."ws-0.8.1"
sources."xml2js-0.4.17"
- sources."node-red-node-feedparser-0.1.6"
- sources."node-red-node-email-0.1.11"
- (sources."node-red-node-twitter-0.1.7" // {
+ sources."node-red-node-feedparser-0.1.7"
+ sources."node-red-node-email-0.1.12"
+ (sources."node-red-node-twitter-0.1.9" // {
dependencies = [
- sources."request-2.76.0"
- sources."form-data-2.1.1"
+ sources."request-2.79.0"
+ sources."form-data-2.1.2"
sources."qs-6.3.0"
];
})
- sources."node-red-node-rbe-0.1.5"
- sources."node-red-node-serialport-0.4.0"
+ sources."node-red-node-rbe-0.1.6"
+ sources."node-red-node-serialport-0.4.1"
(sources."bcrypt-0.8.7" // {
dependencies = [
sources."nan-2.3.5"
@@ -23275,18 +23832,18 @@ in
sources."content-type-1.0.2"
sources."debug-2.2.0"
sources."depd-1.1.0"
- sources."http-errors-1.5.0"
+ sources."http-errors-1.5.1"
sources."iconv-lite-0.4.13"
sources."on-finished-2.3.0"
sources."qs-6.2.0"
- sources."type-is-1.6.13"
+ sources."type-is-1.6.14"
sources."ms-0.7.1"
- sources."inherits-2.0.1"
- sources."setprototypeof-1.0.1"
- sources."statuses-1.3.0"
+ sources."inherits-2.0.3"
+ sources."setprototypeof-1.0.2"
+ sources."statuses-1.3.1"
sources."ee-first-1.1.1"
- sources."mime-types-2.1.12"
- sources."mime-db-1.24.0"
+ sources."mime-types-2.1.13"
+ sources."mime-db-1.25.0"
sources."css-select-1.2.0"
(sources."dom-serializer-0.1.0" // {
dependencies = [
@@ -23313,7 +23870,7 @@ in
sources."nth-check-1.0.1"
sources."domelementtype-1.3.0"
sources."domhandler-2.3.0"
- sources."readable-stream-2.1.5"
+ sources."readable-stream-2.2.2"
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
sources."isarray-1.0.0"
@@ -23323,8 +23880,8 @@ in
sources."cookie-0.3.1"
sources."cookie-signature-1.0.6"
sources."vary-1.1.0"
- sources."moment-timezone-0.5.7"
- sources."moment-2.15.2"
+ sources."moment-timezone-0.5.9"
+ sources."moment-2.16.0"
sources."accepts-1.3.3"
sources."array-flatten-1.1.1"
sources."content-disposition-0.5.1"
@@ -23349,7 +23906,7 @@ in
sources."destroy-1.0.4"
sources."mime-1.3.4"
sources."stream-consume-0.1.0"
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
sources."jsonfile-2.4.0"
sources."klaw-1.3.1"
sources."path-is-absolute-1.0.1"
@@ -23365,7 +23922,7 @@ in
sources."concat-map-0.0.1"
sources."async-0.1.22"
sources."retry-0.6.1"
- sources."cookies-0.6.1"
+ sources."cookies-0.6.2"
sources."i18next-client-1.10.3"
sources."json5-0.2.0"
sources."keygrip-1.0.1"
@@ -23393,7 +23950,7 @@ in
sources."pump-1.0.1"
sources."reinterval-1.1.0"
sources."split2-2.1.0"
- (sources."websocket-stream-3.3.0" // {
+ (sources."websocket-stream-3.3.3" // {
dependencies = [
sources."ws-1.1.1"
];
@@ -23525,7 +24082,7 @@ in
sources."nan-2.4.0"
sources."sax-1.2.1"
sources."xmlbuilder-4.2.1"
- sources."lodash-4.16.4"
+ sources."lodash-4.17.2"
(sources."feedparser-1.1.3" // {
dependencies = [
sources."sax-0.6.1"
@@ -23649,17 +24206,23 @@ in
];
})
sources."encoding-0.1.12"
- sources."uue-3.0.0"
+ sources."uue-3.1.0"
sources."utf7-1.0.2"
sources."twitter-ng-0.6.2"
sources."oauth-0.9.14"
+ sources."uuid-3.0.0"
sources."asynckit-0.4.0"
- sources."serialport-4.0.3"
+ (sources."serialport-4.0.6" // {
+ dependencies = [
+ sources."debug-2.3.3"
+ sources."ms-0.7.2"
+ ];
+ })
sources."lie-3.1.0"
(sources."node-pre-gyp-0.6.31" // {
dependencies = [
- sources."request-2.76.0"
- sources."form-data-2.1.1"
+ sources."request-2.79.0"
+ sources."form-data-2.1.2"
sources."qs-6.3.0"
];
})
@@ -23670,17 +24233,18 @@ in
sources."minimist-0.0.8"
];
})
- sources."npmlog-4.0.0"
+ sources."npmlog-4.0.1"
sources."rc-1.1.6"
sources."tar-2.2.1"
(sources."tar-pack-3.3.0" // {
dependencies = [
sources."once-1.3.3"
+ sources."readable-stream-2.1.5"
];
})
sources."are-we-there-yet-1.1.2"
sources."console-control-strings-1.1.0"
- sources."gauge-2.6.0"
+ sources."gauge-2.7.1"
sources."set-blocking-2.0.0"
sources."delegates-1.0.0"
sources."aproba-1.0.4"
@@ -23690,7 +24254,7 @@ in
sources."signal-exit-3.0.1"
sources."string-width-1.0.2"
sources."wide-align-1.1.0"
- sources."code-point-at-1.0.1"
+ sources."code-point-at-1.1.0"
sources."is-fullwidth-code-point-1.0.0"
sources."number-is-nan-1.0.1"
sources."deep-extend-0.4.1"
@@ -23762,14 +24326,14 @@ in
sources."range-parser-0.0.4"
sources."mkdirp-0.3.5"
sources."cookie-0.0.5"
- sources."buffer-crc32-0.2.5"
+ sources."buffer-crc32-0.2.6"
sources."fresh-0.1.0"
sources."methods-0.0.1"
sources."send-0.1.0"
sources."cookie-signature-1.0.1"
- (sources."debug-2.2.0" // {
+ (sources."debug-2.3.3" // {
dependencies = [
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
})
sources."qs-0.5.1"
@@ -23821,7 +24385,7 @@ in
sources."xoauth2-0.1.8"
sources."wordwrap-0.0.3"
sources."minimist-0.0.10"
- (sources."raw-socket-1.5.0" // {
+ (sources."raw-socket-1.5.1" // {
dependencies = [
sources."nan-2.3.5"
];
@@ -23841,12 +24405,13 @@ in
npm = nodeEnv.buildNodePackage {
name = "npm";
packageName = "npm";
- version = "3.10.9";
+ version = "4.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz";
- sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3";
+ url = "https://registry.npmjs.org/npm/-/npm-4.0.2.tgz";
+ sha1 = "fe6cb3c202145151459e74a2919060fb659e2dae";
};
dependencies = [
+ sources."JSONStream-1.2.1"
sources."abbrev-1.0.9"
sources."ansicolors-0.3.2"
sources."ansistyles-0.1.3"
@@ -23864,7 +24429,7 @@ in
sources."fstream-1.0.10"
sources."fstream-npm-1.2.0"
sources."glob-7.1.1"
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
sources."has-unicode-2.0.1"
sources."hosted-git-info-2.1.5"
sources."iferr-0.1.5"
@@ -23882,6 +24447,7 @@ in
sources."lodash.union-4.6.0"
sources."lodash.uniq-4.5.0"
sources."lodash.without-4.4.0"
+ sources."mississippi-1.2.0"
sources."mkdirp-0.5.1"
(sources."node-gyp-3.4.0" // {
dependencies = [
@@ -23894,13 +24460,17 @@ in
sources."npm-cache-filename-1.0.2"
sources."npm-install-checks-3.0.0"
sources."npm-package-arg-4.2.0"
- (sources."npm-registry-client-7.2.1" // {
+ (sources."npm-registry-client-7.3.0" // {
dependencies = [
sources."npmlog-3.1.2"
];
})
sources."npm-user-validate-0.1.5"
- sources."npmlog-4.0.0"
+ (sources."npmlog-4.0.1" // {
+ dependencies = [
+ sources."gauge-2.7.1"
+ ];
+ })
sources."once-1.4.0"
sources."opener-1.4.2"
sources."osenv-0.1.3"
@@ -23916,13 +24486,20 @@ in
sources."read-package-tree-5.1.5"
sources."readable-stream-2.1.5"
sources."realize-package-specifier-3.0.3"
- sources."request-2.75.0"
+ sources."request-2.78.0"
sources."retry-0.10.0"
sources."rimraf-2.5.4"
sources."semver-5.3.0"
sources."sha-2.0.1"
sources."slide-1.1.6"
sources."sorted-object-2.0.1"
+ (sources."sorted-union-stream-2.1.3" // {
+ dependencies = [
+ sources."from2-1.3.0"
+ sources."readable-stream-1.1.14"
+ sources."isarray-0.0.1"
+ ];
+ })
sources."strip-ansi-3.0.1"
sources."tar-2.2.1"
sources."text-table-0.2.0"
@@ -23931,7 +24508,7 @@ in
sources."unique-filename-1.1.0"
sources."unpipe-1.0.0"
sources."validate-npm-package-name-2.2.2"
- sources."which-1.2.11"
+ sources."which-1.2.12"
sources."wrappy-1.0.2"
sources."write-file-atomic-1.2.0"
sources."ansi-regex-2.0.0"
@@ -23945,6 +24522,8 @@ in
sources."lodash.restparam-3.6.1"
sources."readdir-scoped-modules-1.0.2"
sources."validate-npm-package-license-3.0.1"
+ sources."jsonparse-1.2.0"
+ sources."through-2.3.8"
sources."wcwidth-1.0.1"
sources."defaults-1.0.3"
sources."clone-1.0.2"
@@ -23959,6 +24538,40 @@ in
sources."promzard-0.3.0"
sources."lodash._createset-4.0.3"
sources."lodash._root-3.0.1"
+ (sources."concat-stream-1.5.2" // {
+ dependencies = [
+ sources."readable-stream-2.0.6"
+ ];
+ })
+ (sources."duplexify-3.5.0" // {
+ dependencies = [
+ sources."end-of-stream-1.0.0"
+ sources."once-1.3.3"
+ ];
+ })
+ (sources."end-of-stream-1.1.0" // {
+ dependencies = [
+ sources."once-1.3.3"
+ ];
+ })
+ sources."flush-write-stream-1.0.2"
+ sources."from2-2.3.0"
+ sources."pump-1.0.1"
+ sources."pumpify-1.3.5"
+ sources."stream-each-1.2.0"
+ (sources."through2-2.0.1" // {
+ dependencies = [
+ sources."readable-stream-2.0.6"
+ ];
+ })
+ sources."typedarray-0.0.6"
+ sources."core-util-is-1.0.2"
+ sources."isarray-1.0.0"
+ sources."process-nextick-args-1.0.7"
+ sources."string_decoder-0.10.31"
+ sources."util-deprecate-1.0.2"
+ sources."stream-shift-1.0.0"
+ sources."xtend-4.0.1"
sources."minimist-0.0.8"
sources."path-array-1.0.1"
sources."are-we-there-yet-1.1.2"
@@ -23971,29 +24584,18 @@ in
sources."signal-exit-3.0.1"
sources."string-width-1.0.2"
sources."wide-align-1.1.0"
- sources."code-point-at-1.0.1"
+ sources."code-point-at-1.1.0"
sources."is-fullwidth-code-point-1.0.0"
sources."number-is-nan-1.0.1"
sources."array-index-1.0.0"
- sources."debug-2.2.0"
+ sources."debug-2.3.3"
sources."es6-symbol-3.1.0"
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
sources."d-0.1.1"
sources."es5-ext-0.10.12"
sources."es6-iterator-2.0.0"
sources."is-builtin-module-1.0.0"
sources."builtin-modules-1.1.1"
- (sources."concat-stream-1.5.2" // {
- dependencies = [
- sources."readable-stream-2.0.6"
- ];
- })
- sources."typedarray-0.0.6"
- sources."core-util-is-1.0.2"
- sources."isarray-1.0.0"
- sources."process-nextick-args-1.0.7"
- sources."string_decoder-0.10.31"
- sources."util-deprecate-1.0.2"
sources."os-homedir-1.0.2"
sources."os-tmpdir-1.0.2"
sources."mute-stream-0.0.6"
@@ -24003,26 +24605,21 @@ in
sources."buffer-shims-1.0.0"
sources."aws-sign2-0.6.0"
sources."aws4-1.5.0"
- (sources."bl-1.1.2" // {
- dependencies = [
- sources."readable-stream-2.0.6"
- ];
- })
sources."caseless-0.11.0"
sources."combined-stream-1.0.5"
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- sources."form-data-2.0.0"
+ sources."form-data-2.1.2"
sources."har-validator-2.0.6"
sources."hawk-3.1.3"
sources."http-signature-1.1.1"
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- sources."mime-types-2.1.12"
+ sources."mime-types-2.1.13"
sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
- sources."qs-6.2.1"
+ sources."qs-6.3.0"
sources."stringstream-0.0.5"
sources."tough-cookie-2.3.2"
sources."tunnel-agent-0.4.3"
@@ -24040,7 +24637,6 @@ in
sources."generate-function-2.0.0"
sources."generate-object-property-1.2.0"
sources."jsonpointer-4.0.0"
- sources."xtend-4.0.1"
sources."is-property-1.0.2"
sources."pinkie-2.0.4"
sources."hoek-2.16.3"
@@ -24073,8 +24669,9 @@ in
sources."jodid25519-1.0.2"
sources."ecc-jsbn-0.1.1"
sources."bcrypt-pbkdf-1.0.0"
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
sources."punycode-1.4.1"
+ sources."stream-iterate-1.2.0"
sources."block-stream-0.0.9"
sources."unique-slug-2.0.0"
sources."builtins-0.0.7"
@@ -24131,7 +24728,7 @@ in
sources."coffee-script-1.11.1"
sources."underscore-1.4.4"
sources."underscore.string-2.3.3"
- sources."request-2.76.0"
+ sources."request-2.79.0"
sources."graceful-fs-2.0.3"
sources."slide-1.1.6"
sources."chownr-0.0.2"
@@ -24139,27 +24736,27 @@ in
sources."rimraf-2.5.4"
sources."retry-0.6.0"
sources."couch-login-0.1.20"
- sources."npmlog-4.0.0"
+ sources."npmlog-4.0.1"
sources."aws-sign2-0.6.0"
sources."aws4-1.5.0"
sources."caseless-0.11.0"
sources."combined-stream-1.0.5"
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- sources."form-data-2.1.1"
+ sources."form-data-2.1.2"
sources."har-validator-2.0.6"
sources."hawk-3.1.3"
sources."http-signature-1.1.1"
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- sources."mime-types-2.1.12"
- sources."node-uuid-1.4.7"
+ sources."mime-types-2.1.13"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
sources."tough-cookie-2.3.2"
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
sources."delayed-stream-1.0.0"
sources."asynckit-0.4.0"
sources."chalk-1.1.3"
@@ -24209,7 +24806,7 @@ in
sources."jodid25519-1.0.2"
sources."ecc-jsbn-0.1.1"
sources."bcrypt-pbkdf-1.0.0"
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
sources."punycode-1.4.1"
sources."glob-7.1.1"
sources."fs.realpath-1.0.0"
@@ -24224,10 +24821,10 @@ in
sources."concat-map-0.0.1"
sources."are-we-there-yet-1.1.2"
sources."console-control-strings-1.1.0"
- sources."gauge-2.6.0"
+ sources."gauge-2.7.1"
sources."set-blocking-2.0.0"
sources."delegates-1.0.0"
- sources."readable-stream-2.1.5"
+ sources."readable-stream-2.2.2"
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
sources."isarray-1.0.0"
@@ -24241,7 +24838,7 @@ in
sources."signal-exit-3.0.1"
sources."string-width-1.0.2"
sources."wide-align-1.1.0"
- sources."code-point-at-1.0.1"
+ sources."code-point-at-1.1.0"
sources."is-fullwidth-code-point-1.0.0"
sources."number-is-nan-1.0.1"
(sources."config-chain-1.1.11" // {
@@ -24298,9 +24895,9 @@ in
sources."find-up-1.1.2"
sources."get-stdin-5.0.1"
sources."json-parse-helpfulerror-1.0.3"
- sources."lodash-4.16.4"
+ sources."lodash-4.17.2"
sources."node-alias-1.0.4"
- sources."npm-3.10.9"
+ sources."npm-3.10.10"
(sources."npmi-2.0.1" // {
dependencies = [
sources."semver-4.3.6"
@@ -24340,7 +24937,7 @@ in
sources."fstream-1.0.10"
sources."fstream-npm-1.2.0"
sources."glob-7.1.1"
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
sources."has-unicode-2.0.1"
sources."hosted-git-info-2.1.5"
sources."iferr-0.1.5"
@@ -24376,7 +24973,11 @@ in
];
})
sources."npm-user-validate-0.1.5"
- sources."npmlog-4.0.0"
+ (sources."npmlog-4.0.1" // {
+ dependencies = [
+ sources."gauge-2.7.1"
+ ];
+ })
sources."once-1.4.0"
sources."opener-1.4.2"
sources."osenv-0.1.3"
@@ -24405,7 +25006,7 @@ in
sources."unique-filename-1.1.0"
sources."unpipe-1.0.0"
sources."validate-npm-package-name-2.2.2"
- sources."which-1.2.11"
+ sources."which-1.2.12"
sources."wrappy-1.0.2"
sources."write-file-atomic-1.2.0"
sources."debuglog-1.0.1"
@@ -24444,13 +25045,13 @@ in
sources."signal-exit-3.0.1"
sources."string-width-1.0.2"
sources."wide-align-1.1.0"
- sources."code-point-at-1.0.1"
+ sources."code-point-at-1.1.0"
sources."is-fullwidth-code-point-1.0.0"
sources."number-is-nan-1.0.1"
sources."array-index-1.0.0"
- sources."debug-2.2.0"
+ sources."debug-2.3.3"
sources."es6-symbol-3.1.0"
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
sources."d-0.1.1"
sources."es5-ext-0.10.12"
sources."es6-iterator-2.0.0"
@@ -24490,7 +25091,7 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- sources."mime-types-2.1.12"
+ sources."mime-types-2.1.13"
sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
sources."qs-6.2.1"
@@ -24535,7 +25136,7 @@ in
sources."jodid25519-1.0.2"
sources."ecc-jsbn-0.1.1"
sources."bcrypt-pbkdf-1.0.0"
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
sources."punycode-1.4.1"
sources."block-stream-0.0.9"
sources."unique-slug-2.0.0"
@@ -24562,12 +25163,11 @@ in
sources."uuid-2.0.3"
sources."is-obj-1.0.1"
sources."package-json-2.4.0"
- sources."got-5.6.0"
+ sources."got-5.7.1"
sources."registry-auth-token-3.1.0"
sources."registry-url-3.1.0"
sources."create-error-class-3.0.2"
sources."duplexer2-0.1.4"
- sources."is-plain-obj-1.1.0"
sources."is-redirect-1.0.0"
sources."is-retry-allowed-1.1.0"
sources."is-stream-1.1.0"
@@ -24575,8 +25175,8 @@ in
sources."node-status-codes-1.0.0"
sources."parse-json-2.2.0"
sources."read-all-stream-3.1.0"
- sources."timed-out-2.0.0"
- sources."unzip-response-1.0.1"
+ sources."timed-out-3.0.0"
+ sources."unzip-response-1.0.2"
sources."url-parse-lax-1.0.0"
sources."capture-stack-trace-1.0.0"
sources."error-ex-1.3.0"
@@ -24598,6 +25198,357 @@ in
};
production = true;
};
+ parsoid = nodeEnv.buildNodePackage {
+ name = "parsoid";
+ packageName = "parsoid";
+ version = "0.6.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parsoid/-/parsoid-0.6.1.tgz";
+ sha1 = "b6393a25fde2489290dc9d110b037ce89eec2723";
+ };
+ dependencies = [
+ sources."async-0.9.2"
+ sources."babybird-0.0.1"
+ (sources."body-parser-1.15.2" // {
+ dependencies = [
+ sources."content-type-1.0.2"
+ ];
+ })
+ (sources."compression-1.6.2" // {
+ dependencies = [
+ sources."bytes-2.3.0"
+ ];
+ })
+ sources."connect-busboy-0.0.2"
+ sources."content-type-git+https://github.com/wikimedia/content-type.git#master"
+ sources."core-js-2.4.1"
+ sources."diff-1.4.0"
+ sources."domino-1.0.27"
+ sources."entities-1.1.1"
+ (sources."express-4.14.0" // {
+ dependencies = [
+ sources."content-type-1.0.2"
+ sources."finalhandler-0.5.0"
+ ];
+ })
+ sources."express-handlebars-3.0.0"
+ sources."finalhandler-0.5.1"
+ sources."gelf-stream-0.2.4"
+ sources."js-yaml-3.7.0"
+ sources."mediawiki-title-0.5.6"
+ sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access"
+ sources."node-uuid-1.4.7"
+ sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork"
+ sources."prfun-2.1.4"
+ (sources."request-2.79.0" // {
+ dependencies = [
+ sources."qs-6.3.0"
+ ];
+ })
+ sources."semver-5.3.0"
+ (sources."serve-favicon-2.3.2" // {
+ dependencies = [
+ sources."ms-0.7.2"
+ ];
+ })
+ (sources."service-runner-2.1.11" // {
+ dependencies = [
+ sources."gelf-stream-1.1.1"
+ sources."yargs-5.0.0"
+ sources."gelfling-0.3.1"
+ sources."cliui-3.2.0"
+ sources."window-size-0.2.0"
+ ];
+ })
+ sources."simplediff-0.1.1"
+ (sources."yargs-4.8.1" // {
+ dependencies = [
+ sources."cliui-3.2.0"
+ sources."window-size-0.2.0"
+ sources."yargs-parser-2.4.1"
+ sources."camelcase-3.0.0"
+ ];
+ })
+ sources."asap-2.0.5"
+ sources."is-arguments-1.0.2"
+ sources."bytes-2.4.0"
+ sources."debug-2.2.0"
+ sources."depd-1.1.0"
+ sources."http-errors-1.5.1"
+ sources."iconv-lite-0.4.13"
+ sources."on-finished-2.3.0"
+ sources."qs-6.2.0"
+ sources."raw-body-2.1.7"
+ sources."type-is-1.6.14"
+ sources."ms-0.7.1"
+ sources."inherits-2.0.3"
+ sources."setprototypeof-1.0.2"
+ sources."statuses-1.3.1"
+ sources."ee-first-1.1.1"
+ sources."unpipe-1.0.0"
+ sources."media-typer-0.3.0"
+ sources."mime-types-2.1.13"
+ sources."mime-db-1.25.0"
+ sources."accepts-1.3.3"
+ sources."compressible-2.0.9"
+ sources."on-headers-1.0.1"
+ sources."vary-1.1.0"
+ sources."busboy-0.2.13"
+ sources."dicer-0.2.5"
+ sources."readable-stream-1.1.14"
+ sources."streamsearch-0.1.2"
+ sources."core-util-is-1.0.2"
+ sources."isarray-0.0.1"
+ sources."string_decoder-0.10.31"
+ sources."array-flatten-1.1.1"
+ sources."content-disposition-0.5.1"
+ sources."cookie-0.3.1"
+ sources."cookie-signature-1.0.6"
+ sources."encodeurl-1.0.1"
+ sources."escape-html-1.0.3"
+ sources."etag-1.7.0"
+ sources."fresh-0.3.0"
+ sources."merge-descriptors-1.0.1"
+ sources."methods-1.1.2"
+ sources."parseurl-1.3.1"
+ sources."path-to-regexp-0.1.7"
+ sources."proxy-addr-1.1.2"
+ sources."range-parser-1.2.0"
+ sources."send-0.14.1"
+ sources."serve-static-1.11.1"
+ sources."utils-merge-1.0.0"
+ sources."forwarded-0.1.0"
+ sources."ipaddr.js-1.1.1"
+ sources."destroy-1.0.4"
+ sources."mime-1.3.4"
+ sources."glob-6.0.4"
+ sources."graceful-fs-4.1.10"
+ (sources."handlebars-4.0.6" // {
+ dependencies = [
+ sources."async-1.5.2"
+ ];
+ })
+ sources."object.assign-4.0.4"
+ sources."promise-7.1.1"
+ sources."inflight-1.0.6"
+ sources."minimatch-3.0.3"
+ sources."once-1.4.0"
+ sources."path-is-absolute-1.0.1"
+ sources."wrappy-1.0.2"
+ sources."brace-expansion-1.1.6"
+ sources."balanced-match-0.4.2"
+ sources."concat-map-0.0.1"
+ sources."optimist-0.6.1"
+ sources."source-map-0.4.4"
+ (sources."uglify-js-2.7.4" // {
+ dependencies = [
+ sources."async-0.2.10"
+ sources."source-map-0.5.6"
+ sources."yargs-3.10.0"
+ ];
+ })
+ sources."wordwrap-0.0.3"
+ sources."minimist-0.0.10"
+ sources."amdefine-1.0.1"
+ sources."uglify-to-browserify-1.0.2"
+ sources."camelcase-1.2.1"
+ (sources."cliui-2.1.0" // {
+ dependencies = [
+ sources."wordwrap-0.0.2"
+ ];
+ })
+ sources."decamelize-1.2.0"
+ sources."window-size-0.1.0"
+ sources."center-align-0.1.3"
+ sources."right-align-0.1.3"
+ sources."align-text-0.1.4"
+ sources."lazy-cache-1.0.4"
+ sources."kind-of-3.0.4"
+ sources."longest-1.0.1"
+ sources."repeat-string-1.6.1"
+ sources."is-buffer-1.1.4"
+ sources."function-bind-1.1.0"
+ sources."object-keys-1.0.11"
+ sources."define-properties-1.1.2"
+ sources."foreach-2.0.5"
+ sources."gelfling-0.2.0"
+ sources."argparse-1.0.9"
+ sources."esprima-2.7.3"
+ sources."sprintf-js-1.0.3"
+ sources."aws-sign2-0.6.0"
+ sources."aws4-1.5.0"
+ sources."caseless-0.11.0"
+ sources."combined-stream-1.0.5"
+ sources."extend-3.0.0"
+ sources."forever-agent-0.6.1"
+ sources."form-data-2.1.2"
+ sources."har-validator-2.0.6"
+ sources."hawk-3.1.3"
+ sources."http-signature-1.1.1"
+ sources."is-typedarray-1.0.0"
+ sources."isstream-0.1.2"
+ sources."json-stringify-safe-5.0.1"
+ sources."oauth-sign-0.8.2"
+ sources."stringstream-0.0.5"
+ sources."tough-cookie-2.3.2"
+ sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
+ sources."delayed-stream-1.0.0"
+ sources."asynckit-0.4.0"
+ sources."chalk-1.1.3"
+ sources."commander-2.9.0"
+ sources."is-my-json-valid-2.15.0"
+ sources."pinkie-promise-2.0.1"
+ sources."ansi-styles-2.2.1"
+ sources."escape-string-regexp-1.0.5"
+ sources."has-ansi-2.0.0"
+ sources."strip-ansi-3.0.1"
+ sources."supports-color-2.0.0"
+ sources."ansi-regex-2.0.0"
+ sources."graceful-readlink-1.0.1"
+ sources."generate-function-2.0.0"
+ sources."generate-object-property-1.2.0"
+ sources."jsonpointer-4.0.0"
+ sources."xtend-4.0.1"
+ sources."is-property-1.0.2"
+ sources."pinkie-2.0.4"
+ sources."hoek-2.16.3"
+ sources."boom-2.10.1"
+ sources."cryptiles-2.0.5"
+ sources."sntp-1.0.9"
+ sources."assert-plus-0.2.0"
+ sources."jsprim-1.3.1"
+ (sources."sshpk-1.10.1" // {
+ dependencies = [
+ sources."assert-plus-1.0.0"
+ ];
+ })
+ sources."extsprintf-1.0.2"
+ sources."json-schema-0.2.3"
+ sources."verror-1.3.6"
+ sources."asn1-0.2.3"
+ (sources."dashdash-1.14.0" // {
+ dependencies = [
+ sources."assert-plus-1.0.0"
+ ];
+ })
+ (sources."getpass-0.1.6" // {
+ dependencies = [
+ sources."assert-plus-1.0.0"
+ ];
+ })
+ sources."jsbn-0.1.0"
+ sources."tweetnacl-0.14.3"
+ sources."jodid25519-1.0.2"
+ sources."ecc-jsbn-0.1.1"
+ sources."bcrypt-pbkdf-1.0.0"
+ sources."punycode-1.4.1"
+ sources."bluebird-3.4.6"
+ sources."bunyan-1.8.5"
+ sources."bunyan-syslog-udp-0.1.0"
+ sources."hot-shots-4.3.1"
+ (sources."limitation-0.1.9" // {
+ dependencies = [
+ sources."readable-stream-2.2.2"
+ sources."isarray-1.0.0"
+ ];
+ })
+ sources."dtrace-provider-0.8.0"
+ sources."mv-2.1.1"
+ sources."safe-json-stringify-1.0.3"
+ sources."moment-2.16.0"
+ sources."nan-2.4.0"
+ (sources."mkdirp-0.5.1" // {
+ dependencies = [
+ sources."minimist-0.0.8"
+ ];
+ })
+ sources."ncp-2.0.0"
+ sources."rimraf-2.4.5"
+ sources."kad-git+https://github.com/gwicke/kad.git#master"
+ sources."clarinet-0.11.0"
+ sources."colors-1.1.2"
+ sources."hat-0.0.3"
+ (sources."kad-fs-0.0.4" // {
+ dependencies = [
+ sources."readable-stream-2.2.2"
+ sources."isarray-1.0.0"
+ ];
+ })
+ sources."kad-localstorage-0.0.7"
+ (sources."kad-memstore-0.0.1" // {
+ dependencies = [
+ sources."readable-stream-2.2.2"
+ sources."isarray-1.0.0"
+ ];
+ })
+ sources."lodash-3.10.1"
+ sources."merge-1.2.0"
+ (sources."msgpack5-3.4.1" // {
+ dependencies = [
+ sources."readable-stream-2.2.2"
+ sources."isarray-1.0.0"
+ ];
+ })
+ sources."buffer-shims-1.0.0"
+ sources."process-nextick-args-1.0.7"
+ sources."util-deprecate-1.0.2"
+ sources."dom-storage-2.0.2"
+ (sources."bl-1.1.2" // {
+ dependencies = [
+ sources."readable-stream-2.0.6"
+ sources."isarray-1.0.0"
+ ];
+ })
+ sources."get-caller-file-1.0.2"
+ sources."lodash.assign-4.2.0"
+ sources."os-locale-1.4.0"
+ sources."read-pkg-up-1.0.1"
+ sources."require-directory-2.1.1"
+ sources."require-main-filename-1.0.1"
+ sources."set-blocking-2.0.0"
+ sources."string-width-1.0.2"
+ sources."which-module-1.0.0"
+ sources."y18n-3.2.1"
+ (sources."yargs-parser-3.2.0" // {
+ dependencies = [
+ sources."camelcase-3.0.0"
+ ];
+ })
+ sources."wrap-ansi-2.0.0"
+ sources."lcid-1.0.0"
+ sources."invert-kv-1.0.0"
+ sources."find-up-1.1.2"
+ sources."read-pkg-1.1.0"
+ sources."path-exists-2.1.0"
+ sources."load-json-file-1.1.0"
+ sources."normalize-package-data-2.3.5"
+ sources."path-type-1.1.0"
+ sources."parse-json-2.2.0"
+ sources."pify-2.3.0"
+ sources."strip-bom-2.0.0"
+ sources."error-ex-1.3.0"
+ sources."is-arrayish-0.2.1"
+ sources."is-utf8-0.2.1"
+ sources."hosted-git-info-2.1.5"
+ sources."is-builtin-module-1.0.0"
+ sources."validate-npm-package-license-3.0.1"
+ sources."builtin-modules-1.1.1"
+ sources."spdx-correct-1.0.2"
+ sources."spdx-expression-parse-1.0.4"
+ sources."spdx-license-ids-1.2.2"
+ sources."code-point-at-1.1.0"
+ sources."is-fullwidth-code-point-1.0.0"
+ sources."number-is-nan-1.0.1"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "Mediawiki parser for the VisualEditor.";
+ homepage = "https://github.com/wikimedia/parsoid#readme";
+ license = "GPL-2.0+";
+ };
+ production = true;
+ };
peerflix = nodeEnv.buildNodePackage {
name = "peerflix";
packageName = "peerflix";
@@ -24609,9 +25560,9 @@ in
dependencies = [
sources."airplayer-2.0.0"
sources."clivas-0.2.0"
- (sources."inquirer-1.2.2" // {
+ (sources."inquirer-1.2.3" // {
dependencies = [
- sources."lodash-4.16.4"
+ sources."lodash-4.17.2"
];
})
sources."keypress-0.2.1"
@@ -24657,7 +25608,7 @@ in
sources."plist-1.2.0"
sources."reverse-http-1.2.0"
sources."stream-buffers-2.2.0"
- sources."big-integer-1.6.16"
+ sources."big-integer-1.6.17"
sources."inherits-2.0.3"
sources."typedarray-0.0.6"
sources."readable-stream-2.0.6"
@@ -24686,7 +25637,7 @@ in
sources."supports-color-2.0.0"
sources."ansi-regex-2.0.0"
sources."string-width-1.0.2"
- sources."code-point-at-1.0.1"
+ sources."code-point-at-1.1.0"
sources."is-fullwidth-code-point-1.0.0"
sources."number-is-nan-1.0.1"
sources."array-flatten-2.1.0"
@@ -24695,9 +25646,10 @@ in
sources."dns-txt-2.0.2"
sources."multicast-dns-6.1.0"
sources."multicast-dns-service-types-1.1.0"
- sources."dns-packet-1.1.0"
+ sources."dns-packet-1.1.1"
sources."thunky-0.1.0"
- sources."ip-1.1.3"
+ sources."ip-1.1.4"
+ sources."safe-buffer-5.0.1"
sources."meow-3.7.0"
sources."camelcase-keys-2.1.0"
sources."decamelize-1.2.0"
@@ -24727,7 +25679,7 @@ in
sources."pinkie-2.0.4"
sources."load-json-file-1.1.0"
sources."path-type-1.1.0"
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
sources."parse-json-2.2.0"
sources."pify-2.3.0"
sources."strip-bom-2.0.0"
@@ -24759,7 +25711,7 @@ in
sources."is-promise-2.1.0"
sources."wordwrap-0.0.3"
sources."blob-to-buffer-1.2.6"
- sources."magnet-uri-5.1.4"
+ sources."magnet-uri-5.1.5"
sources."parse-torrent-file-4.0.0"
sources."simple-get-2.3.0"
sources."thirty-two-1.0.2"
@@ -24833,7 +25785,7 @@ in
sources."bencode-0.8.0"
];
})
- sources."debug-2.2.0"
+ sources."debug-2.3.3"
sources."re-emitter-1.1.3"
sources."buffer-equals-1.0.4"
sources."k-bucket-0.6.0"
@@ -24858,7 +25810,7 @@ in
sources."addr-to-ip-port-1.4.2"
sources."options-0.0.6"
sources."ultron-1.0.2"
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
];
buildInputs = globalBuildInputs;
meta = {
@@ -24871,10 +25823,10 @@ in
peerflix-server = nodeEnv.buildNodePackage {
name = "peerflix-server";
packageName = "peerflix-server";
- version = "0.0.30";
+ version = "0.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.0.30.tgz";
- sha1 = "858a78e9ad0bdffa91997a6f0ca0bd809320ad98";
+ url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.1.tgz";
+ sha1 = "683d54067d44699b2eff8bfc793e780df2912666";
};
dependencies = [
sources."connect-multiparty-1.2.5"
@@ -24889,7 +25841,11 @@ in
sources."pump-1.0.1"
sources."range-parser-1.2.0"
sources."read-torrent-1.3.0"
- sources."socket.io-0.9.17"
+ (sources."socket.io-1.6.0" // {
+ dependencies = [
+ sources."debug-2.3.3"
+ ];
+ })
(sources."torrent-stream-0.18.1" // {
dependencies = [
sources."end-of-stream-0.1.5"
@@ -25022,32 +25978,84 @@ in
sources."boom-0.3.8"
sources."cryptiles-0.1.3"
sources."sntp-0.1.4"
- sources."socket.io-client-0.9.16"
- sources."policyfile-0.0.4"
- sources."base64id-0.1.0"
- sources."redis-0.7.3"
- sources."uglify-js-1.2.5"
- (sources."ws-0.4.32" // {
+ (sources."engine.io-1.8.0" // {
dependencies = [
- sources."commander-2.1.0"
+ sources."debug-2.3.3"
+ sources."cookie-0.3.1"
];
})
- sources."xmlhttprequest-1.4.2"
- sources."active-x-obfuscator-0.0.1"
- sources."nan-1.0.0"
- sources."tinycolor-0.0.1"
+ sources."has-binary-0.1.7"
+ sources."object-assign-4.1.0"
+ (sources."socket.io-adapter-0.5.0" // {
+ dependencies = [
+ sources."debug-2.3.3"
+ ];
+ })
+ (sources."socket.io-client-1.6.0" // {
+ dependencies = [
+ sources."debug-2.3.3"
+ ];
+ })
+ (sources."socket.io-parser-2.3.1" // {
+ dependencies = [
+ sources."debug-2.2.0"
+ sources."component-emitter-1.1.2"
+ sources."ms-0.7.1"
+ ];
+ })
+ sources."ms-0.7.2"
+ (sources."accepts-1.3.3" // {
+ dependencies = [
+ sources."mime-types-2.1.13"
+ sources."negotiator-0.6.1"
+ sources."mime-db-1.25.0"
+ ];
+ })
+ sources."base64id-0.1.0"
+ (sources."engine.io-parser-1.3.1" // {
+ dependencies = [
+ sources."has-binary-0.1.6"
+ ];
+ })
+ sources."ws-1.1.1"
+ sources."after-0.8.1"
+ sources."arraybuffer.slice-0.0.6"
+ sources."base64-arraybuffer-0.1.5"
+ sources."blob-0.0.4"
+ sources."wtf-8-1.0.0"
sources."options-0.0.6"
- sources."zeparser-0.0.5"
+ sources."ultron-1.0.2"
+ sources."backo2-1.0.2"
+ sources."component-bind-1.0.0"
+ sources."component-emitter-1.2.1"
+ (sources."engine.io-client-1.8.0" // {
+ dependencies = [
+ sources."debug-2.3.3"
+ ];
+ })
+ sources."indexof-0.0.1"
+ sources."object-component-0.0.3"
+ sources."parseuri-0.0.5"
+ sources."to-array-0.1.4"
+ sources."component-inherit-0.0.3"
+ sources."has-cors-1.1.0"
+ sources."parsejson-0.0.3"
+ sources."parseqs-0.0.5"
+ sources."xmlhttprequest-ssl-1.5.3"
+ sources."yeast-0.1.2"
+ sources."better-assert-1.0.2"
+ sources."callsite-1.0.0"
+ sources."json3-3.3.2"
sources."bitfield-0.1.0"
(sources."bittorrent-dht-3.2.6" // {
dependencies = [
- sources."debug-2.2.0"
+ sources."debug-2.3.3"
];
})
(sources."bittorrent-tracker-2.12.1" // {
dependencies = [
sources."bencode-0.6.0"
- sources."debug-2.2.0"
+ sources."debug-2.3.3"
];
})
sources."bncode-0.5.3"
@@ -25056,7 +26064,7 @@ in
sources."ip-0.3.3"
(sources."ip-set-1.0.1" // {
dependencies = [
- sources."ip-1.1.3"
+ sources."ip-1.1.4"
];
})
sources."peer-wire-swarm-0.9.2"
@@ -25071,9 +26079,8 @@ in
sources."run-parallel-1.1.6"
sources."simple-get-1.4.3"
sources."string2compact-1.2.2"
- sources."ms-0.7.1"
sources."ip-regex-1.0.3"
- sources."unzip-response-1.0.1"
+ sources."unzip-response-1.0.2"
sources."ipaddr.js-1.2.0"
sources."bn.js-1.3.0"
sources."extend.js-0.0.2"
@@ -25098,7 +26105,7 @@ in
sources."brace-expansion-1.1.6"
sources."balanced-match-0.4.2"
sources."concat-map-0.0.1"
- sources."which-1.2.11"
+ sources."which-1.2.12"
sources."isexe-1.1.2"
];
buildInputs = globalBuildInputs;
@@ -25125,7 +26132,7 @@ in
sources."progress-1.1.8"
sources."request-2.67.0"
sources."request-progress-2.0.1"
- sources."which-1.2.11"
+ sources."which-1.2.12"
sources."concat-stream-1.5.0"
sources."debug-0.7.4"
sources."mkdirp-0.5.0"
@@ -25141,7 +26148,7 @@ in
sources."minimist-0.0.8"
sources."fd-slicer-1.0.1"
sources."pend-1.2.0"
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
sources."jsonfile-2.4.0"
sources."klaw-1.3.1"
sources."path-is-absolute-1.0.1"
@@ -25164,7 +26171,7 @@ in
sources."forever-agent-0.6.1"
sources."form-data-1.0.1"
sources."json-stringify-safe-5.0.1"
- sources."mime-types-2.1.12"
+ sources."mime-types-2.1.13"
sources."node-uuid-1.4.7"
sources."qs-5.2.1"
sources."tunnel-agent-0.4.3"
@@ -25179,8 +26186,8 @@ in
sources."is-typedarray-1.0.0"
sources."har-validator-2.0.6"
sources."async-2.1.2"
- sources."lodash-4.16.4"
- sources."mime-db-1.24.0"
+ sources."lodash-4.17.2"
+ sources."mime-db-1.25.0"
sources."assert-plus-0.2.0"
sources."jsprim-1.3.1"
(sources."sshpk-1.10.1" // {
@@ -25257,7 +26264,7 @@ in
sources."commander-2.9.0"
sources."detective-4.3.2"
sources."glob-5.0.15"
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
sources."iconv-lite-0.4.13"
sources."mkdirp-0.5.1"
sources."private-0.1.6"
@@ -25280,7 +26287,7 @@ in
sources."source-map-0.5.6"
sources."ast-types-0.8.15"
sources."base62-0.1.1"
- sources."amdefine-1.0.0"
+ sources."amdefine-1.0.1"
];
buildInputs = globalBuildInputs;
meta = {
@@ -25340,7 +26347,7 @@ in
sources."methods-0.1.0"
sources."send-0.1.4"
sources."cookie-signature-1.0.1"
- sources."debug-2.2.0"
+ sources."debug-2.3.3"
sources."qs-0.6.5"
sources."bytes-0.2.1"
sources."pause-0.0.1"
@@ -25356,13 +26363,12 @@ in
sources."inherits-2.0.3"
sources."keypress-0.1.0"
sources."mime-1.2.11"
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
sources."oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master"
sources."request-2.9.203"
(sources."openid-2.0.6" // {
dependencies = [
- sources."request-2.76.0"
- sources."node-uuid-1.4.7"
+ sources."request-2.79.0"
sources."qs-6.3.0"
];
})
@@ -25376,7 +26382,7 @@ in
sources."combined-stream-1.0.5"
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- sources."form-data-2.1.1"
+ sources."form-data-2.1.2"
(sources."har-validator-2.0.6" // {
dependencies = [
sources."commander-2.9.0"
@@ -25387,11 +26393,12 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- sources."mime-types-2.1.12"
+ sources."mime-types-2.1.13"
sources."oauth-sign-0.8.2"
sources."stringstream-0.0.5"
sources."tough-cookie-2.3.2"
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
sources."delayed-stream-1.0.0"
sources."asynckit-0.4.0"
sources."chalk-1.1.3"
@@ -25440,7 +26447,7 @@ in
sources."jodid25519-1.0.2"
sources."ecc-jsbn-0.1.1"
sources."bcrypt-pbkdf-1.0.0"
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
sources."punycode-1.4.1"
sources."events.node-0.4.9"
];
@@ -25494,13 +26501,13 @@ in
];
})
sources."commander-2.9.0"
- sources."js-yaml-3.6.1"
- (sources."cookies-0.6.1" // {
+ sources."js-yaml-3.7.0"
+ (sources."cookies-0.6.2" // {
dependencies = [
sources."depd-1.1.0"
];
})
- (sources."request-2.76.0" // {
+ (sources."request-2.79.0" // {
dependencies = [
sources."qs-6.3.0"
];
@@ -25509,7 +26516,7 @@ in
sources."es6-shim-0.21.1"
sources."semver-4.3.6"
sources."minimatch-1.0.0"
- sources."bunyan-1.8.4"
+ sources."bunyan-1.8.5"
sources."handlebars-2.0.0"
sources."highlight.js-8.9.1"
sources."lunr-0.7.2"
@@ -25518,11 +26525,10 @@ in
sources."JSONStream-1.2.1"
sources."mkdirp-0.5.1"
sources."sinopia-htpasswd-0.4.5"
- (sources."http-errors-1.5.0" // {
+ (sources."http-errors-1.5.1" // {
dependencies = [
- sources."inherits-2.0.1"
- sources."setprototypeof-1.0.1"
- sources."statuses-1.3.0"
+ sources."setprototypeof-1.0.2"
+ sources."statuses-1.3.1"
];
})
(sources."readable-stream-1.1.14" // {
@@ -25573,12 +26579,12 @@ in
sources."http-errors-1.3.1"
];
})
- sources."type-is-1.6.13"
+ sources."type-is-1.6.14"
sources."vary-1.0.1"
sources."utils-merge-1.0.0"
- sources."mime-types-2.1.12"
+ sources."mime-types-2.1.13"
sources."negotiator-0.5.3"
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
sources."ms-0.7.1"
sources."unpipe-1.0.0"
sources."ee-first-1.1.1"
@@ -25593,7 +26599,7 @@ in
sources."raw-body-1.3.4"
sources."bytes-1.0.0"
sources."iconv-lite-0.4.8"
- sources."compressible-2.0.8"
+ sources."compressible-2.0.9"
sources."on-headers-1.0.1"
sources."graceful-readlink-1.0.1"
sources."argparse-1.0.9"
@@ -25606,18 +26612,18 @@ in
sources."combined-stream-1.0.5"
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- sources."form-data-2.1.1"
+ sources."form-data-2.1.2"
sources."har-validator-2.0.6"
sources."hawk-3.1.3"
sources."http-signature-1.1.1"
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- sources."node-uuid-1.4.7"
sources."oauth-sign-0.8.2"
sources."stringstream-0.0.5"
sources."tough-cookie-2.3.2"
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
sources."delayed-stream-1.0.0"
sources."asynckit-0.4.0"
sources."chalk-1.1.3"
@@ -25668,10 +26674,10 @@ in
sources."punycode-1.4.1"
sources."lru-cache-2.7.3"
sources."sigmund-1.0.1"
- sources."dtrace-provider-0.7.1"
+ sources."dtrace-provider-0.8.0"
sources."mv-2.1.1"
sources."safe-json-stringify-1.0.3"
- sources."moment-2.15.2"
+ sources."moment-2.16.0"
sources."nan-2.4.0"
sources."ncp-2.0.0"
sources."rimraf-2.4.5"
@@ -25694,7 +26700,7 @@ in
})
sources."wordwrap-0.0.3"
sources."source-map-0.1.43"
- sources."amdefine-1.0.0"
+ sources."amdefine-1.0.1"
sources."markdown-it-4.4.0"
sources."sanitize-html-1.13.0"
sources."entities-1.1.1"
@@ -25703,7 +26709,7 @@ in
sources."uc.micro-1.0.3"
(sources."htmlparser2-3.9.2" // {
dependencies = [
- sources."readable-stream-2.1.5"
+ sources."readable-stream-2.2.2"
];
})
sources."regexp-quote-0.0.0"
@@ -25751,17 +26757,17 @@ in
sources."readdirp-2.1.0"
sources."colors-1.0.3"
sources."graceful-readlink-1.0.1"
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
sources."minimatch-3.0.3"
- sources."readable-stream-2.1.5"
+ sources."readable-stream-2.2.2"
sources."set-immediate-shim-1.0.1"
sources."brace-expansion-1.1.6"
sources."balanced-match-0.4.2"
sources."concat-map-0.0.1"
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
- sources."inherits-2.0.3"
sources."isarray-1.0.0"
+ sources."inherits-2.0.3"
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
@@ -25846,7 +26852,7 @@ in
sources."semver-4.3.6"
sources."spdy-1.32.5"
sources."tunnel-agent-0.4.3"
- (sources."verror-1.8.1" // {
+ (sources."verror-1.9.0" // {
dependencies = [
sources."assert-plus-1.0.0"
];
@@ -25896,7 +26902,7 @@ in
];
})
sources."json-schema-0.2.3"
- sources."readable-stream-2.1.5"
+ sources."readable-stream-2.2.2"
sources."buffer-shims-1.0.0"
sources."isarray-1.0.0"
sources."process-nextick-args-1.0.7"
@@ -25925,12 +26931,12 @@ in
dependencies = [
sources."css-parse-1.7.0"
sources."mkdirp-0.5.1"
- sources."debug-2.2.0"
+ sources."debug-2.3.3"
sources."sax-0.5.8"
sources."glob-7.0.6"
sources."source-map-0.1.43"
sources."minimist-0.0.8"
- sources."ms-0.7.1"
+ sources."ms-0.7.2"
sources."fs.realpath-1.0.0"
sources."inflight-1.0.6"
sources."inherits-2.0.3"
@@ -25941,7 +26947,7 @@ in
sources."brace-expansion-1.1.6"
sources."balanced-match-0.4.2"
sources."concat-map-0.0.1"
- sources."amdefine-1.0.0"
+ sources."amdefine-1.0.1"
];
buildInputs = globalBuildInputs;
meta = {
@@ -25993,13 +26999,13 @@ in
titanium = nodeEnv.buildNodePackage {
name = "titanium";
packageName = "titanium";
- version = "5.0.10";
+ version = "5.0.11";
src = fetchurl {
- url = "https://registry.npmjs.org/titanium/-/titanium-5.0.10.tgz";
- sha1 = "9bbae581957b33265a71774e8fd9f4766441bf1d";
+ url = "https://registry.npmjs.org/titanium/-/titanium-5.0.11.tgz";
+ sha1 = "dd0f7132475a5db6ea188222876d28538b47df27";
};
dependencies = [
- sources."async-1.4.2"
+ sources."async-2.1.2"
sources."colors-1.1.2"
(sources."fields-0.1.24" // {
dependencies = [
@@ -26007,68 +27013,71 @@ in
];
})
sources."humanize-0.0.9"
- sources."longjohn-0.2.9"
- sources."moment-2.10.6"
- (sources."node-appc-0.2.31" // {
+ sources."longjohn-0.2.11"
+ sources."moment-2.16.0"
+ (sources."node-appc-0.2.39" // {
dependencies = [
- sources."request-2.61.0"
- sources."semver-5.0.1"
+ sources."async-1.5.2"
+ sources."request-2.69.0"
+ sources."semver-5.1.0"
+ sources."wrench-1.5.8"
];
})
- (sources."request-2.62.0" // {
+ (sources."request-2.78.0" // {
dependencies = [
- sources."qs-5.1.0"
+ sources."form-data-2.1.2"
+ sources."qs-6.3.0"
+ sources."tough-cookie-2.3.2"
];
})
- sources."semver-5.0.3"
+ sources."semver-5.3.0"
sources."sprintf-0.1.5"
sources."temp-0.8.3"
- (sources."winston-1.0.2" // {
+ (sources."winston-1.1.2" // {
dependencies = [
sources."async-1.0.0"
sources."colors-1.0.3"
];
})
- sources."wrench-1.5.8"
+ sources."wrench-1.5.9"
+ sources."lodash-4.17.2"
sources."keypress-0.2.1"
sources."source-map-support-0.3.2"
sources."source-map-0.1.32"
- sources."amdefine-1.0.0"
+ sources."amdefine-1.0.1"
sources."adm-zip-0.4.7"
- sources."diff-2.1.0"
- sources."node-uuid-1.4.3"
+ sources."diff-2.2.1"
+ sources."node-uuid-1.4.7"
sources."optimist-0.6.1"
- (sources."uglify-js-2.4.24" // {
+ (sources."uglify-js-2.6.1" // {
dependencies = [
sources."async-0.2.10"
- sources."source-map-0.1.34"
+ sources."source-map-0.5.6"
];
})
- sources."xmldom-0.1.19"
+ sources."xmldom-0.1.22"
sources."wordwrap-0.0.3"
sources."minimist-0.0.10"
+ sources."aws-sign2-0.6.0"
+ sources."aws4-1.5.0"
sources."bl-1.0.3"
sources."caseless-0.11.0"
+ sources."combined-stream-1.0.5"
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- (sources."form-data-1.0.1" // {
- dependencies = [
- sources."async-2.1.2"
- ];
- })
- sources."json-stringify-safe-5.0.1"
- sources."mime-types-2.1.12"
- sources."qs-4.0.0"
- sources."tunnel-agent-0.4.3"
- sources."tough-cookie-2.3.2"
- sources."http-signature-0.11.0"
- sources."oauth-sign-0.8.2"
+ sources."form-data-1.0.1"
+ sources."har-validator-2.0.6"
sources."hawk-3.1.3"
- sources."aws-sign2-0.5.0"
- sources."stringstream-0.0.5"
- sources."combined-stream-1.0.5"
+ sources."http-signature-1.1.1"
+ sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
- sources."har-validator-1.8.0"
+ sources."json-stringify-safe-5.0.1"
+ sources."mime-types-2.1.13"
+ sources."oauth-sign-0.8.2"
+ sources."qs-6.0.2"
+ sources."stringstream-0.0.5"
+ sources."tough-cookie-2.2.2"
+ sources."tunnel-agent-0.4.3"
sources."readable-stream-2.0.6"
sources."core-util-is-1.0.2"
sources."inherits-2.0.3"
@@ -26076,21 +27085,11 @@ in
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
- sources."lodash-4.16.4"
- sources."mime-db-1.24.0"
- sources."punycode-1.4.1"
- sources."assert-plus-0.1.5"
- sources."asn1-0.1.11"
- sources."ctype-0.5.3"
- sources."hoek-2.16.3"
- sources."boom-2.10.1"
- sources."cryptiles-2.0.5"
- sources."sntp-1.0.9"
sources."delayed-stream-1.0.0"
- sources."bluebird-2.11.0"
sources."chalk-1.1.3"
sources."commander-2.9.0"
sources."is-my-json-valid-2.15.0"
+ sources."pinkie-promise-2.0.1"
sources."ansi-styles-2.2.1"
sources."escape-string-regexp-1.0.5"
sources."has-ansi-2.0.0"
@@ -26103,15 +27102,58 @@ in
sources."jsonpointer-4.0.0"
sources."xtend-4.0.1"
sources."is-property-1.0.2"
+ sources."pinkie-2.0.4"
+ sources."hoek-2.16.3"
+ sources."boom-2.10.1"
+ sources."cryptiles-2.0.5"
+ sources."sntp-1.0.9"
+ sources."assert-plus-0.2.0"
+ sources."jsprim-1.3.1"
+ (sources."sshpk-1.10.1" // {
+ dependencies = [
+ sources."assert-plus-1.0.0"
+ ];
+ })
+ sources."extsprintf-1.0.2"
+ sources."json-schema-0.2.3"
+ sources."verror-1.3.6"
+ sources."asn1-0.2.3"
+ (sources."dashdash-1.14.0" // {
+ dependencies = [
+ sources."assert-plus-1.0.0"
+ ];
+ })
+ (sources."getpass-0.1.6" // {
+ dependencies = [
+ sources."assert-plus-1.0.0"
+ ];
+ })
+ sources."jsbn-0.1.0"
+ sources."tweetnacl-0.14.3"
+ sources."jodid25519-1.0.2"
+ sources."ecc-jsbn-0.1.1"
+ sources."bcrypt-pbkdf-1.0.0"
+ sources."mime-db-1.25.0"
sources."uglify-to-browserify-1.0.2"
- (sources."yargs-3.5.4" // {
+ sources."yargs-3.10.0"
+ sources."camelcase-1.2.1"
+ (sources."cliui-2.1.0" // {
dependencies = [
sources."wordwrap-0.0.2"
];
})
- sources."camelcase-1.2.1"
sources."decamelize-1.2.0"
sources."window-size-0.1.0"
+ sources."center-align-0.1.3"
+ sources."right-align-0.1.3"
+ sources."align-text-0.1.4"
+ sources."lazy-cache-1.0.4"
+ sources."kind-of-3.0.4"
+ sources."longest-1.0.1"
+ sources."repeat-string-1.6.1"
+ sources."is-buffer-1.1.4"
+ sources."asynckit-0.4.0"
+ sources."punycode-1.4.1"
sources."os-tmpdir-1.0.2"
sources."rimraf-2.2.8"
sources."cycle-1.0.3"
@@ -26130,10 +27172,10 @@ in
typescript = nodeEnv.buildNodePackage {
name = "typescript";
packageName = "typescript";
- version = "2.0.6";
+ version = "2.0.10";
src = fetchurl {
- url = "https://registry.npmjs.org/typescript/-/typescript-2.0.6.tgz";
- sha1 = "5385499ac9811508c2c43e0ea07a1ddca435e111";
+ url = "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz";
+ sha1 = "ccdd4ed86fd5550a407101a0814012e1b3fac3dd";
};
buildInputs = globalBuildInputs;
meta = {
@@ -26191,7 +27233,7 @@ in
sources."bluebird-3.3.5"
sources."blueimp-md5-2.3.1"
sources."body-parser-1.15.2"
- sources."color-0.11.3"
+ sources."color-0.11.4"
sources."cookie-parser-1.4.3"
sources."crossroads-0.12.2"
sources."diff2html-1.2.0"
@@ -26210,7 +27252,7 @@ in
sources."getmac-1.2.1"
sources."hasher-1.2.0"
sources."keen.io-0.1.3"
- sources."knockout-3.4.0"
+ sources."knockout-3.4.1"
sources."lodash-4.12.0"
(sources."mkdirp-0.5.1" // {
dependencies = [
@@ -26238,11 +27280,11 @@ in
})
(sources."npm-registry-client-7.1.2" // {
dependencies = [
- sources."request-2.76.0"
+ sources."request-2.79.0"
sources."retry-0.8.0"
sources."combined-stream-1.0.5"
sources."forever-agent-0.6.1"
- sources."form-data-2.1.1"
+ sources."form-data-2.1.2"
sources."hawk-3.1.3"
sources."json-stringify-safe-5.0.1"
sources."oauth-sign-0.8.2"
@@ -26313,23 +27355,23 @@ in
sources."content-type-1.0.2"
sources."debug-2.2.0"
sources."depd-1.1.0"
- sources."http-errors-1.5.0"
+ sources."http-errors-1.5.1"
sources."iconv-lite-0.4.13"
sources."on-finished-2.3.0"
sources."qs-6.2.0"
sources."raw-body-2.1.7"
- sources."type-is-1.6.13"
+ sources."type-is-1.6.14"
sources."ms-0.7.1"
- sources."inherits-2.0.1"
- sources."setprototypeof-1.0.1"
- sources."statuses-1.3.0"
+ sources."inherits-2.0.3"
+ sources."setprototypeof-1.0.2"
+ sources."statuses-1.3.1"
sources."ee-first-1.1.1"
sources."unpipe-1.0.0"
sources."media-typer-0.3.0"
- sources."mime-types-2.1.12"
- sources."mime-db-1.24.0"
+ sources."mime-types-2.1.13"
+ sources."mime-db-1.25.0"
sources."clone-1.0.2"
- sources."color-convert-1.5.0"
+ sources."color-convert-1.8.2"
sources."color-string-0.3.0"
sources."color-name-1.1.1"
sources."cookie-0.3.1"
@@ -26440,8 +27482,8 @@ in
})
sources."extract-opts-3.3.1"
sources."eachr-3.2.0"
- sources."editions-1.3.1"
- sources."typechecker-4.3.0"
+ sources."editions-1.3.3"
+ sources."typechecker-4.4.0"
sources."underscore-1.5.2"
sources."abbrev-1.0.9"
sources."ansicolors-0.3.2"
@@ -26463,7 +27505,7 @@ in
sources."minimatch-3.0.3"
];
})
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
sources."has-unicode-2.0.1"
sources."hosted-git-info-2.1.5"
sources."iferr-0.1.5"
@@ -26526,7 +27568,7 @@ in
sources."umask-1.1.0"
sources."unique-filename-1.1.0"
sources."validate-npm-package-name-2.2.2"
- sources."which-1.2.11"
+ sources."which-1.2.12"
sources."wrappy-1.0.2"
sources."write-file-atomic-1.1.4"
sources."ansi-regex-2.0.0"
@@ -26657,6 +27699,7 @@ in
];
})
sources."typedarray-0.0.6"
+ sources."uuid-3.0.0"
sources."asynckit-0.4.0"
sources."punycode-1.4.1"
sources."passport-strategy-1.0.0"
@@ -26768,7 +27811,7 @@ in
sources."is-utf8-0.2.1"
sources."read-pkg-1.1.0"
sources."path-type-1.1.0"
- sources."code-point-at-1.0.1"
+ sources."code-point-at-1.1.0"
sources."is-fullwidth-code-point-1.0.0"
sources."number-is-nan-1.0.1"
];
@@ -26798,7 +27841,7 @@ in
sources."kew-0.7.0"
];
})
- sources."tmp-0.0.29"
+ sources."tmp-0.0.30"
sources."follow-redirects-0.0.3"
(sources."config-chain-1.1.11" // {
dependencies = [
@@ -26824,7 +27867,7 @@ in
sources."progress-1.1.8"
sources."request-2.67.0"
sources."request-progress-2.0.1"
- sources."which-1.2.11"
+ sources."which-1.2.12"
sources."concat-stream-1.5.0"
sources."debug-0.7.4"
sources."yauzl-2.4.1"
@@ -26838,7 +27881,7 @@ in
sources."minimist-0.0.8"
sources."fd-slicer-1.0.1"
sources."pend-1.2.0"
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
sources."jsonfile-2.4.0"
sources."klaw-1.3.1"
sources."path-is-absolute-1.0.1"
@@ -26859,7 +27902,7 @@ in
sources."forever-agent-0.6.1"
sources."form-data-1.0.1"
sources."json-stringify-safe-5.0.1"
- sources."mime-types-2.1.12"
+ sources."mime-types-2.1.13"
sources."node-uuid-1.4.7"
sources."qs-5.2.1"
sources."tunnel-agent-0.4.3"
@@ -26874,8 +27917,8 @@ in
sources."is-typedarray-1.0.0"
sources."har-validator-2.0.6"
sources."async-2.1.2"
- sources."lodash-4.16.4"
- sources."mime-db-1.24.0"
+ sources."lodash-4.17.2"
+ sources."mime-db-1.25.0"
sources."assert-plus-0.2.0"
sources."jsprim-1.3.1"
(sources."sshpk-1.10.1" // {
@@ -26980,18 +28023,18 @@ in
sources."source-map-0.4.4"
];
})
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.10"
sources."big.js-3.1.3"
sources."emojis-list-2.1.0"
sources."json5-0.5.0"
sources."object-assign-4.1.0"
sources."errno-0.1.4"
- sources."readable-stream-2.1.5"
+ sources."readable-stream-2.2.2"
sources."prr-0.0.0"
sources."buffer-shims-1.0.0"
sources."core-util-is-1.0.2"
- sources."inherits-2.0.3"
sources."isarray-1.0.0"
+ sources."inherits-2.0.3"
sources."process-nextick-args-1.0.7"
sources."string_decoder-0.10.31"
sources."util-deprecate-1.0.2"
@@ -27069,7 +28112,7 @@ in
sources."is-glob-2.0.1"
sources."path-is-absolute-1.0.1"
sources."readdirp-2.1.0"
- sources."fsevents-1.0.14"
+ sources."fsevents-1.0.15"
sources."arrify-1.0.1"
sources."micromatch-2.3.11"
sources."arr-diff-2.0.0"
@@ -27108,25 +28151,26 @@ in
sources."nan-2.4.0"
sources."node-pre-gyp-0.6.31"
sources."nopt-3.0.6"
- sources."npmlog-4.0.0"
+ sources."npmlog-4.0.1"
(sources."rc-1.1.6" // {
dependencies = [
sources."minimist-1.2.0"
];
})
- sources."request-2.76.0"
+ sources."request-2.79.0"
sources."rimraf-2.5.4"
sources."semver-5.3.0"
sources."tar-2.2.1"
(sources."tar-pack-3.3.0" // {
dependencies = [
sources."once-1.3.3"
+ sources."readable-stream-2.1.5"
];
})
sources."abbrev-1.0.9"
sources."are-we-there-yet-1.1.2"
sources."console-control-strings-1.1.0"
- sources."gauge-2.6.0"
+ sources."gauge-2.7.1"
sources."set-blocking-2.0.0"
sources."delegates-1.0.0"
sources."aproba-1.0.4"
@@ -27136,7 +28180,7 @@ in
sources."string-width-1.0.2"
sources."strip-ansi-3.0.1"
sources."wide-align-1.1.0"
- sources."code-point-at-1.0.1"
+ sources."code-point-at-1.1.0"
sources."is-fullwidth-code-point-1.0.0"
sources."number-is-nan-1.0.1"
sources."ansi-regex-2.0.0"
@@ -27149,20 +28193,20 @@ in
sources."combined-stream-1.0.5"
sources."extend-3.0.0"
sources."forever-agent-0.6.1"
- sources."form-data-2.1.1"
+ sources."form-data-2.1.2"
sources."har-validator-2.0.6"
sources."hawk-3.1.3"
sources."http-signature-1.1.1"
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."json-stringify-safe-5.0.1"
- sources."mime-types-2.1.12"
- sources."node-uuid-1.4.7"
+ sources."mime-types-2.1.13"
sources."oauth-sign-0.8.2"
sources."qs-6.3.0"
sources."stringstream-0.0.5"
sources."tough-cookie-2.3.2"
sources."tunnel-agent-0.4.3"
+ sources."uuid-3.0.0"
sources."delayed-stream-1.0.0"
sources."asynckit-0.4.0"
(sources."chalk-1.1.3" // {
@@ -27213,7 +28257,7 @@ in
sources."jodid25519-1.0.2"
sources."ecc-jsbn-0.1.1"
sources."bcrypt-pbkdf-1.0.0"
- sources."mime-db-1.24.0"
+ sources."mime-db-1.25.0"
sources."glob-7.1.1"
sources."fs.realpath-1.0.0"
sources."inflight-1.0.6"
@@ -27226,7 +28270,7 @@ in
sources."uid-number-0.0.6"
sources."ms-0.7.1"
sources."source-list-map-0.1.6"
- sources."amdefine-1.0.0"
+ sources."amdefine-1.0.1"
];
buildInputs = globalBuildInputs;
meta = {
diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
index 544db9e0d78b..feeb94a5c462 100644
--- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix
+++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
@@ -1,32 +1,39 @@
-{ stdenv, fetchzip, ocaml, findlib, cstruct, zarith, ounit }:
+{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, cstruct, zarith, ounit, result, topkg, opam }:
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
+let ocamlFlags = "-I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/"; in
-let version = "0.1.2"; in
+buildOcaml rec {
+ name = "asn1-combinators";
+ version = "0.1.3";
-stdenv.mkDerivation {
- name = "ocaml-asn1-combinators-${version}";
+ minimumSupportedOcamlVersion = "4.01";
- src = fetchzip {
- url = "https://github.com/mirleft/ocaml-asn1-combinators/archive/${version}.tar.gz";
- sha256 = "13vpdgcyph4vq3gcp8b16756s4nz3crpxhxfhcqgc1ffz61gc0h5";
+ src = fetchFromGitHub {
+ owner = "mirleft";
+ repo = "ocaml-asn1-combinators";
+ rev = "v${version}";
+ sha256 = "0hpn049i46sdnv2i6m7r6m6ch0jz8argybh71wykbvcqdby08zxj";
};
- buildInputs = [ ocaml findlib ounit ];
- propagatedBuildInputs = [ cstruct zarith ];
+ buildInputs = [ ocaml findlib ounit topkg opam ];
+ propagatedBuildInputs = [ result cstruct zarith ];
createFindlibDestdir = true;
- configureFlags = "--enable-tests";
+ buildPhase = "ocaml ${ocamlFlags} pkg/pkg.ml build --tests true";
+
+ installPhase = ''
+ opam-installer --script --prefix=$out | sh
+ ln -s $out/lib/asn1-combinators $out/lib/ocaml/${ocaml.version}/site-lib
+ '';
+
doCheck = true;
- checkTarget = "test";
+ checkPhase = "ocaml ${ocamlFlags} pkg/pkg.ml test";
meta = {
homepage = https://github.com/mirleft/ocaml-asn1-combinators;
description = "Combinators for expressing ASN.1 grammars in OCaml";
- platforms = ocaml.meta.platforms or [];
- license = stdenv.lib.licenses.bsd2;
+ license = stdenv.lib.licenses.isc;
maintainers = with stdenv.lib.maintainers; [ vbgl ];
- broken = stdenv.isi686; # https://github.com/mirleft/ocaml-asn1-combinators/issues/13
};
}
diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix
index dd6cffb979c5..8c1aac4d83b2 100644
--- a/pkgs/development/ocaml-modules/cstruct/default.nix
+++ b/pkgs/development/ocaml-modules/cstruct/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, writeText, fetchFromGitHub, ocaml, ocplib-endian, sexplib_p4, findlib, ppx_tools
-, async_p4 ? null, lwt ? null, camlp4
+{ stdenv, writeText, fetchFromGitHub, ocaml, ocplib-endian, sexplib, findlib, ppx_tools
+, async ? null, lwt ? null
}:
assert stdenv.lib.versionAtLeast ocaml.version "4.01";
@@ -22,10 +22,10 @@ stdenv.mkDerivation {
inherit (param) sha256;
};
- configureFlags = [ "${opt lwt}-lwt" "${opt async_p4}-async" "${opt ppx_tools}-ppx" ];
+ configureFlags = [ "${opt lwt}-lwt" "${opt async}-async" "${opt ppx_tools}-ppx" ];
- buildInputs = [ ocaml findlib ppx_tools camlp4 lwt async_p4 ];
- propagatedBuildInputs = [ ocplib-endian sexplib_p4 ];
+ buildInputs = [ ocaml findlib ppx_tools lwt async ];
+ propagatedBuildInputs = [ ocplib-endian sexplib ];
createFindlibDestdir = true;
dontStrip = true;
diff --git a/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix
new file mode 100644
index 000000000000..a7290c8bb98f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildOcaml, fetchFromGitHub, fetchurl, ocaml, findlib, erm_xml, nocrypto }:
+
+buildOcaml rec {
+ version = "0.3";
+ name = "erm_xmpp";
+
+ src = fetchFromGitHub {
+ owner = "hannesm";
+ repo = "xmpp";
+ rev = "eee18bd3dd343550169969c0b45548eafd51cfe1";
+ sha256 = "0hzs528lrx1ayalv6fh555pjn0b4l8xch1f72hd3b07g1xahdas5";
+ };
+
+ buildInputs = [ ocaml findlib ];
+ propagatedBuildInputs = [ erm_xml nocrypto ];
+
+ configurePhase = "ocaml setup.ml -configure --prefix $out";
+ buildPhase = "ocaml setup.ml -build";
+ installPhase = "ocaml setup.ml -install";
+
+ createFindlibDestdir = true;
+
+ meta = {
+ homepage = https://github.com/hannesm/xmpp;
+ description = "OCaml based XMPP implementation (fork)";
+ license = stdenv.lib.licenses.bsd3;
+ maintainers = with stdenv.lib.maintainers; [ sternenseemann ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix
index 839a49615cd8..9592e9a68d81 100644
--- a/pkgs/development/ocaml-modules/menhir/default.nix
+++ b/pkgs/development/ocaml-modules/menhir/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild
-, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20160526" else "20140422"
+, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20161115" else "20140422"
}@args:
let
sha256 =
if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d"
- else if version == "20160526" then "1i6yqxhs29n6qcvi6c5qbg5mh8752ywsyv1dr6x1qcv0ncqpxhns"
+ else if version == "20161115" then "1j8nmcj2gq6hyyi16z27amiahplgrnk4ppchpm0v4qy80kwkf47k"
else throw ("menhir: unknown version " ++ version);
in
diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix
index fab048a9a9f8..d7f7ae0e3655 100644
--- a/pkgs/development/ocaml-modules/nocrypto/default.nix
+++ b/pkgs/development/ocaml-modules/nocrypto/default.nix
@@ -1,20 +1,30 @@
-{ stdenv, fetchzip, ocaml, findlib, cstruct, type_conv, zarith, ocaml_lwt, ounit }:
+{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib
+, cstruct, zarith, ounit, ocaml_oasis, ppx_sexp_conv, sexplib
+, lwt ? null}:
-assert stdenv.lib.versionAtLeast ocaml.version "4.01";
+with stdenv.lib;
+let withLwt = lwt != null; in
-stdenv.mkDerivation rec {
- name = "ocaml-nocrypto-${version}";
- version = "0.5.1";
+buildOcaml rec {
+ name = "nocrypto";
+ version = "0.5.3";
- src = fetchzip {
- url = "https://github.com/mirleft/ocaml-nocrypto/archive/${version}.tar.gz";
- sha256 = "15gffvixk12ghsfra9amfszd473c8h188zfj03ngvblbdm0d80m0";
+ minimumSupportedOcamlVersion = "4.02";
+
+ src = fetchFromGitHub {
+ owner = "mirleft";
+ repo = "ocaml-nocrypto";
+ rev = "v${version}";
+ sha256 = "0m3yvqpgfffqp15mcl08b78cv8zw25rnp6z1pkj5aimz6xg3gqbl";
};
- buildInputs = [ ocaml findlib type_conv ocaml_lwt ounit ];
- propagatedBuildInputs = [ cstruct zarith ];
+ buildInputs = [ ocaml ocaml_oasis findlib ounit ppx_sexp_conv ];
+ propagatedBuildInputs = [ cstruct zarith sexplib ] ++ optional withLwt lwt;
+
+ configureFlags = [ "--enable-tests" ] ++ optional withLwt ["--enable-lwt"];
+
+ configurePhase = "./configure --prefix $out $configureFlags";
- configureFlags = "--enable-tests";
doCheck = true;
checkTarget = "test";
createFindlibDestdir = true;
@@ -22,7 +32,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = https://github.com/mirleft/ocaml-nocrypto;
description = "Simplest possible crypto to support TLS";
- platforms = ocaml.meta.platforms or [];
license = stdenv.lib.licenses.bsd2;
maintainers = with stdenv.lib.maintainers; [ vbgl ];
};
diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix
new file mode 100644
index 000000000000..3178789c3993
--- /dev/null
+++ b/pkgs/development/ocaml-modules/notty/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, buildOcaml, fetchFromGitHub, findlib
+, result, uucp, uuseg, uutf
+, lwt ? null }:
+
+with stdenv.lib;
+
+let withLwt = lwt != null; in
+
+buildOcaml rec {
+ version = "0.1.1";
+ name = "notty";
+
+ minimumSupportedOcamlVersion = "4.02";
+
+ src = fetchFromGitHub {
+ owner = "pqwy";
+ repo = "notty";
+ rev = "v${version}";
+ sha256 = "0bw3bq8z2y1rhc20zn13s78sazywyzpg8nmyjch33p7ypxfglf01";
+ };
+
+ buildInputs = [ findlib ];
+ propagatedBuildInputs = [ result uucp uuseg uutf ] ++
+ optional withLwt [ lwt ];
+
+ configureFlags = [ "--enable-unix" ] ++
+ (if withLwt then ["--enable-lwt"] else ["--disable-lwt"]);
+
+ configurePhase = "./configure --prefix $out $configureFlags";
+
+ meta = {
+ inherit (src.meta) homepage;
+ description = "Declarative terminal graphics for OCaml";
+ license = licenses.isc;
+ maintainers = with maintainers; [ sternenseemann ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix
new file mode 100644
index 000000000000..dfee365cd750
--- /dev/null
+++ b/pkgs/development/ocaml-modules/otr/default.nix
@@ -0,0 +1,43 @@
+{stdenv, buildOcaml, fetchFromGitHub, ocamlbuild, findlib, topkg, ocaml, opam,
+ ppx_tools, ppx_sexp_conv, cstruct, sexplib, result, nocrypto, astring}:
+
+let ocamlFlags = "-I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/"; in
+
+buildOcaml rec {
+ name = "otr";
+ version = "0.3.3";
+
+ minimumSupportedOcamlVersion = "4.02";
+
+ src = fetchFromGitHub {
+ owner = "hannesm";
+ repo = "ocaml-otr";
+ rev = "${version}";
+ sha256 = "07zzix5mfsasqpqdx811m0x04gp8mq1ayf4b64998k98027v01rr";
+ };
+
+ buildInputs = [ ocamlbuild findlib topkg ppx_tools ppx_sexp_conv opam ];
+ propagatedBuildInputs = [ cstruct sexplib result nocrypto astring ];
+
+ buildPhase = ''
+ ocaml ${ocamlFlags} pkg/pkg.ml build \
+ --tests true
+ '';
+
+ installPhase = ''
+ opam-installer --prefix=$out --script | sh
+ ln -s $out/lib/otr $out/lib/ocaml/${ocaml.version}/site-lib
+ '';
+
+ doCheck = true;
+ checkPhase = "ocaml ${ocamlFlags} pkg/pkg.ml test";
+
+ createFindlibDestdir = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/hannesm/ocaml-otr;
+ description = "Off-the-record messaging protocol, purely in OCaml";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ sternenseemann ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix
new file mode 100644
index 000000000000..b38138c55731
--- /dev/null
+++ b/pkgs/development/ocaml-modules/tls/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, buildOcaml, fetchFromGitHub, findlib, ocamlbuild, ocaml_oasis
+, ppx_tools, ppx_sexp_conv, result, x509, nocrypto, cstruct, ounit
+, lwt ? null}:
+
+with stdenv.lib;
+
+let withLwt = lwt != null; in
+
+buildOcaml rec {
+ version = "0.7.1";
+ name = "tls";
+
+ minimunSupportedOcamlVersion = "4.02";
+
+ src = fetchFromGitHub {
+ owner = "mirleft";
+ repo = "ocaml-tls";
+ rev = "${version}";
+ sha256 = "19q2hzxiasz9pzczgb63kikg0mc9mw98dfvch5falf2rincycj24";
+ };
+
+ buildInputs = [ ocamlbuild findlib ocaml_oasis ppx_sexp_conv ounit ];
+ propagatedBuildInputs = [ cstruct nocrypto result x509 ] ++
+ optional withLwt lwt;
+
+ configureFlags = [ "--disable-mirage" "--enable-tests" ] ++
+ optional withLwt ["--enable-lwt"];
+
+ configurePhase = "./configure --prefix $out $configureFlags";
+
+ doCheck = true;
+ checkTarget = "test";
+ createFindlibDestdir = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/mirleft/ocaml-tls;
+ description = "TLS in pure OCaml";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ sternenseemann ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix
index c44ccb18982a..ab82f6abdcbb 100644
--- a/pkgs/development/ocaml-modules/x509/default.nix
+++ b/pkgs/development/ocaml-modules/x509/default.nix
@@ -1,28 +1,32 @@
-{ stdenv, fetchzip, ocaml, findlib, asn1-combinators, nocrypto, ounit }:
+{stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, asn1-combinators, nocrypto, ounit, ocaml_oasis, ppx_sexp_conv}:
-let version = "0.5.0"; in
+buildOcaml rec {
+ name = "x509";
+ version = "0.5.3";
-stdenv.mkDerivation {
- name = "ocaml-x509-${version}";
+ mininimumSupportedOcamlVersion = "4.02";
- src = fetchzip {
- url = "https://github.com/mirleft/ocaml-x509/archive/${version}.tar.gz";
- sha256 = "0i9618ph4i2yk5dvvhiqhm7wf3qmd6b795mxwff8jf856gb2gdyn";
+ src = fetchFromGitHub {
+ owner = "mirleft";
+ repo = "ocaml-x509";
+ rev = "${version}";
+ sha256 = "07cc3z6h87460z3f4vz8nlczw5jkc4vjhix413z9x6nral876rn7";
};
- buildInputs = [ ocaml findlib ounit ];
+ buildInputs = [ ocaml ocaml_oasis findlib ounit ppx_sexp_conv ];
propagatedBuildInputs = [ asn1-combinators nocrypto ];
configureFlags = "--enable-tests";
+ configurePhase = "./configure --prefix $out $configureFlags";
+
doCheck = true;
checkTarget = "test";
createFindlibDestdir = true;
- meta = {
+ meta = with stdenv.lib; {
homepage = https://github.com/mirleft/ocaml-x509;
description = "X509 (RFC5280) handling in OCaml";
- platforms = ocaml.meta.platforms or [];
- license = stdenv.lib.licenses.bsd2;
- maintainers = with stdenv.lib.maintainers; [ vbgl ];
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ vbgl ];
};
}
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index dfddd7dddbdb..33bb1d5a4cab 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -10,6 +10,8 @@ mkPythonDerivation rec {
sha256 = "08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8a5cbe7";
};
+ outputs = [ "out" "dev" ];
+
buildInputs = [ pkgconfig glib gobjectIntrospection ]
++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ];
propagatedBuildInputs = [ pycairo cairo ];
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 21cc80ea6bae..acd04ee3bf5a 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -21,7 +21,7 @@
, libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
, pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
, cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl
-, libmsgpack, qt48, libsodium, snappy
+, libmsgpack, qt48, libsodium, snappy, libossp_uuid
}@args:
let
@@ -202,6 +202,10 @@ in
--replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
'';
};
+
+ uuid4r = attrs: {
+ buildInputs = [ which libossp_uuid ];
+ };
xapian-ruby = attrs: {
# use the system xapian
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index b481c1e80e5d..91037588552c 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- version = "6.18";
+ version = "6.19";
name = "checkstyle-${version}";
src = fetchurl {
url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
- sha256 = "1ls2q6zvnfsvb3b5d9s1p6c5gcdnwm2mlj2dm8jr4nifkymi6q5m";
+ sha256 = "0x899i5yamwyhv7wgii80fv5hl8bdq0b8wlx1f789l85ik8rjwk9";
};
installPhase = ''
diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix
new file mode 100644
index 000000000000..c8e667722c50
--- /dev/null
+++ b/pkgs/development/tools/bloaty/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, binutils, fetchgit }:
+
+stdenv.mkDerivation rec {
+ version = "2016.11.16";
+ name = "bloaty-${version}";
+
+ src = fetchgit {
+ url = "https://github.com/google/bloaty.git";
+ rev = "d040e4821ace478f9b43360acd6801aefdd323f7";
+ sha256 = "1qk2wgd7vzr5zy0332y9h69cwkqmy8x7qz97xpgwwnk54amm8i3k";
+ fetchSubmodules = true;
+ };
+
+ enableParallelBuilding = true;
+
+ configurePhase = ''
+ sed -i 's,c++filt,${binutils}/bin/c++filt,' src/bloaty.cc
+ '';
+
+ installPhase = ''
+ install -Dm755 {.,$out/bin}/bloaty
+ '';
+
+ meta = with stdenv.lib; {
+ description = "a size profiler for binaries";
+ homepage = https://github.com/google/bloaty;
+ license = licenses.asl20;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.dtzWill ];
+ };
+}
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 01d1c97ba968..6a752d08cff0 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "jenkins-${version}";
- version = "2.13";
+ version = "2.33";
src = fetchurl {
url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
- sha256 = "0rb3spml2c7cd34zjjc5mwsdcnwmcbcdc784nl8cczayiwz8nq3p";
+ sha256 = "1x1m4d7r128v6i0gpa4z07db6vdw1x9ik0p4a8gsnj6g15fzkdzy";
};
buildCommand = ''
diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
index 4a7d1bf87e31..37517f306e82 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@@ -2,15 +2,26 @@
buildGoPackage rec {
name = "doctl-${version}";
- version = "1.3.1";
- rev = "a57555c195d06bc7aa5037af77fde0665ad1231f";
+ version = "${major}.${minor}.${patch}";
+ major = "1";
+ minor = "5";
+ patch = "0";
goPackagePath = "github.com/digitalocean/doctl";
+ excludedPackages = ''\(doctl-gen-doc\|install-doctl\|release-doctl\)'';
+ buildFlagsArray = let t = "${goPackagePath}"; in ''
+ -ldflags=
+ -X ${t}.Major=${major}
+ -X ${t}.Minor=${minor}
+ -X ${t}.Patch=${patch}
+ -X ${t}.Label=release
+ '';
+
src = fetchFromGitHub {
owner = "digitalocean";
repo = "doctl";
- rev = "${rev}";
- sha256 = "03z652fw0a628gv666w8vpi05a4sdilvs1j5scjhcbi82zsbkvma";
+ rev = "v${version}";
+ sha256 = "0dk7l4b0ngqkwdlx8qgr99jzipyzazvkv7dybi75dnp725lwxkl2";
};
meta = {
diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix
index ddb136ed86ea..837da4a09dc9 100644
--- a/pkgs/development/tools/godef/default.nix
+++ b/pkgs/development/tools/godef/default.nix
@@ -18,6 +18,6 @@ buildGoPackage rec {
description = "Print where symbols are defined in Go source code";
homepage = "https://github.com/rogpeppe/godef/";
maintainers = with stdenv.lib.maintainers; [ vdemeester ];
- licence = stdenv.lib.licenses.bsd3;
+ license = stdenv.lib.licenses.bsd3;
};
}
diff --git a/pkgs/development/tools/jsduck/Gemfile b/pkgs/development/tools/jsduck/Gemfile
new file mode 100644
index 000000000000..483fc40ff799
--- /dev/null
+++ b/pkgs/development/tools/jsduck/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "jsduck"
diff --git a/pkgs/development/tools/jsduck/Gemfile.lock b/pkgs/development/tools/jsduck/Gemfile.lock
new file mode 100644
index 000000000000..d3e1556a7b39
--- /dev/null
+++ b/pkgs/development/tools/jsduck/Gemfile.lock
@@ -0,0 +1,23 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ dimensions (1.2.0)
+ jsduck (5.3.4)
+ dimensions (~> 1.2.0)
+ json (~> 1.8.0)
+ parallel (~> 0.7.1)
+ rdiscount (~> 2.1.6)
+ rkelly-remix (~> 0.0.4)
+ json (1.8.3)
+ parallel (0.7.1)
+ rdiscount (2.1.8)
+ rkelly-remix (0.0.7)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ jsduck
+
+BUNDLED WITH
+ 1.13.6
diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/development/tools/jsduck/default.nix
new file mode 100644
index 000000000000..ef89517966d7
--- /dev/null
+++ b/pkgs/development/tools/jsduck/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, bundlerEnv, makeWrapper, }:
+
+stdenv.mkDerivation rec {
+ pname = "jsduck";
+ name = "${pname}-${version}";
+ version = "5.3.4";
+
+ env = bundlerEnv {
+ name = "${pname}";
+ gemfile = ./Gemfile;
+ lockfile = ./Gemfile.lock;
+ gemset = ./gemset.nix;
+ };
+
+ phases = [ "installPhase" ];
+
+ buildInputs = [ env makeWrapper ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ makeWrapper ${env}/bin/jsduck $out/bin/jsduck
+ '';
+
+ meta = with lib; {
+ description = "Simple JavaScript Duckumentation generator.";
+ homepage = https://github.com/senchalabs/jsduck;
+ license = with licenses; gpl3;
+ maintainers = with stdenv.lib.maintainers; [ periklis ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/tools/jsduck/gemset.nix b/pkgs/development/tools/jsduck/gemset.nix
new file mode 100644
index 000000000000..d80bd70dd728
--- /dev/null
+++ b/pkgs/development/tools/jsduck/gemset.nix
@@ -0,0 +1,51 @@
+{
+ dimensions = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1pqb7yzjcpbgbyi196ifqbd1wy570cn12bkzcvpcha4xilhajja0";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ jsduck = {
+ dependencies = ["dimensions" "json" "parallel" "rdiscount" "rkelly-remix"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0hac7g9g6gg10bigbm8dskwwbv1dfch8ca353gh2bkwf244qq2xr";
+ type = "gem";
+ };
+ version = "5.3.4";
+ };
+ json = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
+ type = "gem";
+ };
+ version = "1.8.3";
+ };
+ parallel = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1kzz6ydg7r23ks2b7zbpx4vz3h186n19vhgnjcwi7xwd6h2f1fsq";
+ type = "gem";
+ };
+ version = "0.7.1";
+ };
+ rdiscount = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0vcyy90r6wfg0b0y5wqp3d25bdyqjbwjhkm1xy9jkz9a7j72n70v";
+ type = "gem";
+ };
+ version = "2.1.8";
+ };
+ rkelly-remix = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1g7hjl9nx7f953y7lncmfgp0xgxfxvgfm367q6da9niik6rp1y3j";
+ type = "gem";
+ };
+ version = "0.0.7";
+ };
+}
\ No newline at end of file
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index d4a2f80599f7..6386d3176a92 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -72,6 +72,6 @@ stdenv.mkDerivation rec {
description = "A set of utilities to handle ELF objects";
platforms = lib.platforms.linux;
license = lib.licenses.gpl3;
- maintainers = lib.maintainers.eelco;
+ maintainers = [ lib.maintainers.eelco ];
};
}
diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index 9059d4ba718a..d88a06c64048 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/pkgs/development/tools/misc/tokei/default.nix
@@ -4,13 +4,13 @@ with rustPlatform;
buildRustPackage rec {
name = "tokei-${version}";
- version = "3.0.0";
+ version = "4.0.0";
src = fetchurl {
url = "https://github.com/Aaronepower/tokei/archive/${version}.tar.gz";
- sha256 = "0xymz52gpasihzhxglzx4wh0312zkraxy4yrpxz694zalf2s5vj5";
+ sha256 = "1c7z3dgxr76dq6cvan3hgqlkcv61gmg6fkv6b98viymh4fy9if68";
};
- depsSha256 = "1syx8qzjn357dk2bf4ndmgc4zvrglmw88qiw117h6s511qyz8z0z";
+ depsSha256 = "0v4gplk7mkkik9vr1lqsr0yl1kqkqh14ncw95yb9iv7hcxvmcqn3";
installPhase = ''
mkdir -p $out/bin
@@ -23,6 +23,5 @@ buildRustPackage rec {
license = licenses.mit;
maintainers = with maintainers; [ gebner ];
platforms = platforms.all;
- broken = true;
};
}
diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix
index a4c61a58b899..57c57969a88b 100644
--- a/pkgs/development/tools/misc/uncrustify/default.nix
+++ b/pkgs/development/tools/misc/uncrustify/default.nix
@@ -1,15 +1,19 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "uncrustify";
- version = "0.63";
+ version = "0.64";
- src = fetchurl {
- url = "mirror://sourceforge/uncrustify/${product}-${version}.tar.gz";
- sha256 = "1qravjzmips3m7asbsd0qllmprrl1rshjlmnfq68w84d38sb3yyz";
+ src = fetchFromGitHub {
+ owner = product;
+ repo = product;
+ rev = name;
+ sha256 = "0gvgv44aqrh7cmj4ji8dpbhp47cklvajlc3s9d9z24x96dhp2v97";
};
+ nativeBuildInputs = [ cmake ];
+
meta = with stdenv.lib; {
description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA";
homepage = http://uncrustify.sourceforge.net/;
diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix
index 07cc55465d10..51f4de8eacce 100644
--- a/pkgs/development/tools/misc/xxdiff/default.nix
+++ b/pkgs/development/tools/misc/xxdiff/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, qt4, flex, bison, docutils }:
stdenv.mkDerivation rec {
- name = "xxdiff-4.0";
+ name = "xxdiff-4.0.1";
src = fetchurl {
url = "mirror://sourceforge/xxdiff/${name}.tar.bz2";
- sha256 = "0c0k8cwxyv5byw7va1n9iykvypv435j0isvys21rkj1bx121al4i";
+ sha256 = "0050qd12fvlcfdh0iwjsaxgxdq7jsl70f85fbi7pz23skpddsn5z";
};
nativeBuildInputs = [ flex bison qt4 docutils ];
@@ -18,12 +18,11 @@ stdenv.mkDerivation rec {
installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin";
- meta = {
- homepage = "http://furius.ca/xxdiff/";
+ meta = with stdenv.lib; {
+ homepage = http://furius.ca/xxdiff/;
description = "Graphical file and directories comparator and merge tool";
- license = stdenv.lib.licenses.gpl2;
-
- platforms = stdenv.lib.platforms.linux;
- maintainers = [];
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ pSub ];
};
}
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index 3c99c3b9580b..2aa2321ef6ac 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -8,10 +8,10 @@ let
then
"2.3.1"
else
- "2.5.1";
+ "2.5.2";
hashes = {
"2.3.1" = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn";
- "2.5.1" = "0p3hqxawp18q43ws6506cnndi49f3gxzmai0x2qch7h42dgh1cb8";
+ "2.5.2" = "150iyy75wqwva096c8g1w2sc97nfdgbry6kpz4ngz6l7ij3vivpc";
};
in
diff --git a/pkgs/development/tools/parsing/jikespg/default.nix b/pkgs/development/tools/parsing/jikespg/default.nix
index 7cfb39ebdedc..6f0eb3735ffb 100644
--- a/pkgs/development/tools/parsing/jikespg/default.nix
+++ b/pkgs/development/tools/parsing/jikespg/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
name = "jikespg-1.3";
src = fetchurl {
- url = mirror://sourceforge/jikes/jikespg-1.3.tar.gz;
- md5 = "eba183713d9ae61a887211be80eeb21f";
+ url = "mirror://sourceforge/jikes/${name}.tar.gz";
+ sha256 = "083ibfxaiw1abxmv1crccx1g6sixkbyhxn2hsrlf6fwii08s6rgw";
};
sourceRoot = "jikespg/src";
@@ -16,9 +16,11 @@ stdenv.mkDerivation {
cp jikespg $out/bin
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = http://jikes.sourceforge.net/;
description = "The Jikes Parser Generator";
- platforms = stdenv.lib.platforms.linux;
+ platforms = platforms.linux;
+ license = licenses.ipl10;
+ maintainers = with maintainers; [ pSub ];
};
}
diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index 753c91aa6880..e54d4c540fe2 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "ragel-${version}";
- version = "7.0.0.6";
+ version = "7.0.0.9";
src = fetchurl {
url = "http://www.colm.net/files/ragel/${name}.tar.gz";
- sha256 = "1ns3kbcvhinn4rwm54ajg49d1la8filxskl3rgbwws0irzw507vs";
+ sha256 = "1w2jhfg3fxl15gcmm7z3jbi6splgc83mmwcfbp08lfc8sg2wmrmr";
};
buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript tex ];
diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix
index a53cb4bc0bd0..534f358e5319 100644
--- a/pkgs/development/tools/scalafmt/default.nix
+++ b/pkgs/development/tools/scalafmt/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, unzip, jre }:
stdenv.mkDerivation rec {
- version = "0.4.2";
+ version = "0.4.10";
baseName = "scalafmt";
name = "${baseName}-${version}";
src = fetchurl {
url = "https://github.com/olafurpg/scalafmt/releases/download/v${version}/${baseName}.tar.gz";
- sha256 = "087zj30jnd2zic9glfk7kl8r97bzv34y2qz56iyh75a69dcs6gnk";
+ sha256 = "0igz95zy69pasvj4vya71akhwlc0233m7kwrn66rali1wxs2kcsz";
};
unpackPhase = "tar xvzf $src";
diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix
index 420f2b0412f0..544f438cf86a 100644
--- a/pkgs/development/web/nodejs/v7.nix
+++ b/pkgs/development/web/nodejs/v7.nix
@@ -10,19 +10,12 @@ let
baseName = if enableNpm then "nodejs" else "nodejs-slim";
in
stdenv.mkDerivation (nodejs // rec {
- version = "7.0.0";
+ version = "7.1.0";
name = "${baseName}-${version}";
src = fetchurl {
url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
- sha256 = "16l9r91z4dxmgc01fs1y8jdh8xjnmyyrq60isyznnxfnq9v3qv71";
+ sha256 = "10a9rwi9v8ylpxydfh1f59smqbljk5axqwghp1qszqwh40d87bjm";
};
- patches = nodejs.patches ++ [
- (fetchpatch {
- url = "https://github.com/nodejs/node/commit/fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4.patch";
- sha256 = "1rms3n09622xmddn013yvf5c6p3s8w8s0d2h813zs8c1l15k4k1i";
- })
- ];
-
})
diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix
index 6b4dface0e1c..68ef1fd53926 100644
--- a/pkgs/games/0ad/data.nix
+++ b/pkgs/games/0ad/data.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "0ad-data-${version}";
- version = "0.0.20";
+ version = "0.0.21";
src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz";
- sha256 = "1lzl8chfqbgs1n9vpn0xaqd70kpwiibfk196iblyq6qkms3v6pnv";
+ sha256 = "15xadyrpvq27lm9p1ny7bcmmv56m16h3xadbkdx69gfkzxc3razk";
};
installPhase = ''
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index e4d4e3cb8e4e..f038673f4c0b 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, callPackage, perl, fetchurl, python2
-, pkgconfig, spidermonkey_31, boost, icu, libxml2, libpng
+, pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng
, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
, openal, mesa, xproto, libX11, libXcursor, nspr, SDL, SDL2
, gloox, nvidia-texture-tools
@@ -10,17 +10,17 @@ assert withEditor -> wxGTK != null;
stdenv.mkDerivation rec {
name = "0ad-${version}";
- version = "0.0.20";
+ version = "0.0.21";
src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz";
- sha256 = "13n61xhjsawda3kl7112la41bqkbqmq4yhr3slydsz856z5xb5m3";
+ sha256 = "1kw3hqnr737ipx4f03khz3hvsh3ha7r8iy9njppk2faa53j27gln";
};
nativeBuildInputs = [ python2 perl pkgconfig ];
buildInputs = [
- spidermonkey_31 boost icu libxml2 libpng libjpeg
+ spidermonkey_38 boost icu libxml2 libpng libjpeg
zlib curl libogg libvorbis enet miniupnpc openal
mesa xproto libX11 libXcursor nspr SDL2 gloox
nvidia-texture-tools
@@ -44,11 +44,16 @@ stdenv.mkDerivation rec {
# Delete shipped libraries which we don't need.
rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey}
+ # Workaround invalid pkgconfig name for mozjs
+ mkdir pkgconfig
+ ln -s ${spidermonkey_38}/lib/pkgconfig/* pkgconfig/mozjs-38.pc
+ PKG_CONFIG_PATH="$PWD/pkgconfig:$PKG_CONFIG_PATH"
+
# Update Makefiles
pushd build/workspaces
./update-workspaces.sh \
--with-system-nvtt \
- --with-system-mozjs31 \
+ --with-system-mozjs38 \
${lib.optionalString withEditor "--enable-atlas"} \
--bindir="$out"/bin \
--libdir="$out"/lib/0ad \
diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix
new file mode 100644
index 000000000000..e89d16b788a6
--- /dev/null
+++ b/pkgs/games/gogui/default.nix
@@ -0,0 +1,28 @@
+{ fetchurl, stdenv, openjdk, unzip, makeWrapper }:
+
+let
+ version = "1.4.9";
+in stdenv.mkDerivation {
+ name = "gogui-${version}";
+ buildInputs = [ unzip makeWrapper ];
+ src = fetchurl {
+ url = "mirror://sourceforge/project/gogui/gogui/${version}/gogui-${version}.zip";
+ sha256 = "0qk6p1bhi1816n638bg11ljyj6zxvm75jdf02aabzdmmd9slns1j";
+ };
+ dontConfigure = true;
+ installPhase = ''
+ mkdir -p $out/share/doc
+ mv -vi {bin,lib} $out/
+ mv -vi doc $out/share/doc/gogui
+ for x in $out/bin/*; do
+ wrapProgram $x --prefix PATH ":" ${openjdk}/bin
+ done
+ '';
+ meta = {
+ maintainers = [ stdenv.lib.maintainers.cleverca22 ];
+ description = "A graphical user interface to programs that play the board game Go and support the Go Text Protocol such as GNU Go";
+ homepage = http://gogui.sourceforge.net/;
+ platforms = stdenv.lib.platforms.unix;
+ license = stdenv.lib.licenses.gpl3;
+ };
+}
diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix
index 3cd35c728bfc..8590f9a7420b 100644
--- a/pkgs/games/minecraft-server/default.nix
+++ b/pkgs/games/minecraft-server/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "minecraft-server-${version}";
- version = "1.10.2";
+ version = "1.11";
src = fetchurl {
url = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar";
- sha256 = "08bss3laa265aavdgivzsv7asd5s2sdqnlqr767j3yf54y14cpqr";
+ sha256 = "10vgvkklv3l66cvin2ikva2nj86gjl6p9ffizd6r89ixv1grcxrj";
};
preferLocalBuild = true;
diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix
index 2e528a8203fe..00d4fbf84511 100644
--- a/pkgs/games/multimc/default.nix
+++ b/pkgs/games/multimc/default.nix
@@ -40,19 +40,19 @@ stdenv.mkDerivation {
mkdir -pv $out/bin/jars $out/lib
cp -v MultiMC $out/bin/
- cp -v jars/*.jar $out/bin/jars/
+ cp -v jars/*.jar $out/bin/jars/ #*/
cp -v librainbow.so libnbt++.so libMultiMC_logic.so $out/lib
wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH $RESULT --prefix PATH : ${jdk7}/bin/
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = https://multimc.org/;
description = "A free, open source launcher for Minecraft";
longDescription = ''
Allows you to have multiple, separate instances of Minecraft (each with their own mods, texture packs, saves, etc) and helps you manage them and their associated options with a simple interface.
'';
- platforms = stdenv.lib.platforms.linux;
- license = stdenv.lib.licenses.lgpl21Plus;
- maintainers = stdenv.lib.maintainers.cleverca22;
+ platforms = platforms.linux;
+ license = licenses.lgpl21Plus;
+ maintainers = [ maintainers.cleverca22 ];
};
}
diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix
index 043861b6166b..bb297c1af4ee 100644
--- a/pkgs/games/supertux/default.nix
+++ b/pkgs/games/supertux/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "supertux-${version}";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchurl {
url = "https://github.com/SuperTux/supertux/releases/download/v${version}/SuperTux-v${version}-Source.tar.gz";
- sha256 = "0fx7c7m6mfanqy7kln7yf6abb5l3r68picf32js2yls11jj0vbng";
+ sha256 = "1i8avad7w7ikj870z519j383ldy29r6f956bs38cbr8wk513pp69";
};
nativeBuildInputs = [ pkgconfig cmake ];
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index f3b12dc48f82..f583fbff231e 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -30,9 +30,9 @@ in rec {
};
unstable = fetchurl rec {
- version = "1.9.22";
+ version = "1.9.23";
url = "https://dl.winehq.org/wine/source/1.9/wine-${version}.tar.bz2";
- sha256 = "0hgc85d695mi1z4hyk561q2s9pblhdy6h5a23rh459y7qwd8xgx3";
+ sha256 = "131nqkwlss24r8la84s3v1qx376wq0016d2i2767bpxkyqkagvz3";
inherit (stable) mono;
gecko32 = fetchurl rec {
version = "2.47";
@@ -48,7 +48,7 @@ in rec {
staging = fetchFromGitHub rec {
inherit (unstable) version;
- sha256 = "1yqrxx4zaxc8khnnqfgz53apfa9mc315114psq3kvai01lz4a7p8";
+ sha256 = "188svpmaba2x5a7g8rk68cl2mqrv1vhf1si2g5j5lps9r6pgq1c0";
owner = "wine-compholio";
repo = "wine-staging";
rev = "v${version}";
diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix
index 4e419b6cbb6d..2f20943981a5 100644
--- a/pkgs/misc/screensavers/slock/default.nix
+++ b/pkgs/misc/screensavers/slock/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, xproto, libX11, libXext, libXrandr }:
stdenv.mkDerivation rec {
- name = "slock-1.3";
+ name = "slock-1.4";
src = fetchurl {
url = "http://dl.suckless.org/tools/${name}.tar.gz";
- sha256 = "065xa9hl7zn0lv2f7yjxphqsa35rg6dn9hv10gys0sh4ljpa7d5s";
+ sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m";
};
buildInputs = [ xproto libX11 libXext libXrandr ];
installFlags = "DESTDIR=\${out} PREFIX=";
diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix
index a278b059d481..eb0209e3502b 100644
--- a/pkgs/misc/screensavers/xlockmore/default.nix
+++ b/pkgs/misc/screensavers/xlockmore/default.nix
@@ -3,10 +3,11 @@
stdenv.mkDerivation rec {
- name = "xlockmore-5.47";
+ name = "xlockmore-5.49";
src = fetchurl {
- url = "http://www.tux.org/~bagleyd/xlock/${name}.tar.xz";
- sha256 = "138d79b8zc2hambbr9fnxp3fhihlcljgqns04zf0kv2f53pavqwl";
+ url = "http://sillycycle.com/xlock/${name}.tar.xz";
+ sha256 = "0n2pxm1qxg39h3qkqhbck312cmq7gbpj7hpv210y40kx9fj6biq3";
+ curlOpts = "--user-agent 'Mozilla/5.0'";
};
# Optionally, it can use GTK+.
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 2cd10593aeb4..2852a2c1e341 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -2,6 +2,7 @@
{ fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip
, which, fetchgit, llvmPackages
, xkb_switch, rustracerd, fzf
+, python3
, Cocoa ? null
}:
@@ -1503,6 +1504,23 @@ rec {
};
+ deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+ name = "deoplete-go-2016-11-12";
+ src = fetchgit {
+ url = "git://github.com/zchee/deoplete-go";
+ rev = "807b5536e7cebd06d0ce7b7d54c021a82774aee2";
+ sha256 = "1ragxnlzpf17f1wdy512hkz6bd673gzl16f14v78873rcyxpiw53";
+ };
+ dependencies = [];
+ buildInputs = [ python3 ];
+ buildPhase = ''
+ pushd ./rplugin/python3/deoplete/ujson
+ python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
+ popd
+ find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \;
+ '';
+ };
+
deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "deoplete-jedi-2016-10-22";
src = fetchgit {
@@ -2085,5 +2103,14 @@ rec {
};
+ vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+ name = "vim-jsdoc-2016-11-05";
+ src = fetchgit {
+ url = "git://github.com/heavenshell/vim-jsdoc";
+ rev = "45c7c7cef440a29f7bf24436640413e3d5d578ff";
+ sha256 = "0kr4p01pyrz9w7yfh50gsz6n60qvnqxsr1055hvsyx36nzw6l3za";
+ };
+ dependencies = [];
+ };
}
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index b7e33a71ff83..849baa492d0d 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -118,6 +118,7 @@
"github:wincent/command-t"
"github:xolox/vim-easytags"
"github:zchee/deoplete-jedi"
+"github:zchee/deoplete-go"
"goyo"
"matchit.zip"
"pathogen"
@@ -169,3 +170,4 @@
"vundle"
"github:jiangmiao/auto-pairs"
"github:editorconfig/editorconfig-vim"
+"github:heavenshell/vim-jsdoc"
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/deoplete-go b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/deoplete-go
new file mode 100644
index 000000000000..80cfd9af6538
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/deoplete-go
@@ -0,0 +1,7 @@
+ buildInputs = [ python3 ];
+ buildPhase = ''
+ pushd ./rplugin/python3/deoplete/ujson
+ python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
+ popd
+ find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \;
+ '';
diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix
index d9f4320556c9..1d26a8b350be 100644
--- a/pkgs/os-specific/darwin/ios-cross/default.nix
+++ b/pkgs/os-specific/darwin/ios-cross/default.nix
@@ -6,7 +6,16 @@
, stdenv
, coreutils
, gnugrep
-}: { prefix, arch, simulator ? false }: let
+}:
+
+/* As of this writing, known-good prefix/arch/simulator triples:
+ * aarch64-apple-darwin14 | arm64 | false
+ * arm-apple-darwin10 | armv7 | false
+ * i386-apple-darwin11 | i386 | true
+ * x86_64-apple-darwin14 | x86_64 | true
+ */
+
+{ prefix, arch, simulator ? false }: let
sdkType = if simulator then "Simulator" else "OS";
sdk = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}10.0.sdk";
@@ -26,7 +35,7 @@
echo "-target ${prefix} -arch ${arch} -idirafter ${sdk}/usr/include ${if simulator then "-mios-simulator-version-min=7.0" else "-miphoneos-version-min=7.0"}" >> $out/nix-support/cc-cflags
# Purposefully overwrite libc-ldflags-before, cctools ld doesn't know dynamic-linker and cc-wrapper doesn't do cross-compilation well enough to adjust
- echo "-arch ${arch} -L${sdk}/usr/lib -L${sdk}/usr/lib/system" > $out/nix-support/libc-ldflags-before
+ echo "-arch ${arch} -L${sdk}/usr/lib ${lib.optionalString simulator "-L${sdk}/usr/lib/system "}-i${if simulator then "os_simulator" else "phoneos"}_version_min 7.0.0" > $out/nix-support/libc-ldflags-before
'';
};
in {
diff --git a/pkgs/os-specific/linux/kernel/grsecurity-modinst.patch b/pkgs/os-specific/linux/kernel/grsecurity-modinst.patch
new file mode 100644
index 000000000000..275d96fbb29b
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/grsecurity-modinst.patch
@@ -0,0 +1,12 @@
+diff -ruN a/scripts/Makefile.modinst b/scripts/Makefile.modinst
+--- a/scripts/Makefile.modinst 2016-11-15 07:49:06.000000000 +0100
++++ b/scripts/Makefile.modinst 2016-11-18 13:45:07.977270500 +0100
+@@ -9,7 +9,7 @@
+
+ #
+
+-__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
++__modules := $(shell find $(MODVERDIR) -name '*.mod' -exec grep -h '\.ko$$' '{}' \; | sort)
+ modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o)))
+
+ PHONY += $(modules)
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index e307520cf6b8..0fad9a578eff 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
- version = "4.4.32";
+ version = "4.4.34";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "03n3wzbqc2h09ydwz3jybrc8ll6f2znr0k7f0hayj0qi5wx1rnpc";
+ sha256 = "1xrk7adgapr4wpid6l6s05cypy3r28skynajy2h73xciradaqs9b";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix
index e6e26a4ae5a9..e0e8fbaf95e8 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.8.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
- version = "4.8.8";
+ version = "4.8.10";
extraMeta.branch = "4.8";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0hm60zjsp22rbh8jz4d8rpwsj6bysmlcm0c5m1cxpnfj6cqcjp7w";
+ sha256 = "1i3hydxjl3zz4i3v2spnv5y5pidmwgiyc10q6rlwvf0bs8aynh53";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index e6e26a4ae5a9..e0e8fbaf95e8 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
- version = "4.8.8";
+ version = "4.8.10";
extraMeta.branch = "4.8";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0hm60zjsp22rbh8jz4d8rpwsj6bysmlcm0c5m1cxpnfj6cqcjp7w";
+ sha256 = "1i3hydxjl3zz4i3v2spnv5y5pidmwgiyc10q6rlwvf0bs8aynh53";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
index 199ff9122cbe..a037343751ca 100644
--- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix
+++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
@@ -7,7 +7,7 @@ import ./generic.nix (args // rec {
extraMeta = {
branch = "4.1";
- maintainers = stdenv.lib.maintainers.layus;
+ maintainers = [ stdenv.lib.maintainers.layus ];
};
src = fetchurl {
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 3c6058c407a5..489212f612f4 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -86,9 +86,9 @@ rec {
};
grsecurity_testing = grsecPatch
- { kver = "4.8.8";
- grrev = "201611150756";
- sha256 = "04sankbjlrji3hrhgwfvmgkrh5ypblb706i0hch4sn3vcc0dq87b";
+ { kver = "4.8.10";
+ grrev = "201611210813";
+ sha256 = "1an1fqzmh133hr6r9y4y9b5qkaf8xwlfgymg97ygbwqdygjvp81b";
};
# This patch relaxes grsec constraints on the location of usermode helpers,
@@ -99,6 +99,14 @@ rec {
patch = ./grsecurity-nixos-kmod.patch;
};
+ # A temporary work-around for execvp: arglist too long error during
+ # module_install. Without this, no modules are installed into the
+ # resulting output.
+ grsecurity_modinst =
+ { name = "grsecurity-modinst";
+ patch = ./grsecurity-modinst.patch;
+ };
+
crc_regression =
{ name = "crc-backport-regression";
patch = ./crc-regression.patch;
diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix
index 65cbf1c45890..1e4373f286c1 100644
--- a/pkgs/os-specific/linux/pax-utils/default.nix
+++ b/pkgs/os-specific/linux/pax-utils/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "pax-utils-${version}";
- version = "1.1.6";
+ version = "1.1.7";
src = fetchurl {
url = "https://dev.gentoo.org/~vapier/dist/${name}.tar.xz";
- sha256 = "04hvsizzspfzfq6hhfif7ya9nwsc0cs6z6n2bq1zfh7agd8nqhzm";
+ sha256 = "045dxgl4kkmq6205iw6fqyx3565gd607p3xpad5l9scdi3qdp6xv";
};
makeFlags = [
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
homepage = "https://dev.gentoo.org/~vapier/dist/";
license = licenses.gpl2;
platforms = platforms.linux;
- maintainers = with maintainers; [ thoughtpolice ];
+ maintainers = with maintainers; [ thoughtpolice joachifm ];
};
}
diff --git a/pkgs/os-specific/linux/paxtest/default.nix b/pkgs/os-specific/linux/paxtest/default.nix
index 0c2fd9b6f86c..4611a3c09b77 100644
--- a/pkgs/os-specific/linux/paxtest/default.nix
+++ b/pkgs/os-specific/linux/paxtest/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "paxtest-${version}";
- version = "0.9.14";
+ version = "0.9.15";
src = fetchurl {
url = "https://www.grsecurity.net/~spender/${name}.tar.gz";
- sha256 = "0j40h3x42k5mr5gc5np4wvr9cdf9szk2f46swf42zny8rlgxiskx";
+ sha256 = "0zv6vlaszlik98gj9200sv0irvfzrvjn46rnr2v2m37x66288lym";
};
enableParallelBuilding = true;
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index c86efe22f6ef..e84c964d675f 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -60,6 +60,5 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];
- broken = buildKernel && (kernel.features.grsecurity or false);
};
}
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 54f49bba32b3..9a378988608a 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1";
let
name = "wireguard-experimental-${version}";
- version = "0.0.20161110";
+ version = "0.0.20161116.1";
src = fetchurl {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-${version}.tar.xz";
- sha256 = "13z416k64gnkp9248h846h40ph83ms7l9mm9b9xpki17j5q7hm10";
+ sha256 = "1393p1fllxvl4j0c8qz35k39crmcwrp8rjwxwn1wyhhrks8rs3bk";
};
meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index f2cf9eca4dc0..d7e406107b1b 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -97,6 +97,9 @@ stdenv.mkDerivation rec {
# Fix pkgconfig.
ln -s ../share/pkgconfig $out/lib/pkgconfig
+
+ # Remove tests because they add a runtime dependency on gcc
+ rm -rf $out/share/zfs/zfs-tests
'';
meta = {
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 7725a7272edd..62814b351b6b 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
name = "rabbitmq-server-${version}";
- version = "3.5.6";
+ version = "3.5.8";
src = fetchurl {
- url = "http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.gz";
- sha256 = "07v7c6ippngkq269jmrf3gji389czcmz6phc3qwxn4j14cri9gi4";
+ url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_5_8/rabbitmq-server-3.5.8.tar.gz";
+ sha256 = "0f373zxz15smb0jvfdfsbb924fl2qmp1z2jy3y50gv6b3xsdyqmr";
};
buildInputs =
diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix
new file mode 100644
index 000000000000..044d4fa50ab2
--- /dev/null
+++ b/pkgs/servers/dante/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation (rec {
+ name = "dante-${version}";
+ version = "1.4.1";
+
+ src = fetchurl {
+ url = "https://www.inet.no/dante/files/${name}.tar.gz";
+ sha256 = "0lsg3hk8zd2h9f08s13bn4l4pvyyzkj4gr4ppwa7vj7gdyyk5lmn";
+ };
+
+ configureFlags = [
+ "--with-libc=libc.so.6"
+ ];
+
+ meta = {
+ description = "A circuit-level SOCKS client/server that can be used to provide convenient and secure network connectivity.";
+ homepage = "https://www.inet.no/dante/";
+ maintainers = [ stdenv.lib.maintainers.arobyn ];
+ license = stdenv.lib.licenses.bsdOriginal;
+ platforms = stdenv.lib.platforms.linux;
+ };
+})
diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix
index c4a5b0ebd290..75d12a5f66fe 100644
--- a/pkgs/servers/mediatomb/default.nix
+++ b/pkgs/servers/mediatomb/default.nix
@@ -1,9 +1,8 @@
{ stdenv, fetchgit
-, sqlite, expat, mp4v2, flac, spidermonkey, taglib, libexif, curl, ffmpeg, file
+, sqlite, expat, mp4v2, flac, spidermonkey_1_8_5, taglib, libexif, curl, ffmpeg, file
, pkgconfig, autoreconfHook }:
stdenv.mkDerivation rec {
-
name = "mediatomb-${version}";
version = "0.12.1";
@@ -13,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1mimslr4q6mky865y6561rr64cbn4gf0qc2dhgb31hxp4rc1kmzd";
};
- buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg file mp4v2 flac
+ buildInputs = [ sqlite expat spidermonkey_1_8_5 taglib libexif curl ffmpeg file mp4v2 flac
pkgconfig autoreconfHook ];
meta = with stdenv.lib; {
diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index 51d242d9ee3c..a29c6e16fa85 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -12,7 +12,7 @@ buildGoPackage rec {
owner = "influxdata";
repo = "telegraf";
rev = "${version}";
- sha256 = "02sldgbsxifd7s3awjj0a4wf7rrcz2xin02b6ygyqxyhj1kqj8i6";
+ sha256 = "0i3bmfs54s6m8im5gjm5ccyz31gpvp9cghxjxj46l0g77ncij7dj";
};
goDeps = ./. + builtins.toPath "/deps-${version}.nix";
diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix
new file mode 100644
index 000000000000..439af4da565b
--- /dev/null
+++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix
@@ -0,0 +1,67 @@
+{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak }:
+
+stdenv.mkDerivation rec {
+ name = "riak_cs-2.1.1";
+
+ buildInputs = [
+ which unzip erlang pam git wget
+ ];
+
+ src = fetchurl {
+ url = "http://s3.amazonaws.com/downloads.basho.com/riak-cs/2.1/2.1.1/riak-cs-2.1.1.tar.gz";
+ sha256 = "115cac127aac6d759c1b429a52e0d18e491c0719a6530b1b88aa52c4efdbedd5";
+ };
+
+
+ postPatch = ''
+ sed -i deps/node_package/priv/base/env.sh \
+ -e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/riak-cs}@' \
+ -e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \
+ -e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \
+ -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/riak-cs}@' \
+ -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@'
+
+ sed -i ./Makefile \
+ -e 's@rel: deps compile@rel: deps compile-src@'
+ '';
+
+ preBuild = ''
+ patchShebangs .
+ '';
+
+ buildPhase = ''
+ runHook preBuild
+
+ make locked-deps
+ make rel
+
+ runHook postBuild
+ '';
+
+ doCheck = false;
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir $out
+ mv rel/riak-cs/etc rel/riak-cs/riak-etc
+ mkdir -p rel/riak-cs/etc
+ mv rel/riak-cs/riak-etc rel/riak-cs/etc/riak-cs
+ mv rel/riak-cs/* $out
+
+ for prog in $out/bin/*; do
+ substituteInPlace $prog \
+ --replace '. "`cd \`dirname $0\` && /bin/pwd`/../lib/env.sh"' \
+ ". $out/lib/env.sh"
+ done
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Dynamo inspired NoSQL DB by Basho with S3 compatibility";
+ platforms = [ "x86_64-linux" ];
+ license = licenses.asl20;
+ maintainer = with maintainers; [ mdaiter ];
+ };
+}
diff --git a/pkgs/servers/nosql/riak-cs/stanchion.nix b/pkgs/servers/nosql/riak-cs/stanchion.nix
new file mode 100644
index 000000000000..5835b7e29c93
--- /dev/null
+++ b/pkgs/servers/nosql/riak-cs/stanchion.nix
@@ -0,0 +1,63 @@
+{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak }:
+
+stdenv.mkDerivation rec {
+ name = "stanchion-2.1.1";
+
+ buildInputs = [
+ which unzip erlang pam git wget
+ ];
+
+ src = fetchurl {
+ url = "http://s3.amazonaws.com/downloads.basho.com/stanchion/2.1/2.1.1/stanchion-2.1.1.tar.gz";
+ sha256 = "1443arwgg7qvlx3msyg99qvvhck7qxphdjslcp494i60fhr2g8ja";
+ };
+
+
+ postPatch = ''
+ sed -i deps/node_package/priv/base/env.sh \
+ -e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/stanchion}@' \
+ -e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \
+ -e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \
+ -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/stanchion}@' \
+ -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@'
+ '';
+
+ preBuild = ''
+ patchShebangs .
+ '';
+
+ buildPhase = ''
+ runHook preBuild
+
+ make rel
+
+ runHook postBuild
+ '';
+
+ doCheck = false;
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir $out
+ mv rel/stanchion/etc rel/stanchion/riak-etc
+ mkdir -p rel/stanchion/etc
+ mv rel/stanchion/riak-etc rel/stanchion/etc/stanchion
+ mv rel/stanchion/* $out
+
+ for prog in $out/bin/*; do
+ substituteInPlace $prog \
+ --replace '. "`cd \`dirname $0\` && /bin/pwd`/../lib/env.sh"' \
+ ". $out/lib/env.sh"
+ done
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ maintainers = with maintainers; [ mdaiter ];
+ description = "Manager for Riak CS";
+ platforms = [ "x86_64-linux" ];
+ license = licenses.asl20;
+ };
+}
diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 28d6295938a2..467f3ffb1d48 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -6,9 +6,9 @@
let
plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass";
plexpkg = if enablePlexPass then plexPass else {
- version = "1.0.0.2261";
- vsnHash = "a17e99e";
- sha256 = "14li33ni6aaa1qwvc02a066k52s1qwhpv55prvlmq3m5jm3iv0lr";
+ version = "1.2.7.2987";
+ vsnHash = "1bef33a";
+ sha256 = "17d1yisbikcp25mgn71rf8w76zhy015f33hxjj93swfm1qrq55hq";
};
in stdenv.mkDerivation rec {
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
# Now we need to patch up the executables and libraries to work on Nix.
# Side note: PLEASE don't put spaces in your binary names. This is stupid.
- for bin in "Plex Media Server" "Plex DLNA Server" "Plex Media Scanner"; do
+ for bin in "Plex Media Server" "Plex DLNA Server" "Plex Media Scanner" "Plex Script Host" "Plex Transcoder" "Plex Relay"; do
patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin"
patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin"
done
diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix
index a86862a14a56..a6f0fb800558 100644
--- a/pkgs/servers/sonarr/default.nix
+++ b/pkgs/servers/sonarr/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "sonarr-${version}";
- version = "2.0.0.4326";
+ version = "2.0.0.4389";
src = fetchurl {
url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";
- sha256 = "1lrfwwy5bjsmrq6zpx0kadmlacafmj44qhifswbhljlykxwsld7r";
+ sha256 = "17vvfld6m1wr8yxvm9i7gaxny04ymvq86pizad816a73jk4h16my";
};
buildInputs = [
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index 7fc2a5f7143c..5f850a09ded1 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -23,12 +23,12 @@ let
ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
in stdenv.mkDerivation rec {
- version = "16.08";
+ version = "16.09";
name = "ejabberd-${version}";
src = fetchurl {
url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
- sha256 = "0dqikg0xgph8xjvaxc9r6cyq7k7c8l5jiqr3kyhricziyak9hmdl";
+ sha256 = "054gzf4df466a6pyh4w476hxald6637nayy44hvaf31iycxani3v";
};
nativeBuildInputs = [ fakegit ];
@@ -74,7 +74,7 @@ in stdenv.mkDerivation rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
- outputHash = "040l336570lwxsvlli7kqaa18pz92jbf9105mx394ib62z72vvlp";
+ outputHash = "12dj1k5pfxc5rw4qjzqf3848190i559h3f9s1dwzpfpkdgjd38vf";
};
configureFlags =
diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix
index b7a122b06834..4e76c7aef335 100644
--- a/pkgs/shells/oh-my-zsh/default.nix
+++ b/pkgs/shells/oh-my-zsh/default.nix
@@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
name = "oh-my-zsh-${version}";
- version = "2016-11-03";
+ version = "2016-11-16";
src = fetchgit {
url = "https://github.com/robbyrussell/oh-my-zsh";
- rev = "0b340bc3a5c58609a07987b296f773eaea17b274";
- sha256 = "1ifflqpbsk2gadbl0aqdmnm18bp21i9zcvjzlpldwma6crnfag68";
+ rev = "3477ff25274fa75bd9e6110f391f6ad98ca2af72";
+ sha256 = "07fvxg5jbw41j4nrs31hm0dfrwdh01gf5ik21gb4b4ddig2mjhc9";
};
phases = "installPhase";
diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix
index 070152427f29..06a7630c7bc0 100644
--- a/pkgs/tools/X11/nitrogen/default.nix
+++ b/pkgs/tools/X11/nitrogen/default.nix
@@ -1,20 +1,25 @@
{ stdenv, fetchurl, pkgconfig, glib, gtkmm2 }:
-let version = "1.5.2";
+let version = "1.6.0";
in
stdenv.mkDerivation rec {
name = "nitrogen-${version}";
src = fetchurl {
- url = "http://projects.l3ib.org/nitrogen/files/nitrogen-${version}.tar.gz";
- sha256 = "60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2";
+ url = "http://projects.l3ib.org/nitrogen/files/${name}.tar.gz";
+ sha256 = "1pil2qa3v7x56zh9xvba8v96abnf9qgglbsdlrlv0kfjlhzl4jhr";
};
- buildInputs = [ glib gtkmm2 pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
- NIX_LDFLAGS = "-lX11";
+ buildInputs = [ glib gtkmm2 ];
- patchPhase = "patchShebangs data/icon-theme-installer";
+ NIX_CXXFLAGS_COMPILE = "-std=c++11";
+
+ patchPhase = ''
+ substituteInPlace data/Makefile.in --replace /usr/share $out/share
+ patchShebangs data/icon-theme-installer
+ '';
meta = {
description = "A wallpaper browser and setter for X11";
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index eeefd4d99b5c..d0eb9e8fb15a 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -7,13 +7,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "1.6.0";
+ version = "1.7.0";
name = "tigervnc-${version}";
src = fetchgit {
url = "https://github.com/TigerVNC/tigervnc/";
- sha256 = "1plljv1cxsax88kv52g02n8c1hzwgp6j1p8z1aqhskw36shg4pij";
- rev = "5a727f25990d05c9a1f85457b45d6aed66409cb3";
+ sha256 = "1b6n2gq6078x8dwz471a68jrkgpcxmbiivmlsakr42vrndm7niz3";
+ rev = "e25272fc74ef09987ccaa33b9bf1736397c76fdf";
};
inherit fontDirectories;
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index 0e7e6fbcdec2..525aa2fec28a 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -2,14 +2,14 @@
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
}:
-let version = "4.8.3"; in
+let version = "4.8.2"; in
stdenv.mkDerivation rec {
name = "btrfs-progs-${version}";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
- sha256 = "1wlflrygnpndppil9g12pk184f75g9qx1lkr0x1gijigglqhr9n1";
+ sha256 = "0pswcfmdnfc586770h74abp67gn2xv8fd46vxlimnmn837sj7h41";
};
buildInputs = [
diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix
new file mode 100644
index 000000000000..a39b4247109b
--- /dev/null
+++ b/pkgs/tools/misc/aptly/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, gnupg1compat, bzip2, xz, graphviz }:
+
+buildGoPackage rec {
+ name = "aptly-${version}";
+ version = "0.9.7";
+ rev = "v${version}";
+
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "smira";
+ repo = "aptly";
+ sha256 = "0j1bmqdah4i83r2cf8zcq87aif1qg90yasgf82yygk3hj0gw1h00";
+ };
+
+ goPackagePath = "github.com/smira/aptly";
+ goDeps = ./deps.nix;
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ postInstall = ''
+ rm $bin/bin/man
+ wrapProgram "$bin/bin/aptly" \
+ --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat bzip2 xz graphviz ]}"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://www.aptly.info;
+ description = "Debian repository management tool";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.montag451 ];
+ };
+}
diff --git a/pkgs/tools/misc/aptly/deps.nix b/pkgs/tools/misc/aptly/deps.nix
new file mode 100644
index 000000000000..f0163f34ae8b
--- /dev/null
+++ b/pkgs/tools/misc/aptly/deps.nix
@@ -0,0 +1,245 @@
+[
+ {
+ goPackagePath = "github.com/AlekSi/pointer";
+ fetch = {
+ type = "git";
+ url = https://github.com/AlekSi/pointer.git;
+ rev = "5f6d527dae3d678b46fbb20331ddf44e2b841943";
+ sha256 = "127n71d8y1d8hxv9fq9z1midw3vk5xa6aq45gffjvwabx4cgha1l";
+ };
+ }
+ {
+ goPackagePath = "github.com/awalterschulze/gographviz";
+ fetch = {
+ type = "git";
+ url = https://github.com/awalterschulze/gographviz.git;
+ rev = "20d1f693416d9be045340150094aa42035a41c9e";
+ sha256 = "1q4796nzanikqmz77jdc2xrq30n93w6ljcfsbhij3yj3s698bcaf";
+ };
+ }
+ {
+ goPackagePath = "github.com/aws/aws-sdk-go";
+ fetch = {
+ type = "git";
+ url = https://github.com/aws/aws-sdk-go.git;
+ rev = "a170e9cb76475a0da7c0326a13cc2b39e9244b3b";
+ sha256 = "0z7pgb9q0msvdkrvjwi95cbl9k9w8f3n2liwkl6fli0nx9jyamqw";
+ };
+ }
+ {
+ goPackagePath = "github.com/cheggaaa/pb";
+ fetch = {
+ type = "git";
+ url = https://github.com/cheggaaa/pb.git;
+ rev = "2c1b74620cc58a81ac152ee2d322e28c806d81ed";
+ sha256 = "148fv6a0ranzcc1lv4v5lmvgbfx05dhzpwsg8vxi9ggn51n496ny";
+ };
+ }
+ {
+ goPackagePath = "github.com/DisposaBoy/JsonConfigReader";
+ fetch = {
+ type = "git";
+ url = https://github.com/DisposaBoy/JsonConfigReader.git;
+ rev = "33a99fdf1d5ee1f79b5077e9c06f955ad356d5f4";
+ sha256 = "1rq7hp1xk8lzvn9bv9jfkszw8p2qia8prvrx540gb2y93jw9i847";
+ };
+ }
+ {
+ goPackagePath = "github.com/gin-gonic/gin";
+ fetch = {
+ type = "git";
+ url = https://github.com/gin-gonic/gin.git;
+ rev = "b1758d3bfa09e61ddbc1c9a627e936eec6a170de";
+ sha256 = "0y3v5vi68xafcvz9yz6ffww96xs2qalklnaab7vrwpax3brlkipk";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-ini/ini";
+ fetch = {
+ type = "git";
+ url = https://github.com/go-ini/ini.git;
+ rev = "afbd495e5aaea13597b5e14fe514ddeaa4d76fc3";
+ sha256 = "0xi8zr9qw38sdbv95c2ip31yczbm4axdvmj3ljyivn9xh2nbxfia";
+ };
+ }
+ {
+ goPackagePath = "github.com/jlaffaye/ftp";
+ fetch = {
+ type = "git";
+ url = https://github.com/jlaffaye/ftp.git;
+ rev = "fec71e62e457557fbe85cefc847a048d57815d76";
+ sha256 = "08ivzsfswgl4xlr6wmqpbf77jclh8ivhwxlhj59allp27lic1kgm";
+ };
+ }
+ {
+ goPackagePath = "github.com/jmespath/go-jmespath";
+ fetch = {
+ type = "git";
+ url = https://github.com/jmespath/go-jmespath.git;
+ rev = "0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74";
+ sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld";
+ };
+ }
+ {
+ goPackagePath = "github.com/julienschmidt/httprouter";
+ fetch = {
+ type = "git";
+ url = https://github.com/julienschmidt/httprouter.git;
+ rev = "46807412fe50aaceb73bb57061c2230fd26a1640";
+ sha256 = "0mvzjpzlb1gkb6lp0nwni3vid6fw33dkzl6s9gj7gp2wsbwzcdhd";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-shellwords";
+ fetch = {
+ type = "git";
+ url = https://github.com/mattn/go-shellwords.git;
+ rev = "c7ca6f94add751566a61cf2199e1de78d4c3eee4";
+ sha256 = "1714ca0p0mwijck0vxdssizxyjjjki1dpc5bl51ayw5sa7s6d4n2";
+ };
+ }
+ {
+ goPackagePath = "github.com/mkrautz/goar";
+ fetch = {
+ type = "git";
+ url = https://github.com/mkrautz/goar.git;
+ rev = "282caa8bd9daba480b51f1d5a988714913b97aad";
+ sha256 = "0b6nmgyh5lmm8d1psm5yqqmshkqi87di1191c9q95z1gkkfi16b2";
+ };
+ }
+ {
+ goPackagePath = "github.com/mxk/go-flowrate";
+ fetch = {
+ type = "git";
+ url = https://github.com/mxk/go-flowrate.git;
+ rev = "cca7078d478f8520f85629ad7c68962d31ed7682";
+ sha256 = "0zqs39923ja0yypdmiqk6x8pgmfs3ms5x5sl1dqv9z6zyx2xy541";
+ };
+ }
+ {
+ goPackagePath = "github.com/ncw/swift";
+ fetch = {
+ type = "git";
+ url = https://github.com/ncw/swift.git;
+ rev = "384ef27c70645e285f8bb9d02276bf654d06027e";
+ sha256 = "1is9z6pbn55yr5b7iizfyi8y19nc9xprd87cwab4i54bxkqqp5hg";
+ };
+ }
+ {
+ goPackagePath = "github.com/smira/go-aws-auth";
+ fetch = {
+ type = "git";
+ url = https://github.com/smira/go-aws-auth.git;
+ rev = "0070896e9d7f4f9f2d558532b2d896ce2239992a";
+ sha256 = "0ic7fgpgr8n1gvhwab1isbm82azy8kb9bzjxsch5i2dpvnz03rvh";
+ };
+ }
+ {
+ goPackagePath = "github.com/smira/go-xz";
+ fetch = {
+ type = "git";
+ url = https://github.com/smira/go-xz.git;
+ rev = "0c531f070014e218b21f3cfca801cc992d52726d";
+ sha256 = "1wpgw8y6xjyf75dfcirx58cr1c277avdb6hr7xvcddhcfn01qzma";
+ };
+ }
+ {
+ goPackagePath = "github.com/smira/commander";
+ fetch = {
+ type = "git";
+ url = https://github.com/smira/commander.git;
+ rev = "f408b00e68d5d6e21b9f18bd310978dafc604e47";
+ sha256 = "0gzhxjni17qq0z4zhakjrp98qd0qmf6wlyrx5xwwsqgh07nyzssa";
+ };
+ }
+ {
+ goPackagePath = "github.com/smira/flag";
+ fetch = {
+ type = "git";
+ url = https://github.com/smira/flag.git;
+ rev = "357ed3e599ffcbd4aeaa828e1d10da2df3ea5107";
+ sha256 = "0wh77lz7z23rs9mbyi89l28i16gp1zx2312zxs4ngqdvjvinsiri";
+ };
+ }
+ {
+ goPackagePath = "github.com/smira/go-ftp-protocol";
+ fetch = {
+ type = "git";
+ url = https://github.com/smira/go-ftp-protocol.git;
+ rev = "066b75c2b70dca7ae10b1b88b47534a3c31ccfaa";
+ sha256 = "1az9p44fa7bcw92ywcyrqch2j1781b96rpid2qggyp3nhjivx8rx";
+ };
+ }
+ {
+ goPackagePath = "github.com/smira/go-uuid";
+ fetch = {
+ type = "git";
+ url = https://github.com/smira/go-uuid.git;
+ rev = "ed3ca8a15a931b141440a7e98e4f716eec255f7d";
+ sha256 = "1vasidfa2pqrawk4zm5bqsi5q7f3qx3xm159hs36r0h0kj0c7sz4";
+ };
+ }
+ {
+ goPackagePath = "github.com/smira/lzma";
+ fetch = {
+ type = "git";
+ url = https://github.com/smira/lzma.git;
+ rev = "7f0af6269940baa2c938fabe73e0d7ba41205683";
+ sha256 = "0ka8mbyg2dj076aslbi1hiahw5n5gjyn7s4w3x4ws9ak5chw5zif";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/snappy";
+ fetch = {
+ type = "git";
+ url = https://github.com/golang/snappy.git;
+ rev = "723cc1e459b8eea2dea4583200fd60757d40097a";
+ sha256 = "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h";
+ };
+ }
+ {
+ goPackagePath = "github.com/syndtr/goleveldb";
+ fetch = {
+ type = "git";
+ url = https://github.com/syndtr/goleveldb.git;
+ rev = "917f41c560270110ceb73c5b38be2a9127387071";
+ sha256 = "0ybpcizg2gn3ln9rycqbaqlclci3k2q8mipcwq7927ym113d7q32";
+ };
+ }
+ {
+ goPackagePath = "github.com/ugorji/go";
+ fetch = {
+ type = "git";
+ url = https://github.com/ugorji/go.git;
+ rev = "71c2886f5a673a35f909803f38ece5810165097b";
+ sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j";
+ };
+ }
+ {
+ goPackagePath = "github.com/vaughan0/go-ini";
+ fetch = {
+ type = "git";
+ url = https://github.com/vaughan0/go-ini.git;
+ rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1";
+ sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa";
+ };
+ }
+ {
+ goPackagePath = "github.com/wsxiaoys/terminal";
+ fetch = {
+ type = "git";
+ url = https://github.com/wsxiaoys/terminal.git;
+ rev = "5668e431776a7957528361f90ce828266c69ed08";
+ sha256 = "0dirblp3lwijsrx590qfp8zn5xspkjzq7ihkv05806mpncg5ivxd";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = https://go.googlesource.com/crypto.git;
+ rev = "a7ead6ddf06233883deca151dffaef2effbf498f";
+ sha256 = "0gyvja1kh6xkxy7mg5y72zpvmi6hfix34kmzg4sry1x7bycw3dfc";
+ };
+ }
+]
diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix
index 0bdcfa76fec1..577c0a33b3ee 100644
--- a/pkgs/tools/misc/aspcud/default.nix
+++ b/pkgs/tools/misc/aspcud/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl,
- boost, clasp, cmake, clingo, re2c
+ boost, clasp, cmake, gringo, re2c
}:
let
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
sha256 = "029035vcdk527ssf126i8ipi5zs73gqpbrg019pvm9r24rf0m373";
};
- buildInputs = [ boost clasp cmake clingo re2c ];
+ buildInputs = [ boost clasp cmake gringo re2c ];
buildPhase = ''
cmake -DCMAKE_BUILD_TYPE=Release \
- -DGRINGO_LOC=${clingo}/bin/gringo \
+ -DGRINGO_LOC=${gringo}/bin/gringo \
-DCLASP_LOC=${clasp}/bin/clasp \
-DENCODING_LOC=$out/share/aspcud/specification.lp \
.
diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix
index ea486dd5154f..817510bfb761 100644
--- a/pkgs/tools/misc/autojump/default.nix
+++ b/pkgs/tools/misc/autojump/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv, python, bash }:
let
- version = "22.2.4";
+ version = "22.5.0";
in
stdenv.mkDerivation rec {
name = "autojump-${version}";
@@ -9,7 +9,7 @@ in
src = fetchurl {
url = "http://github.com/joelthelion/autojump/archive/release-v${version}.tar.gz";
name = "autojump-${version}.tar.gz";
- sha256 = "816badb0721f735e2b86bdfa8b333112f3867343c7c2263c569f75b4ec91f475";
+ sha256 = "00ai0j37ka3557a8m7ig44dby7v01pckwi8gl479vz5b5pw1z8cd";
};
buildInputs = [ python bash ];
diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix
index 068d3e3866e0..74894da54182 100644
--- a/pkgs/tools/misc/bibtex2html/default.nix
+++ b/pkgs/tools/misc/bibtex2html/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A collection of tools for translating from BibTeX to HTML";
homepage = https://www.lri.fr/~filliatr/bibtex2html/;
- licence = licenses.gpl2;
+ license = licenses.gpl2;
platforms = ocaml.meta.platforms or [];
maintainers = [ maintainers.scolobb ];
};
diff --git a/pkgs/tools/misc/clingo/default.nix b/pkgs/tools/misc/clingo/default.nix
deleted file mode 100644
index 6ab0a68920f7..000000000000
--- a/pkgs/tools/misc/clingo/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchFromGitHub,
- bison, re2c, scons
-}:
-
-let
- version = "5.1.0";
-in
-
-stdenv.mkDerivation rec {
- name = "clingo-${version}";
-
- src = fetchFromGitHub {
- owner = "potassco";
- repo = "clingo";
- rev = "v${version}";
- sha256 = "1rvaqqa8xfagsqxk45lax3l29sksijd3zvl662vpvdi1sy0d71xv";
- };
-
- buildInputs = [ bison re2c scons ];
-
- buildPhase = ''
- scons --build-dir=release
- '';
-
- installPhase = ''
- mkdir -p $out/bin
- cp build/release/{gringo,clingo,reify,lpconvert} $out/bin/
- '';
-
- meta = with stdenv.lib; {
- description = "A grounder and solver for logic programs.";
- homepage = http://potassco.org;
- platforms = platforms.linux;
- maintainers = [ maintainers.hakuch ];
- license = licenses.gpl3Plus;
- };
-}
diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix
index 8bba00b564d9..af518e7efa98 100644
--- a/pkgs/tools/misc/cloud-utils/default.nix
+++ b/pkgs/tools/misc/cloud-utils/default.nix
@@ -1,20 +1,25 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, makeWrapper, gawk, gnused, utillinux }:
stdenv.mkDerivation {
- name = "cloud-utils-0.27";
+ # NOTICE: if you bump this, make sure to run
+ # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops
+ name = "cloud-utils-0.29";
src = fetchurl {
- url = "https://launchpad.net/cloud-utils/trunk/0.27/+download/cloud-utils-0.27.tar.gz";
- sha256 = "16shlmg36lidp614km41y6qk3xccil02f5n3r4wf6d1zr5n4v8vd";
+ url = "https://launchpad.net/cloud-utils/trunk/0.29/+download/cloud-utils-0.29.tar.gz";
+ sha256 = "0z15gs8gmpy5gqxl7yiyjj7a6s8iw44djj6axvbci627b9pvd8cy";
};
- patches = [ ./growpart-util-linux-2.26.patch ];
+ buildInputs = [ makeWrapper ];
buildPhase = ''
mkdir -p $out/bin
cp bin/growpart $out/bin/growpart
sed -i 's|awk|gawk|' $out/bin/growpart
sed -i 's|sed|gnused|' $out/bin/growpart
+ ln -s sed $out/bin/gnused
+ wrapProgram $out/bin/growpart --prefix PATH : "${stdenv.lib.makeBinPath [ gnused gawk utillinux ]}:$out/bin"
'';
dontInstall = true;
dontPatchShebangs = true;
+ dontStrip = true;
meta = {
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix
new file mode 100644
index 000000000000..00879d9505b8
--- /dev/null
+++ b/pkgs/tools/misc/gringo/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl,
+ bison, re2c, scons
+}:
+
+let
+ version = "4.5.4";
+in
+
+stdenv.mkDerivation rec {
+ name = "gringo-${version}";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz";
+ sha256 = "16k4pkwyr2mh5w8j91vhxh9aff7f4y31npwf09w6f8q63fxvpy41";
+ };
+
+ buildInputs = [ bison re2c scons ];
+
+ patches = [
+ ./gringo-4.5.4-cmath.patch
+ ./gringo-4.5.4-to_string.patch
+ ];
+
+ buildPhase = ''
+ scons WITH_PYTHON= --build-dir=release
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp build/release/gringo $out/bin/gringo
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Converts input programs with first-order variables to equivalent ground programs";
+ homepage = http://potassco.sourceforge.net/;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.hakuch ];
+ license = licenses.gpl3Plus;
+ };
+}
diff --git a/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch b/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch
new file mode 100644
index 000000000000..7b5510e2344b
--- /dev/null
+++ b/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch
@@ -0,0 +1,11 @@
+--- gringo/libgringo/src/term.cc~ 2016-07-12 23:56:10.593577749 -0400
++++ gringo/libgringo/src/term.cc 2016-07-12 23:52:35.169968338 -0400
+@@ -22,6 +22,8 @@
+ #include "gringo/logger.hh"
+ #include "gringo/graph.hh"
+
++#include
++
+ namespace Gringo {
+
+ // {{{ definition of Defines
diff --git a/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch b/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch
new file mode 100644
index 000000000000..b81eab4cd678
--- /dev/null
+++ b/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch
@@ -0,0 +1,11 @@
+--- gringo/libgringo/gringo/bug.hh~ 2014-03-10 12:19:26.000000000 -0400
++++ gringo/libgringo/gringo/bug.hh 2016-11-12 07:51:55.288563663 -0500
+@@ -32,7 +32,7 @@
+ #define _GLIBCXX_MAKE_MOVE_ITERATOR(_Iter) std::make_move_iterator(_Iter)
+ #define _GLIBCXX_MAKE_MOVE_IF_NOEXCEPT_ITERATOR(_Iter) std::make_move_iterator(_Iter)
+
+-#ifdef MISSING_STD_TO_STRING
++#if 0
+
+ #include
+
diff --git a/pkgs/tools/misc/magic-wormhole/default.nix b/pkgs/tools/misc/magic-wormhole/default.nix
new file mode 100644
index 000000000000..c35d3b666acb
--- /dev/null
+++ b/pkgs/tools/misc/magic-wormhole/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+with stdenv.lib;
+
+pythonPackages.buildPythonApplication rec {
+ name = "magic-wormhole-${version}";
+ version = "0.8.1";
+
+ src = fetchurl {
+ url = "mirror://pypi/m/magic-wormhole/${name}.tar.gz";
+ sha256 = "1yh5nbhh9z1am2pqnb5qqyq1zjl1m7z6jnkmvry2q14qwspw9had";
+ };
+ checkPhase = ''
+ ${pythonPackages.python.interpreter} -m wormhole.test.run_trial wormhole
+ '';
+
+ propagatedBuildInputs = with pythonPackages; [ autobahn cffi click hkdf pynacl spake2 tqdm ];
+ meta = {
+ description = "Securely transfer data between computers";
+ homepage = "https://github.com/warner/magic-wormhole";
+ license = licenses.mit;
+ maintainers = with maintainers; [ asymmetric ];
+ };
+}
diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index e840aa15ec20..0c9ac20fcc3e 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1kmysm1x7smxs9k483nin6bx1rx0av8xrqjx9yf73hc7r4anhqzp";
};
- buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs
- libssh2 openssl ];
+ buildInputs = [ pkgconfig perl glib slang zip unzip file gettext libX11 libICE
+ libssh2 openssl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
configureFlags = [ "--enable-vfs-smb" ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
repositories.git = git://github.com/MidnightCommander/mc.git;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.sander ];
- platforms = stdenv.lib.platforms.linux;
+ platforms = with stdenv.lib.platforms; linux ++ darwin;
updateWalker = true;
};
}
diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix
index 6ea9d71bddc7..c309c8229747 100644
--- a/pkgs/tools/misc/ncdu/default.nix
+++ b/pkgs/tools/misc/ncdu/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ncdu-${version}";
- version = "1.11";
+ version = "1.12";
src = fetchurl {
url = "http://dev.yorhel.nl/download/${name}.tar.gz";
- sha256 = "0yxv87hpal05p6nii6rlnai5a8958689l9vz020w4qvlwiragbnh";
+ sha256 = "16j9fyw73y1lk05a35i4q9i66laklgsx41lz5rxfr8m28x3lw3l2";
};
buildInputs = [ ncurses ];
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 023498de371c..d74f27700302 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, perl, makeWrapper, procps }:
stdenv.mkDerivation rec {
- name = "parallel-20160722";
+ name = "parallel-20161022";
src = fetchurl {
url = "mirror://gnu/parallel/${name}.tar.bz2";
- sha256 = "e391ebd081e8ba13e870be68106d1beb5def2b001fa5881f46df0ab95304f521";
+ sha256 = "1mz82chm5qav6h64rcckxzabr7w4ma0sjx61xav85x0swgcbjdsr";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix
index ab72dc69fa47..0b48a5a66c6e 100644
--- a/pkgs/tools/misc/progress/default.nix
+++ b/pkgs/tools/misc/progress/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, pkgconfig, ncurses }:
+{ stdenv, fetchFromGitHub, pkgconfig, ncurses, which }:
stdenv.mkDerivation rec {
name = "progress-${version}";
- version = "0.13";
+ version = "0.13.1";
src = fetchFromGitHub {
owner = "Xfennec";
repo = "progress";
rev = "v${version}";
- sha256 = "0xzpcvz4n0h8m0mhxgpvn1qg8993naip3asjbk3nmk3d4lbyh0b3";
+ sha256 = "13nhczzb0zqg5zfpf5vcfi6aahyb8lrr52pvpjgi1zfkh2m9vnig";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig which ];
buildInputs = [ ncurses ];
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix
index 811e57c0a084..ac4f4524b992 100644
--- a/pkgs/tools/misc/pws/default.nix
+++ b/pkgs/tools/misc/pws/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "Command-line password safe";
homepage = https://github.com/janlelis/pws;
license = licenses.mit;
- maintainers = maintainers.swistak35;
+ maintainers = [ maintainers.swistak35 ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index 7eba2d2f939c..c5f017564af5 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -5,13 +5,13 @@ let
inherit (pythonPackages) python nose pycrypto requests2 mock;
in stdenv.mkDerivation rec {
name = "svtplay-dl-${version}";
- version = "1.7";
+ version = "1.8";
src = fetchFromGitHub {
owner = "spaam";
repo = "svtplay-dl";
rev = version;
- sha256 = "15vadnyah51pk4d0lx11bymxhfq47l5ijn72pjqr9yjx3pkgpd7w";
+ sha256 = "1cn79kbz9fhhbajxg1fqd8xlab9jz4x1n9w7n42w0j8c627q0rlv";
};
pythonPaths = [ pycrypto requests2 ];
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index fe6838d52000..70719bdfdf1f 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -15,11 +15,11 @@ with stdenv.lib;
buildPythonApplication rec {
name = "youtube-dl-${version}";
- version = "2016.11.14.1";
+ version = "2016.11.22";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
- sha256 = "d96b5e5fe7de67ea01c2be746c00dc78ffbf3f74654aa989db8baaf153243537";
+ sha256 = "e8d599c512ce56a6ea46955e2bb8f4471ae8a6f757183212cc49b6dd48d9a282";
};
buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;
diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix
index 4f05220232fc..af5d8309507d 100644
--- a/pkgs/tools/networking/axel/default.nix
+++ b/pkgs/tools/networking/axel/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, gettext, autoreconfHook }:
+{ stdenv, fetchurl, autoreconfHook, gettext, libssl }:
stdenv.mkDerivation rec {
name = "axel-${version}";
- version = "2.7";
+ version = "2.11";
src = fetchurl {
url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz";
- sha256 = "174x4bp4gcwmpf94hdsdxlpk7q7ldgpsicry7x2pa9zw4yz86wl0";
+ sha256 = "05askz9pi8kvjyn66rszjfg9arwdzl72jwd38q9h9n5s37vqslky";
};
- buildInputs = [ gettext autoreconfHook ];
+ nativeBuildInputs = [ autoreconfHook ];
+
+ buildInputs = [ gettext libssl ];
installFlags = [ "ETCDIR=$(out)/etc" ];
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index d96bc08495f0..0bd79890dc02 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
sha256 = "a864e347ddf6da8dabd40e0185b8c10a655d4a94b45cbaa2b3bb4b5e8360d204";
};
+ outputs = [ "out" "dev" ];
+
preConfigure = ''
substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname
substituteInPlace configure --replace /usr/bin/file ${file}/bin/file
diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index 4c42771be170..a37b1bdbd98a 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -1,23 +1,28 @@
-{ stdenv, fetchurl, autoreconfHook, libcap ? null, openssl ? null }:
+{ stdenv, fetchurl, openssl, perl, libcap ? null, libseccomp ? null }:
assert stdenv.isLinux -> libcap != null;
+assert stdenv.isLinux -> libseccomp != null;
stdenv.mkDerivation rec {
- name = "ntp-4.2.8p8";
+ name = "ntp-4.2.8p9";
src = fetchurl {
url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
- sha256 = "1vlpgd0dk2wkpmmf869sfxi8f46sfnmjgk51vl8n6vj5y2sx1cra";
+ sha256 = "0whbyf82lrczbri4adbsa4hg1ppfa6c7qcj7nhjwdfp1g1vjh95p";
};
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
+ "--with-openssl-libdir=${openssl.out}/lib"
+ "--with-openssl-incdir=${openssl.dev}/include"
"--enable-ignore-dns-errors"
- ] ++ stdenv.lib.optional (libcap != null) "--enable-linuxcaps";
+ ] ++ stdenv.lib.optionals stdenv.isLinux [
+ "--enable-linuxcaps"
+ "--enable-libseccomp"
+ ];
- nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ libcap openssl ];
+ buildInputs = [ libcap openssl libseccomp perl ];
hardeningEnable = [ "pie" ];
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 93541bd06039..a11b34ef9914 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pythonPackages, }:
pythonPackages.buildPythonApplication rec {
- version = "7.0.6";
+ version = "7.0.9";
name = "offlineimap-${version}";
namePrefix = "";
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
owner = "OfflineIMAP";
repo = "offlineimap";
rev = "v${version}";
- sha256 = "14hmr4f9zv1hhl6azh78rg4csincxzkp1sl4wydd4gwyb74cfpkc";
+ sha256 = "1jrg6n4fpww98vj7gfp2li9ab4pbnrpb249cqa1bs8jjwpmrsqac";
};
doCheck = false;
diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix
index 202cb4c6ba61..47d1dbbcbe69 100644
--- a/pkgs/tools/networking/openntpd/default.nix
+++ b/pkgs/tools/networking/openntpd/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "openntpd-${version}";
- version = "5.7p4";
+ version = "6.0p1";
src = fetchurl {
url = "mirror://openbsd/OpenNTPD/${name}.tar.gz";
- sha256 = "08ybpi351284wj53qqrmg13j8l7md397yrqsmg0aqxg3frcxk4x9";
+ sha256 = "1s3plmxmybwpfrimq6sc54wxnn6ca7rb2g5k2bdjm4c88w4q1axi";
};
configureFlags = [
diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index a01c39743fe6..6bcf2b80a136 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "stunnel-${version}";
- version = "5.36";
+ version = "5.37";
src = fetchurl {
url = "http://www.stunnel.org/downloads/${name}.tar.gz";
- sha256 = "1smmwkzr0i6w4jwrjxazbyf82jq1qlg8x9zil5b51pzwzpy552gb";
+ sha256 = "0hfjs3f2crdvqsalismrsf5nnz4ksj8igiwjqzg4zipz7q757qyh";
};
buildInputs = [ openssl ];
diff --git a/pkgs/tools/networking/vtun/default.nix b/pkgs/tools/networking/vtun/default.nix
index 09f48d9fa1ad..fb0ee64cc2c0 100644
--- a/pkgs/tools/networking/vtun/default.nix
+++ b/pkgs/tools/networking/vtun/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, yacc, flex }:
stdenv.mkDerivation rec {
- name = "vtun-3.0.3";
+ name = "vtun-3.0.4";
src = fetchurl {
url = "mirror://sourceforge/vtun/${name}.tar.gz";
- sha256 = "1jxrxp3klhc8az54d5qn84cbc0vdafg319jh84dxkrswii7vxp39";
+ sha256 = "1fcqzn2bdjw31j1hvv6lg99v2phhszm29kp2xambxzp32mmxzy5b";
};
patches = [
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 7473f056ce97..88df4d78d26b 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -10,11 +10,17 @@ stdenv.mkDerivation rec {
sha256 = "0yh2q318bnmf2152g2h1yvzgqbswn0wvbzb8p4kf7v057shxcyqn";
};
+ # don't install sample config files into the absolute sysconfdir folder
+ postPatch = ''
+ substituteInPlace Makefile.in --replace ' etc ' ' '
+ '';
+
buildInputs = [
zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre
];
configureFlags = [
+ "--sysconfdir=/etc/clamav"
"--with-zlib=${zlib.dev}"
"--with-libbz2-prefix=${bzip2.dev}"
"--with-iconv-dir=${libiconv}"
@@ -26,6 +32,11 @@ stdenv.mkDerivation rec {
"--enable-milter"
];
+ postInstall = ''
+ mkdir $out/etc
+ cp etc/*.sample $out/etc
+ '';
+
meta = with stdenv.lib; {
homepage = http://www.clamav.net;
description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats";
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index b7a71332e772..a4b47843583f 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null;
stdenv.mkDerivation rec {
name = "gnupg-${version}";
- version = "2.1.15";
+ version = "2.1.16";
src = fetchurl {
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
- sha256 = "1pgz02gd84ab94w4xdg67p9z8kvkyr9d523bvcxxd2hviwh1m362";
+ sha256 = "0i483m9q032a0s50f1izb213g4h5i7pcgn395m6hvl3sg2kadfa9";
};
buildInputs = [
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
readline libusb gnutls adns openldap zlib bzip2
];
+ NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+
patches = [ ./fix-libusb-include-path.patch ];
postPatch = stdenv.lib.optionalString stdenv.isLinux ''
sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix
index fb7b8cc9fe74..a38e70df6323 100644
--- a/pkgs/tools/security/kbfs/default.nix
+++ b/pkgs/tools/security/kbfs/default.nix
@@ -1,8 +1,8 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "kbfs-2016-08-02-git";
- version = "1.0.16";
+ name = "kbfs-2016-11-18-git";
+ version = "1.0.2";
goPackagePath = "github.com/keybase/kbfs";
subPackages = [ "kbfsfuse" ];
@@ -12,8 +12,8 @@ buildGoPackage rec {
src = fetchFromGitHub {
owner = "keybase";
repo = "kbfs";
- rev = "a8f0714536d15668e0f561ec4d3324762c8cf030";
- sha256 = "0m4k55akd8cv5k8mfpm3rb3fz13z31l49pml7mgviv0hi3mnisqd";
+ rev = "aac615d7c50e7512a51a133c14cb699d9941ba8c";
+ sha256 = "0vah6x37g2w1f7mb5x16f1815608mvv2d1mrpkpnhz2gz7qzz6bv";
};
buildFlags = [ "-tags production" ];
diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index c4d0f20d6c2d..fbed233b090d 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "keybase-${version}";
- version = "1.0.17";
+ version = "1.0.18";
rev = "v${version}";
goPackagePath = "github.com/keybase/client";
@@ -14,7 +14,7 @@ buildGoPackage rec {
owner = "keybase";
repo = "client";
inherit rev;
- sha256 = "14cj0npsvnc3whw7gashgd7lhj3lvjdkivsnvsjg7dp3hifvqxnx";
+ sha256 = "16n9fwx8v3jradp1l2564872akq6npib794jadfl5d122cll0n7h";
};
buildFlags = [ "-tags production" ];
diff --git a/pkgs/tools/security/phrasendrescher/default.nix b/pkgs/tools/security/phrasendrescher/default.nix
new file mode 100644
index 000000000000..814bc0d85302
--- /dev/null
+++ b/pkgs/tools/security/phrasendrescher/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, openssl }:
+
+stdenv.mkDerivation rec {
+ name = "phrasendrescher-${version}";
+ version = "1.0";
+
+ src = fetchurl {
+ url = "http://leidecker.info/projects/phrasendrescher/${name}.tar.gz";
+ sha256 = "1r0j7ms3i324p6if9cg8i0q900zqfjpvfr8pwj181x8ascysbbf2";
+ };
+
+ buildInputs = [ openssl ];
+
+ meta = with stdenv.lib; {
+ description = "Cracking tool that finds passphrases of SSH keys";
+ homepage = "http://leidecker.info/projects/phrasendrescher.shtml";
+ license = licenses.gpl2Plus;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ bjornfor ];
+ };
+}
diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix
index 4bd199686763..5f282dd378a5 100644
--- a/pkgs/tools/security/softhsm/default.nix
+++ b/pkgs/tools/security/softhsm/default.nix
@@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
postInstall = "rm -rf $out/var";
- meta = {
+ meta = with stdenv.lib; {
homepage = https://www.opendnssec.org/softhsm;
description = "Cryptographic store accessible through a PKCS #11 interface";
- license = stdenv.lib.licenses.bsd2;
- maintainers = stdenv.lib.maintainers.leenaars;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.bsd2;
+ maintainers = [ maintainers.leenaars ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix
index eed5c06552b2..055a480f92ad 100644
--- a/pkgs/tools/system/monit/default.nix
+++ b/pkgs/tools/system/monit/default.nix
@@ -1,15 +1,15 @@
-{stdenv, fetchurl, openssl, bison, flex, pam, usePAM ? stdenv.isLinux }:
+{stdenv, fetchurl, openssl, bison, flex, pam, zlib, usePAM ? stdenv.isLinux }:
stdenv.mkDerivation rec {
- name = "monit-5.19.0";
+ name = "monit-5.20.0";
src = fetchurl {
url = "${meta.homepage}dist/${name}.tar.gz";
- sha256 = "1f32dz7zzp575d35m8xkgjgrqs2vbls0q6vdzm7wwashcm1xbz5y";
+ sha256 = "13drg4k9r9drn7bpj3n04kkf1l29q05jdccdar6yc6hcqmg3kb7b";
};
nativeBuildInputs = [ bison flex ];
- buildInputs = [ openssl ] ++ stdenv.lib.optionals usePAM [ pam ];
+ buildInputs = [ openssl zlib.dev ] ++ stdenv.lib.optionals usePAM [ pam ];
configureFlags = [
"--with-ssl-incl-dir=${openssl.dev}/include"
diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix
index 370fcf265d51..b6340fd2df46 100644
--- a/pkgs/tools/text/reckon/default.nix
+++ b/pkgs/tools/text/reckon/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Flexibly import bank account CSV files into Ledger for command line accounting";
license = licenses.mit;
- maintainers = "mckean.kylej@gmail.com";
+ maintainers = [ "mckean.kylej@gmail.com" ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix
index c76e0f49734e..91cecce61225 100644
--- a/pkgs/tools/text/xidel/default.nix
+++ b/pkgs/tools/text/xidel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dpkg, patchelf }:
+{ stdenv, fetchurl, dpkg }:
stdenv.mkDerivation rec {
name = "xidel-${version}";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
}
else throw "xidel is not supported on ${stdenv.system}";
- buildInputs = [ dpkg patchelf ];
+ buildInputs = [ dpkg ];
unpackPhase = ''
dpkg-deb -x ${src} ./
@@ -34,9 +34,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p "$out/bin"
cp -a usr/* "$out/"
- interpreter="$(echo ${stdenv.glibc.out}/lib/ld-linux*)"
- patchelf --set-interpreter "$interpreter" "$out/bin/xidel"
- patchelf --set-rpath "${stdenv.lib.makeLibraryPath [stdenv.glibc]}" "$out/bin/xidel"
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/bin/xidel"
'';
meta = with stdenv.lib; {
@@ -45,7 +43,7 @@ stdenv.mkDerivation rec {
# source contains no license info (AFAICS), but sourceforge says GPLv2
license = licenses.gpl2;
# more platforms will be supported when we switch to source build
- platforms = [ "i686-linux" "x86_64-linux" ];
+ platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index acd5a8b7dc60..ecb48fd70887 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -203,12 +203,25 @@ in
fetchFromGitHub = {
owner, repo, rev, name ? "${repo}-${rev}-src",
+ fetchSubmodules ? false,
... # For hash agility
- }@args: fetchzip ({
- inherit name;
- url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
- meta.homepage = "https://github.com/${owner}/${repo}/";
- } // removeAttrs args [ "owner" "repo" "rev" ]) // { inherit rev; };
+ }@args:
+ let
+ baseUrl = "https://github.com/${owner}/${repo}";
+ passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" ];
+ in if fetchSubmodules then
+ fetchgit ({
+ inherit name rev fetchSubmodules;
+ url = "${baseUrl}.git";
+ } // passthruAttrs)
+ else
+ # We prefer fetchzip in cases we don't need submodules as the hash
+ # is more stable in that case.
+ fetchzip ({
+ inherit name;
+ url = "${baseUrl}/archive/${rev}.tar.gz";
+ meta.homepage = "${baseUrl}/";
+ } // passthruAttrs) // { inherit rev; };
fetchFromBitbucket = {
owner, repo, rev, name ? "${repo}-${rev}-src",
@@ -408,6 +421,8 @@ in
apt-offline = callPackage ../tools/misc/apt-offline { };
+ aptly = callPackage ../tools/misc/aptly { };
+
apulse = callPackage ../misc/apulse { };
archivemount = callPackage ../tools/filesystems/archivemount { };
@@ -571,7 +586,9 @@ in
awstats = callPackage ../tools/system/awstats { };
- axel = callPackage ../tools/networking/axel { };
+ axel = callPackage ../tools/networking/axel {
+ libssl = openssl;
+ };
azureus = callPackage ../tools/networking/p2p/azureus { };
@@ -774,6 +791,8 @@ in
daemontools = callPackage ../tools/admin/daemontools { };
+ dante = callPackage ../servers/dante { };
+
datamash = callPackage ../tools/misc/datamash { };
datefudge = callPackage ../tools/system/datefudge { };
@@ -885,7 +904,7 @@ in
goa = callPackage ../development/tools/goa { };
- clingo = callPackage ../tools/misc/clingo { };
+ gringo = callPackage ../tools/misc/gringo { };
gti = callPackage ../tools/misc/gti { };
@@ -901,6 +920,7 @@ in
long-shebang = callPackage ../misc/long-shebang {};
+ magic-wormhole = callPackage ../tools/misc/magic-wormhole {};
mathics = pythonPackages.mathics;
meson = callPackage ../development/tools/build-managers/meson { };
@@ -1295,6 +1315,10 @@ in
cudatoolkit = cudatoolkit8;
};
+ cudnn51_cudatoolkit80 = callPackage ../development/libraries/science/math/cudnn/8.0-5.1 {
+ cudatoolkit = cudatoolkit8;
+ };
+
curlFull = curl.override {
idnSupport = true;
ldapSupport = true;
@@ -2285,6 +2309,8 @@ in
jscoverage = callPackage ../development/tools/misc/jscoverage { };
+ jsduck = callPackage ../development/tools/jsduck { };
+
jwhois = callPackage ../tools/networking/jwhois { };
k2pdfopt = callPackage ../applications/misc/k2pdfopt { };
@@ -4482,6 +4508,8 @@ in
arachne-pnr = callPackage ../development/compilers/arachne-pnr { };
+ asn1c = callPackage ../development/compilers/asn1c { };
+
aspectj = callPackage ../development/compilers/aspectj { };
ats = callPackage ../development/compilers/ats { };
@@ -5017,6 +5045,7 @@ in
gmp = gmp6;
openblas = openblasCompat;
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
+ llvm = llvm_37;
};
julia-git = lowPrio (callPackage ../development/compilers/julia/git.nix {
@@ -5045,7 +5074,8 @@ in
llvm_35 = llvmPackages_35.llvm;
llvm_34 = llvmPackages_34.llvm;
- llvmPackages = recurseIntoAttrs llvmPackages_37;
+ llvmPackages = recurseIntoAttrs
+ (if stdenv.isDarwin then llvmPackages_37 else llvmPackages_39);
llvmPackagesSelf = llvmPackages_34.override {
stdenv = libcxxStdenv;
@@ -5345,6 +5375,13 @@ in
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
odbcSupport = true;
};
+ erlang_basho_R16B03 = callPackage ../development/interpreters/erlang/R16B03-1-basho.nix {
+ inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+ };
+ erlang_basho_R16B03_odbc = callPackage ../development/interpreters/erlang/R16B03-1-basho.nix {
+ inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+ odbcSupport = true;
+ };
erlangR17 = callPackage ../development/interpreters/erlang/R17.nix {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
};
@@ -5672,12 +5709,12 @@ in
spark = callPackage ../applications/networking/cluster/spark { };
- spidermonkey = callPackage ../development/interpreters/spidermonkey { };
- spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { };
- spidermonkey_185 = callPackage ../development/interpreters/spidermonkey/185-1.0.0.nix { };
- spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.0.nix { };
- spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.2.nix { };
- spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.5.nix { };
+ spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };
+ spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { };
+ spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.nix { };
+ spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { };
+ spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { };
+ spidermonkey = spidermonkey_31;
supercollider = callPackage ../development/interpreters/supercollider {
fftw = fftwSinglePrec;
@@ -5857,6 +5894,8 @@ in
bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { };
bison = bison3;
+ bloaty = callPackage ../development/tools/bloaty { };
+
bossa = callPackage ../development/tools/misc/bossa {
wxGTK = wxGTK30;
};
@@ -6606,9 +6645,8 @@ in
beecrypt = callPackage ../development/libraries/beecrypt { };
beignet = callPackage ../development/libraries/beignet {
- inherit (llvmPackages) clang-unwrapped;
- inherit (xlibs) libX11;
- inherit (xorg) libXfixes libpthreadstubs libXdmcp libXdamage libXxf86vm;
+ inherit (llvmPackages_37) llvm clang-unwrapped;
+ inherit (xorg) libX11 libXfixes libpthreadstubs libXdmcp libXdamage libXxf86vm;
inherit (python3Packages) python;
inherit (purePackages) gl;
};
@@ -8814,9 +8852,7 @@ in
polarssl = mbedtls;
- polkit = callPackage ../development/libraries/polkit {
- spidermonkey = spidermonkey_17;
- };
+ polkit = callPackage ../development/libraries/polkit { };
polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { };
@@ -9741,10 +9777,6 @@ in
saxonb = callPackage ../development/libraries/java/saxon/default8.nix { };
- sharedobjects = callPackage ../development/libraries/java/shared-objects {
- stdenv = overrideInStdenv stdenv [gnumake380];
- };
-
smack = callPackage ../development/libraries/java/smack { };
swt = callPackage ../development/libraries/java/swt {
@@ -9973,7 +10005,7 @@ in
charybdis = callPackage ../servers/irc/charybdis {};
couchdb = callPackage ../servers/http/couchdb {
- spidermonkey = spidermonkey_185;
+ spidermonkey = spidermonkey_1_8_5;
python = python27;
sphinx = python27Packages.sphinx;
erlang = erlangR16;
@@ -10076,9 +10108,7 @@ in
mattermost = callPackage ../servers/mattermost { };
matterircd = callPackage ../servers/mattermost/matterircd.nix { };
- mediatomb = callPackage ../servers/mediatomb {
- spidermonkey = spidermonkey_185;
- };
+ mediatomb = callPackage ../servers/mediatomb { };
memcached = callPackage ../servers/memcached {};
@@ -10216,6 +10246,14 @@ in
riak = callPackage ../servers/nosql/riak/2.1.1.nix { };
+ riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix {
+ erlang = erlang_basho_R16B03;
+ };
+
+ stanchion = callPackage ../servers/nosql/riak-cs/stanchion.nix {
+ erlang = erlang_basho_R16B03;
+ };
+
influxdb = callPackage ../servers/nosql/influxdb { };
mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix {
@@ -11145,7 +11183,7 @@ in
];
};
grsecPatch = self.kernelPatches.grsecurity_testing;
- kernelPatches = [ self.kernelPatches.grsecurity_nixos_kmod ];
+ kernelPatches = with self.kernelPatches; [ grsecurity_nixos_kmod grsecurity_modinst ];
extraConfig = callPackage ../os-specific/linux/kernel/grsecurity-nixos-config.nix { };
};
@@ -11747,6 +11785,8 @@ in
inherit (gnome3) gsettings_desktop_schemas;
+ go-font = callPackage ../data/fonts/go-font { };
+
gyre-fonts = callPackage ../data/fonts/gyre {};
hack-font = callPackage ../data/fonts/hack { };
@@ -12026,6 +12066,12 @@ in
abook = callPackage ../applications/misc/abook { };
+ acd-cli = callPackage ../applications/networking/sync/acd_cli {
+ inherit (python35Packages)
+ buildPythonApplication appdirs colorama dateutil
+ requests2 requests_toolbelt sqlalchemy fusepy;
+ };
+
adobe-reader = callPackage_i686 ../applications/misc/adobe-reader { };
aeolus = callPackage ../applications/audio/aeolus { };
@@ -12906,6 +12952,8 @@ in
puddletag = callPackage ../applications/audio/puddletag { };
+ w_scan = callPackage ../applications/video/w_scan { };
+
wavesurfer = callPackage ../applications/misc/audio/wavesurfer { };
wavrsocvt = callPackage ../applications/misc/audio/wavrsocvt { };
@@ -12913,6 +12961,7 @@ in
wireshark-cli = callPackage ../applications/networking/sniffers/wireshark {
withQt = false;
withGtk = false;
+ inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration;
};
wireshark-gtk = wireshark-cli.override { withGtk = true; };
wireshark-qt = wireshark-cli.override { withQt = true; };
@@ -13277,6 +13326,10 @@ in
hyper = callPackage ../applications/misc/hyper { inherit (gnome2) GConf; };
hyperterm = self.hyper;
+ jackline = callPackage ../applications/networking/instant-messengers/jackline {
+ ocamlPackages = ocaml-ng.ocamlPackages_4_02;
+ };
+
slack = callPackage ../applications/networking/instant-messengers/slack { };
singularity = callPackage ../applications/virtualization/singularity { };
@@ -14117,6 +14170,8 @@ in
phototonic = qt5.callPackage ../applications/graphics/phototonic { };
+ phrasendrescher = callPackage ../tools/security/phrasendrescher { };
+
phwmon = callPackage ../applications/misc/phwmon { };
pianobar = callPackage ../applications/audio/pianobar { };
@@ -14786,7 +14841,7 @@ in
tig = gitAndTools.tig;
tilda = callPackage ../applications/misc/tilda {
- vte = gnome3.vte_290;
+ vte = gnome3.vte;
gtk = gtk3;
};
@@ -15353,8 +15408,7 @@ in
roxterm = callPackage ../applications/misc/roxterm {
inherit (pythonPackages) lockfile;
- inherit (gnome3) gsettings_desktop_schemas;
- vte = gnome3.vte_290;
+ inherit (gnome3) gsettings_desktop_schemas vte;
};
xtrace = callPackage ../tools/X11/xtrace { };
@@ -15621,6 +15675,8 @@ in
gnugo = callPackage ../games/gnugo { };
+ gogui = callPackage ../games/gogui {};
+
gtypist = callPackage ../games/gtypist { };
gzdoom = callPackage ../games/gzdoom { };
@@ -16382,7 +16438,7 @@ in
paml = callPackage ../applications/science/biology/paml { };
plink = callPackage ../applications/science/biology/plink/default.nix { };
-
+
plink-ng = callPackage ../applications/science/biology/plink-ng/default.nix { };
samtools = callPackage ../applications/science/biology/samtools/default.nix { };
@@ -16999,6 +17055,8 @@ in
faust2jaqt = callPackage ../applications/audio/faust/faust2jaqt.nix { };
+ faust2ladspa = callPackage ../applications/audio/faust/faust2ladspa.nix { };
+
faust2lv2 = callPackage ../applications/audio/faust/faust2lv2.nix { };
fceux = callPackage ../misc/emulators/fceux { };
@@ -17549,4 +17607,6 @@ in
nitrokey-app = callPackage ../tools/security/nitrokey-app { };
fpm2 = callPackage ../tools/security/fpm2 { };
+
+ simplenote = callPackage ../applications/misc/simplenote { };
}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a3867860799d..a3cb0a8ca1c6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -49,10 +49,8 @@ rec {
ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
bootPkgs = packages.ghc7103;
inherit (bootPkgs) alex happy;
- };
- # TODO: how should we support multiple versions of this?
- ghcCross = compiler.ghcHEAD.override {
- cross = crossSystem;
+ inherit crossSystem;
+ selfPkgs = packages.ghcHEAD;
};
ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix rec {
bootPkgs = packages.ghc784;
@@ -125,7 +123,11 @@ rec {
ghc = compiler.ghcHEAD;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
};
- # TODO Support for ghcCross here
+ # TODO Support for multiple variants here
+ ghcCross = callPackage ../development/haskell-modules {
+ ghc = compiler.ghcHEAD.crossCompiler;
+ compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
+ };
ghcNokinds = callPackage ../development/haskell-modules {
ghc = compiler.ghcNokinds;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-nokinds.nix { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 5e694f188e9c..ba006319261d 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -158,6 +158,8 @@ let
erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { };
+ erm_xmpp_0_3 = callPackage ../development/ocaml-modules/erm_xmpp/0.3.nix { };
+
estring = callPackage ../development/ocaml-modules/estring { };
ezjsonm = callPackage ../development/ocaml-modules/ezjsonm {
@@ -259,7 +261,13 @@ let
mlgmp = callPackage ../development/ocaml-modules/mlgmp { };
- nocrypto = callPackage ../development/ocaml-modules/nocrypto { };
+ nocrypto = callPackage ../development/ocaml-modules/nocrypto {
+ lwt = ocaml_lwt;
+ };
+
+ notty = callPackage ../development/ocaml-modules/notty {
+ lwt = ocaml_lwt;
+ };
ocaml_batteries = callPackage ../development/ocaml-modules/batteries { };
@@ -337,6 +345,8 @@ let
otfm = callPackage ../development/ocaml-modules/otfm { };
+ otr = callPackage ../development/ocaml-modules/otr { };
+
ounit = callPackage ../development/ocaml-modules/ounit { };
piqi = callPackage ../development/ocaml-modules/piqi { };
@@ -364,6 +374,10 @@ let
textutils_p4 = callPackage ../development/ocaml-modules/textutils { };
+ tls = callPackage ../development/ocaml-modules/tls {
+ lwt = ocaml_lwt;
+ };
+
type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { };
type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { };
type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { };
@@ -639,7 +653,7 @@ let
then { tools = pkgs.pkgsi686Linux.stdenv.cc; }
else {}
);
-
+
glsurf = callPackage ../applications/science/math/glsurf {
libpng = pkgs.libpng12;
giflib = pkgs.giflib_4_1;
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4ef49116bee5..92eba09281ce 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7413,10 +7413,10 @@ let self = _self // overrides; _self = with self; {
};
LogAny = buildPerlPackage rec {
- name = "Log-Any-1.042";
+ name = "Log-Any-1.045";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PR/PREACTION/${name}.tar.gz";
- sha256 = "b2cadb25a147bd49afdab1092a4a37268f307fcb6524a679623647a22501de84";
+ sha256 = "d95180c0c2d50d7d3a541e0c79d83ee6b4ad5787e1785b361fed450c2dec8400";
};
meta = {
homepage = https://github.com/preaction/Log-Any;
@@ -7494,10 +7494,10 @@ let self = _self // overrides; _self = with self; {
};
LogLog4perl = buildPerlPackage rec {
- name = "Log-Log4perl-1.47";
+ name = "Log-Log4perl-1.48";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MS/MSCHILLI/${name}.tar.gz";
- sha256 = "9001dded011226538b9a50c7856815bb0dba72a1e6218fdcaba56f651356b96f";
+ sha256 = "cf6e9fc1f9183fabbe540d84f603c6541458034092b7c53e41008093db62dc98";
};
meta = {
homepage = https://mschilli.github.io/log4perl/;
@@ -7778,10 +7778,10 @@ let self = _self // overrides; _self = with self; {
};
MathBigInt = buildPerlPackage rec {
- name = "Math-BigInt-1.999727";
+ name = "Math-BigInt-1.999800";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz";
- sha256 = "4539b8e55f828a9f370b46cd6ef6618c95cb15302384a8f84c2a1fec66d4e33e";
+ sha256 = "216096d1f937252bfc449b1de01b760ffaab46e753e150cc2a685f4935bd030d";
};
meta = {
description = "Arbitrary size integer/float math package";
@@ -7803,10 +7803,10 @@ let self = _self // overrides; _self = with self; {
};
MathBigRat = buildPerlPackage rec {
- name = "Math-BigRat-0.260804";
+ name = "Math-BigRat-0.260805";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz";
- sha256 = "f9bf5c007c0f141df7c7887d3482d47033cf7deab094a01e2863f31bacd7ef8a";
+ sha256 = "9e41be24272e262fadc1921c7f51ff218384c92e5628cb53bf62b3026710fd41";
};
propagatedBuildInputs = [ MathBigInt ];
meta = {
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 6313ff5372cd..1808d65b75c4 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -79,10 +79,10 @@ let
sha256 = "1ywrsp90w6rlgq3v2vmvp2zvvykkgqqasab7h9bf3vgvgv3qasbg";
configureFlags = [
- "--with-spidermonkey=${pkgs.spidermonkey_185}"
+ "--with-spidermonkey=${pkgs.spidermonkey_1_8_5}"
];
- buildInputs = [ pkgs.spidermonkey_185 ];
+ buildInputs = [ pkgs.spidermonkey_1_8_5 ];
};
xdebug = if isPhp7 then xdebug24 else xdebug23;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ebc5228fd627..452ca3205410 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -336,34 +336,6 @@ in {
};
};
- acd_cli = buildPythonPackage rec {
- name = pname + "-" + version;
- pname = "acd_cli";
- version = "0.3.1";
-
- disabled = !isPy33;
- doCheck = !isPy33;
-
- src = pkgs.fetchFromGitHub {
- owner = "yadayada";
- repo = pname;
- rev = version;
- sha256 = "1ywimbisgb5g7xl9nrfwcm7dv3j8fsrjfp7bxb3l58zbsrzj6z2s";
- };
-
- propagatedBuildInputs = with self; [ appdirs colorama dateutil requests2 requests_toolbelt sqlalchemy ];
-
- makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${pkgs.fuse}/lib/libfuse.so" ];
-
- meta = {
- description = "A command line interface and FUSE filesystem for Amazon Cloud Drive";
- homepage = https://github.com/yadayada/acd_cli;
- license = licenses.gpl2;
- platforms = platforms.linux;
- maintainers = with maintainers; [ edwtjo ];
- };
- };
-
altair = buildPythonPackage rec {
name = "altair-1.0.0";
@@ -11961,7 +11933,7 @@ in {
meta = {
homepage = "http://nicolargo.github.io/glances/";
description = "Cross-platform curses-based monitoring tool";
- license = licenses.lgpl2;
+ license = licenses.lgpl3;
maintainers = with maintainers; [ koral ];
};
};
@@ -12500,6 +12472,28 @@ in {
};
};
+ hkdf = buildPythonPackage rec {
+ name = "hkdf-${version}";
+ version = "0.0.3";
+
+ src = pkgs.fetchurl {
+ url = "mirror://pypi/h/hkdf/${name}.tar.gz";
+ sha256 = "1jhxk5vhxmxxjp3zj526ry521v9inzzl8jqaaf0ma65w6k332ak2";
+ };
+
+ buildInputs = with self; [ nose ];
+
+ checkPhase = ''
+ nosetests
+ '';
+
+ meta = {
+ description = "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)";
+ homepage = "https://github.com/casebeer/python-hkdf";
+ license = licenses.bsd2;
+ };
+ };
+
httpretty = buildPythonPackage rec {
name = "httpretty-${version}";
version = "0.8.10";
@@ -13812,7 +13806,6 @@ in {
};
};
-
m2crypto = buildPythonPackage rec {
version = "0.24.0";
name = "m2crypto-${version}";
@@ -18772,12 +18765,12 @@ in {
};
powerline = buildPythonPackage rec {
- rev = "2.1.4";
+ rev = "2.4";
name = "powerline-${rev}";
src = pkgs.fetchurl {
url = "https://github.com/powerline/powerline/archive/${rev}.tar.gz";
name = "${name}.tar.gz";
- sha256 = "0gnh5yyackmqcphiympan48dm5lc834yzspss1lp4g1wq3vpyraf";
+ sha256 = "12fp3cpwgpkxcj4mfjdpsmf1h0b8pqy1icb07jdivz9kw18h0184";
};
propagatedBuildInputs = with self; [ pkgs.git pkgs.mercurial pkgs.bazaar self.psutil self.pygit2 ];
@@ -23157,6 +23150,30 @@ in {
};
};
+ spake2 = buildPythonPackage rec {
+ name = "spake2-${version}";
+ version = "0.7";
+
+ src = pkgs.fetchurl {
+ url = "mirror://pypi/s/spake2/${name}.tar.gz";
+ sha256 = "0rmplicbbid41qrvwc1ckyp211ban01ardms5yqqq16ixrc18a6j";
+ };
+
+ buildInputs = with self; [ pytest ];
+
+ propagatedBuildInputs = with self; [ hkdf ];
+
+ checkPhase = ''
+ py.test $out
+ '';
+
+ meta = {
+ description = "SPAKE2 password-authenticated key exchange library";
+ homepage = "http://github.com/warner/python-spake2";
+ license = licenses.mit;
+ };
+ };
+
sqlite3dbm = buildPythonPackage rec {
name = "sqlite3dbm-0.1.4";
disabled = isPy3k;