diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 92676378936..8400aa5c684 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -32,4 +32,4 @@ See the nixpkgs manual for more details on how to [Submit changes to nixpkgs](ht
## Reviewing contributions
-See the nixpkgs manual for more details on how to [Review contributions](http://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/download-by-type/doc/manual#chap-reviewing-contributions).
+See the nixpkgs manual for more details on how to [Review contributions](https://nixos.org/nixpkgs/manual/#sec-reviewing-contributions).
diff --git a/.mention-bot b/.mention-bot
index 8aeeedace10..d8529bd9123 100644
--- a/.mention-bot
+++ b/.mention-bot
@@ -1,10 +1,12 @@
{
"userBlacklist": [
"civodul",
- "jhasse"
+ "jhasse",
+ "shlevy"
],
"alwaysNotifyForPaths": [
{ "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] },
+ { "name": "LnL7", "files": ["pkgs/stdenv/darwin/*", "pkgs/os-specific/darwin/*"] },
{ "name": "copumpkin", "files": ["pkgs/stdenv/darwin/*", "pkgs/os-specific/darwin/apple-source-releases/*"] }
],
"fileBlacklist": ["pkgs/top-level/all-packages.nix"]
diff --git a/.travis.yml b/.travis.yml
index 1fa01f7b781..802af69834d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ matrix:
- os: linux
sudo: false
script:
- - ./maintainers/scripts/travis-nox-review-pr.sh nixpkgs-verify nixpkgs-manual nixpkgs-tarball
+ - ./maintainers/scripts/travis-nox-review-pr.sh nixpkgs-verify nixpkgs-manual nixpkgs-tarball nixpkgs-unstable
- ./maintainers/scripts/travis-nox-review-pr.sh nixos-options nixos-manual
- os: linux
sudo: required
diff --git a/doc/functions.xml b/doc/functions.xml
index 3850e58c016..70326936a57 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/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml
index 2dc5aa63e45..efb2e60cf3a 100644
--- a/doc/languages-frameworks/beam.xml
+++ b/doc/languages-frameworks/beam.xml
@@ -248,7 +248,7 @@ $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse
development. Many times we need to create a
shell.nix file and do our development inside
of the environment specified by that file. This file looks a lot
- like the packageing described above. The main difference is that
+ like the packaging described above. The main difference is that
src points to project root and we call the
package directly.
diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md
index 904e3a5069e..6728f4abba0 100644
--- a/doc/languages-frameworks/haskell.md
+++ b/doc/languages-frameworks/haskell.md
@@ -633,7 +633,7 @@ Now the builds succeeds.
Of course, in the concrete example of `ghc-events` this whole exercise is not
an ideal solution, because `ghc-events` can analyze the output emitted by any
version of GHC later than 6.12 regardless of the compiler version that was used
-to build the `ghc-events' executable, so strictly speaking there's no reason to
+to build the `ghc-events` executable, so strictly speaking there's no reason to
prefer one built with GHC 7.8.x in the first place. However, for users who
cannot use GHC 7.10.x at all for some reason, the approach of downgrading to an
older version might be useful.
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index df60cc1e573..82aeb112c93 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -97,7 +97,7 @@ We will first have a look at how Python packages are packaged on Nix. Then, we w
#### Python packaging on Nix
-On Nix all packages are built by functions. The main function in Nix for building Python packages is [`buildPythonPackage`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/generic/default.nix).
+On Nix all packages are built by functions. The main function in Nix for building Python packages is [`buildPythonPackage`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/interpreters/python/build-python-package.nix).
Let's see how we would build the `toolz` package. According to [`python-packages.nix`](https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/top-level/python-packages.nix) `toolz` is build using
```nix
@@ -141,13 +141,15 @@ with import {};
pkgs.python35Packages.buildPythonPackage rec {
name = "toolz-${version}";
- version = "0.7.4";
+ version = "0.8.0";
src = pkgs.fetchurl{
url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
- sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
+ sha256 = "e8451af61face57b7c5d09e71c0d27b8005f001ead56e9fdf470417e5cc6d479";
};
+ doCheck = false;
+
meta = {
homepage = "http://github.com/pytoolz/toolz/";
description = "List processing tools and functional utilities";
@@ -170,18 +172,18 @@ with import {};
( let
toolz = pkgs.python35Packages.buildPythonPackage rec {
name = "toolz-${version}";
- version = "0.7.4";
+ version = "0.8.0";
src = pkgs.fetchurl{
url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
- sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
+ sha256 = "e8451af61face57b7c5d09e71c0d27b8005f001ead56e9fdf470417e5cc6d479";
};
+ doCheck = false;
+
meta = {
homepage = "http://github.com/pytoolz/toolz/";
description = "List processing tools and functional utilities";
- license = licenses.bsd3;
- maintainers = with maintainers; [ fridh ];
};
};
@@ -308,11 +310,10 @@ Note also the line `doCheck = false;`, we explicitly disabled running the test-s
#### Develop local package
-As a Python developer you're likely aware of [development mode](http://pythonhosted.org/setuptools/setuptools.html#development-mode) (`python setup.py develop`);
+As a Python developer you're likely aware of [development mode](http://setuptools.readthedocs.io/en/latest/setuptools.html#development-mode) (`python setup.py develop`);
instead of installing the package this command creates a special link to the project code.
That way, you can run updated code without having to reinstall after each and every change you make.
-Development mode is also available on Nix as [explained](http://nixos.org/nixpkgs/manual/#ssec-python-development) in the Nixpkgs manual.
-Let's see how you can use it.
+Development mode is also available. Let's see how you can use it.
In the previous Nix expression the source was fetched from an url. We can also refer to a local source instead using
@@ -409,10 +410,10 @@ and in this case the `python35` interpreter is automatically used.
### Interpreters
-Versions 2.6, 2.7, 3.3, 3.4 and 3.5 of the CPython interpreter are as respectively
+Versions 2.6, 2.7, 3.3, 3.4 and 3.5 of the CPython interpreter are available as respectively
`python26`, `python27`, `python33`, `python34` and `python35`. The PyPy interpreter
is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and
-`python35`. The default interpreter, `python`, maps to `python3`.
+`python35`. The default interpreter, `python`, maps to `python2`.
The Nix expressions for the interpreters can be found in
`pkgs/development/interpreters/python`.
@@ -434,17 +435,20 @@ Each interpreter has the following attributes:
- `withPackages`. Simpler interface to `buildEnv`. See section *python.withPackages function* for usage and documentation.
- `sitePackages`. Alias for `lib/${libPrefix}/site-packages`.
- `executable`. Name of the interpreter executable, e.g. `python3.4`.
+- `pkgs`. Set of Python packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`.
### Building packages and applications
-Python packages (libraries) and applications that use `setuptools` or
-`distutils` are typically built with respectively the `buildPythonPackage` and
-`buildPythonApplication` functions.
+Python libraries and applications that use `setuptools` or
+`distutils` are typically build with respectively the `buildPythonPackage` and
+`buildPythonApplication` functions. These two functions also support installing a `wheel`.
All Python packages reside in `pkgs/top-level/python-packages.nix` and all
-applications elsewhere. Some packages are also defined in
+applications elsewhere. In case a package is used as both a library and an application,
+then the package should be in `pkgs/top-level/python-packages.nix` since only those packages are made
+available for all interpreter versions. The preferred location for library expressions is in
`pkgs/development/python-modules`. It is important that these packages are
-called in `pkgs/top-level/python-packages.nix` and not elsewhere, to guarantee
+called from `pkgs/top-level/python-packages.nix` and not elsewhere, to guarantee
the right version of the package is built.
Based on the packages defined in `pkgs/top-level/python-packages.nix` an
@@ -462,14 +466,14 @@ and the aliases
* `pkgs.python2Packages` pointing to `pkgs.python27Packages`
* `pkgs.python3Packages` pointing to `pkgs.python35Packages`
-* `pkgs.pythonPackages` pointing to `pkgs.python3Packages`
+* `pkgs.pythonPackages` pointing to `pkgs.python2Packages`
#### `buildPythonPackage` function
The `buildPythonPackage` function is implemented in
`pkgs/development/interpreters/python/build-python-package.nix`
-and can be used as:
+The following is an example:
twisted = buildPythonPackage {
name = "twisted-8.1.0";
@@ -520,7 +524,7 @@ All parameters from `mkDerivation` function are still supported.
* `postShellHook`: Hook to execute commands after `shellHook`.
* `makeWrapperArgs`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`.
* `installFlags`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"].
-* `format`: Format of the source. Options are `setup` for when the source has a `setup.py` and `setuptools` is used to build a wheel, and `wheel` in case the source is already a binary wheel. The default value is `setup`.
+* `format`: Format of the source. Valid options are `setuptools` (default), `flit`, `wheel`, and `other`. `setuptools` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. In case you need to provide your own `buildPhase` and `installPhase` you can use `other`.
* `catchConflicts` If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`.
* `checkInputs` Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`.
@@ -697,59 +701,55 @@ should also be done when packaging `A`.
### How to override a Python package?
-Recursively updating a package can be done with `pkgs.overridePackages` as explained in the Nixpkgs manual.
-Python attribute sets are created for each interpreter version. We will therefore override the attribute set for the interpreter version we're interested.
-In the following example we change the name of the package `pandas` to `foo`.
-```
-newpkgs = pkgs.overridePackages(self: super: rec {
- python35Packages = (super.python35Packages.override { self = python35Packages;})
- // { pandas = super.python35Packages.pandas.override {name = "foo";};
- };
-});
-```
-This can be tested with
-```
+We can override the interpreter and pass `packageOverrides`.
+In the following example we rename the `pandas` package and build it.
+```nix
with import {};
-(let
+let
+ python = let
+ packageOverrides = self: super: {
+ pandas = super.pandas.override {name="foo";};
+ };
+ in pkgs.python35.override {inherit packageOverrides;};
-newpkgs = pkgs.overridePackages(self: super: rec {
- python35Packages = (super.python35Packages.override { self = python35Packages;})
- // { pandas = super.python35Packages.pandas.override {name = "foo";};
- };
-});
-in newpkgs.python35.withPackages (ps: [ps.blaze])
-).env
-```
-A typical use case is to switch to another version of a certain package. For example, in the Nixpkgs repository we have multiple versions of `django` and `scipy`.
-In the following example we use a different version of `scipy`. All packages in `newpkgs` will now use the updated `scipy` version.
+in python.pkgs.pandas
```
+Using `nix-build` on this expression will build the package `pandas`
+but with the new name `foo`.
+
+All packages in the package set will use the renamed package.
+A typical use case is to switch to another version of a certain package.
+For example, in the Nixpkgs repository we have multiple versions of `django` and `scipy`.
+In the following example we use a different version of `scipy` and create an environment that uses it.
+All packages in the Python package set will now use the updated `scipy` version.
+
+```nix
with import {};
-(let
-
-newpkgs = pkgs.overridePackages(self: super: rec {
- python35Packages = super.python35Packages.override {
- self = python35Packages // { scipy = python35Packages.scipy_0_17;};
+(
+let
+ packageOverrides = self: super: {
+ scipy = super.scipy_0_17;
};
-});
-in newpkgs.python35.withPackages (ps: [ps.blaze])
+in (pkgs.python35.override {inherit packageOverrides;}).withPackages (ps: [ps.blaze])
).env
```
-The requested package `blaze` depends upon `pandas` which itself depends on `scipy`.
+The requested package `blaze` depends on `pandas` which itself depends on `scipy`.
-A similar example but now using `django`
+If you want the whole of Nixpkgs to use your modifications, then you can use `pkgs.overridePackages`
+as explained in this manual. In the following example we build a `inkscape` using a different version of `numpy`.
```
-with import {};
-
-(let
-
-newpkgs = pkgs.overridePackages(self: super: rec {
- python27Packages = (super.python27Packages.override {self = python27Packages;})
- // { django = super.python27Packages.django_1_9; };
-});
-in newpkgs.python27.withPackages (ps: [ps.django_guardian ])
-).env
+let
+ pkgs = import {};
+ newpkgs = pkgs.overridePackages ( pkgsself: pkgssuper: {
+ python27 = let
+ packageOverrides = self: super: {
+ numpy = super.numpy_1_10;
+ };
+ in pkgssuper.python27.override {inherit packageOverrides;};
+ } );
+in newpkgs.inkscape
```
### `python setup.py bdist_wheel` cannot create .whl
@@ -770,9 +770,9 @@ or the current time:
nix-shell --run "SOURCE_DATE_EPOCH=$(date +%s) python3 setup.py bdist_wheel"
```
or unset:
-"""
+```
nix-shell --run "unset SOURCE_DATE_EPOCH; python3 setup.py bdist_wheel"
-"""
+```
### `install_data` / `data_files` problems
diff --git a/doc/manual.xml b/doc/manual.xml
index 32e94e8e59c..6ad66d48652 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -20,6 +20,7 @@
+
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index f0015a7f9ac..0ba7ec4c44d 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -382,4 +382,138 @@ it. Place the resulting package.nix file into
+
+
+Steam
+
+
+
+Steam in Nix
+
+
+ Steam is distributed as a .deb file, for now only
+ as an i686 package (the amd64 package only has documentation).
+ When unpacked, it has a script called steam that
+ in ubuntu (their target distro) would go to /usr/bin
+ . When run for the first time, this script copies some
+ files to the user's home, which include another script that is the
+ ultimate responsible for launching the steam binary, which is also
+ in $HOME.
+
+
+ Nix problems and constraints:
+
+ We don't have /bin/bash and many
+ scripts point there. Similarly for /usr/bin/python
+ .
+ We don't have the dynamic loader in /lib
+ .
+ The steam.sh script in $HOME can
+ not be patched, as it is checked and rewritten by steam.
+ The steam binary cannot be patched, it's also checked.
+
+
+
+ The current approach to deploy Steam in NixOS is composing a FHS-compatible
+ chroot environment, as documented
+ here.
+ This allows us to have binaries in the expected paths without disrupting the system,
+ and to avoid patching them to work in a non FHS environment.
+
+
+
+
+
+
+How to play
+
+
+ For 64-bit systems it's important to have
+ hardware.opengl.driSupport32Bit = true;
+ in your /etc/nixos/configuration.nix. You'll also need
+ hardware.pulseaudio.support32Bit = true;
+ if you are using PulseAudio - this will enable 32bit ALSA apps integration.
+ To use the Steam controller, you need to add
+ services.udev.extraRules = ''
+ SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", MODE="0666"
+ KERNEL=="uinput", MODE="0660", GROUP="users", OPTIONS+="static_node=uinput"
+ '';
+ to your configuration.
+
+
+
+
+
+
+Troubleshooting
+
+
+
+
+
+ Steam fails to start. What do I do?
+ Try to run
+ strace steam
+ to see what is causing steam to fail.
+
+
+
+ Using the FOSS Radeon drivers
+
+ The open source radeon drivers need a newer libc++ than is provided
+ by the default runtime, which leads to a crash on launch. Use
+ environment.systemPackages = [(pkgs.steam.override { newStdcpp = true; })];
+ in your config if you get an error like
+
+libGL error: unable to load driver: radeonsi_dri.so
+libGL error: driver pointer missing
+libGL error: failed to load driver: radeonsi
+libGL error: unable to load driver: swrast_dri.so
+libGL error: failed to load driver: swrast
+
+ Steam ships statically linked with a version of libcrypto that
+ conflics with the one dynamically loaded by radeonsi_dri.so.
+ If you get the error
+ steam.sh: line 713: 7842 Segmentation fault (core dumped)
+ have a look at this pull request.
+
+
+
+
+
+ Java
+
+
+ There is no java in steam chrootenv by default. If you get a message like
+ /home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found
+ You need to add
+ steam.override { withJava = true; };
+ to your configuration.
+
+
+
+
+
+
+
+
+
+
+steam-run
+
+The FHS-compatible chroot used for steam can also be used to run
+other linux games that expect a FHS environment.
+To do it, add
+pkgs.(steam.override {
+ nativeOnly = true;
+ newStdcpp = true;
+ }).run
+to your configuration, rebuild, and run the game with
+steam-run ./foo
+
+
+
+
+
+
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/attrsets.nix b/lib/attrsets.nix
index 1f381c5e721..c1bd764c70d 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -391,7 +391,7 @@ rec {
);
in f [] [rhs lhs];
- /* A recursive variant of the update operator ‘//’. The recusion
+ /* A recursive variant of the update operator ‘//’. The recursion
stops when one of the attribute values is not an attribute set,
in which case the right hand side value takes precedence over the
left hand side value.
diff --git a/lib/default.nix b/lib/default.nix
index cb9a9b0bd4d..c0d7899b882 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 00000000000..4d3c920b0ae
--- /dev/null
+++ b/lib/generators.nix
@@ -0,0 +1,93 @@
+/* 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 {
+
+ /* Generate a line of key k and value v, separated by
+ * character sep. If sep appears in k, it is escaped.
+ * Helper for synaxes with different separators.
+ *
+ * mkKeyValueDefault ":" "f:oo" "bar"
+ * > "f\:oo:bar"
+ */
+ mkKeyValueDefault = sep: k: v:
+ "${libStr.escape [sep] k}${sep}${toString v}";
+
+
+ /* Generate a key-value-style config file from an attrset.
+ *
+ * mkKeyValue is the same as in toINI.
+ */
+ toKeyValue = {
+ mkKeyValue ? mkKeyValueDefault "="
+ }: attrs:
+ let mkLine = k: v: mkKeyValue k v + "\n";
+ in libStr.concatStrings (libAttr.mapAttrsToList mkLine attrs);
+
+
+ /* Generate 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 ? mkKeyValueDefault "="
+ }: attrsOfAttrs:
+ let
+ # map function to string for each key val
+ mapAttrsToStringsSep = sep: mapFn: attrs:
+ libStr.concatStringsSep sep
+ (libAttr.mapAttrsToList mapFn attrs);
+ mkSection = sectName: sectValues: ''
+ [${mkSectionName sectName}]
+ '' + toKeyValue { inherit mkKeyValue; } 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 28ff28fba71..f88cd1212fb 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 ";
@@ -116,6 +118,7 @@
deepfire = "Kosyrev Serge <_deepfire@feelingofgreen.ru>";
demin-dmitriy = "Dmitriy Demin ";
DerGuteMoritz = "Moritz Heidkamp ";
+ DerTim1 = "Tim Digel ";
desiderius = "Didier J. Devroye ";
devhell = "devhell <\"^\"@regexmail.net>";
dezgeg = "Tuomas Tynkkynen ";
@@ -128,6 +131,8 @@
doublec = "Chris Double ";
drets = "Dmytro Rets ";
drewkett = "Andrew Burkett ";
+ dtzWill = "Will Dietz ";
+ e-user = "Alexander Kahl ";
ebzzry = "Rommel Martinez ";
ederoyd46 = "Matthew Brown ";
eduarrrd = "Eduard Bachmakov ";
@@ -137,6 +142,7 @@
ehmry = "Emery Hemingway ";
eikek = "Eike Kettner ";
elasticdog = "Aaron Bull Schaefer ";
+ eleanor = "Dejan Lukan ";
elitak = "Eric Litak ";
ellis = "Ellis Whitehead ";
epitrochoid = "Mabry Cervin ";
@@ -182,6 +188,7 @@
gridaphobe = "Eric Seidel ";
guibert = "David Guibert ";
guillaumekoenig = "Guillaume Koenig ";
+ guyonvarch = "Joris Guyonvarch ";
hakuch = "Jesse Haber-Kucharsky ";
havvy = "Ryan Scheel ";
hbunke = "Hendrik Bunke ";
@@ -197,8 +204,10 @@
jagajaga = "Arseniy Seroka ";
javaguirre = "Javier Aguirre ";
jb55 = "William Casarin ";
+ jbedo = "Justin Bedő ";
jcumming = "Jack Cummings ";
jefdaj = "Jeffrey David Johnson ";
+ jerith666 = "Matt McHenry ";
jfb = "James Felix Black ";
jgeerds = "Jascha Geerds ";
jgillich = "Jakob Gillich ";
@@ -235,6 +244,7 @@
leonardoce = "Leonardo Cecchi ";
lethalman = "Luca Bruno ";
lewo = "Antoine Eiche ";
+ lheckemann = "Linus Heckemann ";
lhvwb = "Nathaniel Baxter ";
lihop = "Leroy Hopson ";
linquize = "Linquize ";
@@ -266,12 +276,14 @@
matthiasbeyer = "Matthias Beyer ";
maurer = "Matthew Maurer ";
mbakke = "Marius Bakke ";
+ mbbx6spp = "Susan Potter ";
mbe = "Brandon Edens ";
mboes = "Mathieu Boespflug ";
mcmtroffaes = "Matthias C. M. Troffaes ";
mdaiter = "Matthew S. Daiter ";
meditans = "Carlo Nucera ";
meisternu = "Matt Miemiec ";
+ mguentner = "Maximilian Güntner ";
mic92 = "Jörg Thalheim ";
michaelpj = "Michael Peyton Jones ";
michalrus = "Michal Rus ";
@@ -281,9 +293,11 @@
mingchuan = "Ming Chuan ";
mirdhyn = "Merlin Gaillard ";
mirrexagon = "Andrew Abbott ";
+ mjanczyk = "Marcin Janczyk ";
mlieberman85 = "Michael Lieberman ";
modulistic = "Pablo Costa ";
mog = "Matthew O'Gorman ";
+ montag451 = "montag451 ";
moosingin3space = "Nathan Moos ";
moretea = "Maarten Hoogendoorn ";
mornfall = "Petr Ročkai ";
@@ -316,6 +330,7 @@
ocharles = "Oliver Charles ";
odi = "Oliver Dunkl ";
offline = "Jaka Hudoklin ";
+ okasu = "Okasu ";
olcai = "Erik Timan ";
olejorgenb = "Ole Jørgen Brønner ";
orbekk = "KJ Ørbekk ";
@@ -329,6 +344,7 @@
palo = "Ingolf Wanger ";
pashev = "Igor Pashev ";
pawelpacana = "Paweł Pacana ";
+ periklis = "theopompos@gmail.com";
pesterhazy = "Paulus Esterhazy ";
peterhoeg = "Peter Hoeg ";
peti = "Peter Simons ";
@@ -372,6 +388,7 @@
retrry = "Tadas Barzdžius ";
rick68 = "Wei-Ming Yang ";
rickynils = "Rickard Nilsson ";
+ rlupton20 = "Richard Lupton ";
rnhmjoj = "Michele Guerini Rocco ";
rob = "Rob Vermaas ";
robberer = "Longrin Wischnewski ";
@@ -458,6 +475,7 @@
vbgl = "Vincent Laporte ";
vbmithr = "Vincent Bernardoff ";
vcunat = "Vladimír Čunát ";
+ vdemeester = "Vincent Demeester ";
veprbl = "Dmitry Kalinkin ";
viric = "Lluís Batlle i Rossell ";
vizanto = "Danny Wilson ";
@@ -465,6 +483,7 @@
vlstill = "Vladimír Štill ";
vmandela = "Venkateswara Rao Mandela ";
volhovm = "Mikhail Volkhov ";
+ volth = "Jaroslavas Pocepko ";
vozz = "Oliver Hunt ";
vrthra = "Rahul Gopinath ";
wedens = "wedens ";
diff --git a/lib/modules.nix b/lib/modules.nix
index e66d6a6926c..256d49ba27d 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 156afaae5c9..f41abe1e1ea 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 c3b8839fda9..d33e3a824e3 100644
--- a/lib/tests.nix
+++ b/lib/tests.nix
@@ -130,4 +130,94 @@ runTests {
expected = false;
};
+
+ /* Generator tests */
+ # these tests assume attributes are converted to lists
+ # in alphabetical order
+
+ testMkKeyValueDefault = {
+ expr = generators.mkKeyValueDefault ":" "f:oo" "bar";
+ expected = ''f\:oo:bar'';
+ };
+
+ testToKeyValue = {
+ expr = generators.toKeyValue {} {
+ key = "value";
+ "other=key" = "baz";
+ };
+ expected = ''
+ key=value
+ other\=key=baz
+ '';
+ };
+
+ 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/lib/trivial.nix b/lib/trivial.nix
index 39cbd67fba3..7860b949939 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -138,7 +138,4 @@ rec {
*/
warn = msg: builtins.trace "WARNING: ${msg}";
info = msg: builtins.trace "INFO: ${msg}";
-
- fetchMD5warn = name: context : data : info
- "Deprecated use of MD5 hash in ${name} to fetch ${context}" data;
}
diff --git a/lib/types.nix b/lib/types.nix
index 26523f59f25..9366d394da7 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -333,7 +333,15 @@ rec {
name = "either";
description = "${t1.description} or ${t2.description}";
check = x: t1.check x || t2.check x;
- merge = mergeOneOption;
+ merge = loc: defs:
+ let
+ defList = map (d: d.value) defs;
+ in
+ if all (x: t1.check x) defList
+ then t1.merge loc defs
+ else if all (x: t2.check x) defList
+ then t2.merge loc defs
+ else mergeOneOption loc defs;
typeMerge = f':
let mt1 = t1.typeMerge (elemAt f'.wrapped 0).functor;
mt2 = t2.typeMerge (elemAt f'.wrapped 1).functor;
diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh
index 5fc932f10d0..649798ec76b 100755
--- a/maintainers/scripts/travis-nox-review-pr.sh
+++ b/maintainers/scripts/travis-nox-review-pr.sh
@@ -38,6 +38,12 @@ while test -n "$1"; do
nix-build $TRAVIS_BUILD_DIR/pkgs/top-level/release.nix --attr tarball --show-trace
;;
+ nixpkgs-unstable)
+ echo "=== Checking nixpkgs unstable job"
+
+ nix-instantiate $TRAVIS_BUILD_DIR/pkgs/top-level/release.nix --attr unstable --show-trace
+ ;;
+
nixpkgs-lint)
echo "=== Checking nixpkgs lint"
diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix
new file mode 100755
index 00000000000..2035950da3e
--- /dev/null
+++ b/maintainers/scripts/update.nix
@@ -0,0 +1,131 @@
+{ package ? null
+, maintainer ? null
+}:
+
+# TODO: add assert statements
+
+let
+
+ pkgs = import ./../../default.nix { };
+
+ packagesWith = cond: return: set:
+ pkgs.lib.flatten
+ (pkgs.lib.mapAttrsToList
+ (name: pkg:
+ let
+ result = builtins.tryEval (
+ if pkgs.lib.isDerivation pkg && cond name pkg
+ then [(return name pkg)]
+ else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false
+ then packagesWith cond return pkg
+ else []
+ );
+ in
+ if result.success then result.value
+ else []
+ )
+ set
+ );
+
+ packagesWithUpdateScriptAndMaintainer = maintainer':
+ let
+ maintainer =
+ if ! builtins.hasAttr maintainer' pkgs.lib.maintainers then
+ builtins.throw "Maintainer with name `${maintainer'} does not exist in `lib/maintainers.nix`."
+ else
+ builtins.getAttr maintainer' pkgs.lib.maintainers;
+ in
+ packagesWith (name: pkg: builtins.hasAttr "updateScript" pkg &&
+ (if builtins.hasAttr "maintainers" pkg.meta
+ then (if builtins.isList pkg.meta.maintainers
+ then builtins.elem maintainer pkg.meta.maintainers
+ else maintainer == pkg.meta.maintainers
+ )
+ else false
+ )
+ )
+ (name: pkg: pkg)
+ pkgs;
+
+ packageByName = name:
+ let
+ package = pkgs.lib.attrByPath (pkgs.lib.splitString "." name) null pkgs;
+ in
+ if package == null then
+ builtins.throw "Package with an attribute name `${name}` does not exists."
+ else if ! builtins.hasAttr "updateScript" package then
+ builtins.throw "Package with an attribute name `${name}` does have an `passthru.updateScript` defined."
+ else
+ package;
+
+ packages =
+ if package != null then
+ [ (packageByName package) ]
+ else if maintainer != null then
+ packagesWithUpdateScriptAndMaintainer maintainer
+ else
+ builtins.throw "No arguments provided.\n\n${helpText}";
+
+ helpText = ''
+ Please run:
+
+ % nix-shell maintainers/scripts/update.nix --argstr maintainer garbas
+
+ to run all update scripts for all packages that lists \`garbas\` as a maintainer
+ and have \`updateScript\` defined, or:
+
+ % nix-shell maintainers/scripts/update.nix --argstr package garbas
+
+ to run update script for specific package.
+ '';
+
+ runUpdateScript = package: ''
+ echo -ne " - ${package.name}: UPDATING ..."\\r
+ ${package.updateScript} &> ${(builtins.parseDrvName package.name).name}.log
+ CODE=$?
+ if [ "$CODE" != "0" ]; then
+ echo " - ${package.name}: ERROR "
+ echo ""
+ echo "--- SHOWING ERROR LOG FOR ${package.name} ----------------------"
+ echo ""
+ cat ${(builtins.parseDrvName package.name).name}.log
+ echo ""
+ echo "--- SHOWING ERROR LOG FOR ${package.name} ----------------------"
+ exit $CODE
+ else
+ rm ${(builtins.parseDrvName package.name).name}.log
+ fi
+ echo " - ${package.name}: DONE. "
+ '';
+
+in pkgs.stdenv.mkDerivation {
+ name = "nixpkgs-update-script";
+ buildCommand = ''
+ echo ""
+ echo "----------------------------------------------------------------"
+ echo ""
+ echo "Not possible to update packages using \`nix-build\`"
+ echo ""
+ echo "${helpText}"
+ echo "----------------------------------------------------------------"
+ exit 1
+ '';
+ shellHook = ''
+ echo ""
+ echo "Going to be running update for following packages:"
+ echo "${builtins.concatStringsSep "\n" (map (x: " - ${x.name}") packages)}"
+ echo ""
+ read -n1 -r -p "Press space to continue..." confirm
+ if [ "$confirm" = "" ]; then
+ echo ""
+ echo "Running update for:"
+ ${builtins.concatStringsSep "\n" (map runUpdateScript packages)}
+ echo ""
+ echo "Packages updated!"
+ exit 0
+ else
+ echo "Aborting!"
+ exit 1
+ fi
+ '';
+}
diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml
index 1b1576d3bab..d89d262eff4 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/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml
index d95091bd162..59a4e3b33ba 100644
--- a/nixos/doc/manual/configuration/modularity.xml
+++ b/nixos/doc/manual/configuration/modularity.xml
@@ -129,7 +129,7 @@ default; run nix-env -i nix-repl to get it. A
typical use:
-$ nix-repl '<nixos>'
+$ nix-repl '<nixpkgs/nixos>'
nix-repl> config.networking.hostName
"mandark"
diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml
index b0364b34657..47343d93cde 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/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml
index 65d395b0c88..c974523f886 100644
--- a/nixos/doc/manual/installation/upgrading.xml
+++ b/nixos/doc/manual/installation/upgrading.xml
@@ -101,6 +101,11 @@ channel by running
which is equivalent to the more verbose nix-channel --update
nixos; nixos-rebuild switch.
+Channels are set per user. This means that running
+nix-channel --add as a non root user (or without sudo) will not
+affect configuration in /etc/nixos/configuration.nix
+
+
It is generally safe to switch back and forth between
channels. The only exception is that a newer NixOS may also have a
newer Nix version, which may involve an upgrade of Nix’s database
diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml
index d01e2e060bd..f74788353e6 100644
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@@ -68,7 +68,7 @@ desired operation. It must be one of the following:
Build and activate the new configuration, and make it the
boot default. That is, the configuration is added to the GRUB
- boot menu as the default meny entry, so that subsequent reboots
+ boot menu as the default menu entry, so that subsequent reboots
will boot the system into the new configuration. Previous
configurations activated with nixos-rebuild
switch or nixos-rebuild boot remain
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 743f3dce230..d8b0ae01e33 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -68,6 +68,26 @@ 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.
+
+
+
+
+
+ Ntpd was replaced by
+ systemd-timesyncd as the default service to synchronize
+ system time with a remote NTP server. The old behavior can be restored by
+ setting services.ntp.enable to true.
+ Upstream time servers for all NTP implementations are now configured using
+ networking.timeServers.
+
+
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index 4e044deca21..1a17a080ba4 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -9,6 +9,8 @@ rec {
inherit pkgs;
+ qemu = pkgs.qemu_test;
+
# Build a virtual network from an attribute set `{ machine1 =
# config1; ... machineN = configN; }', where `machineX' is the
@@ -27,6 +29,7 @@ rec {
[ ../modules/virtualisation/qemu-vm.nix
../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs
{ key = "no-manual"; services.nixosManual.enable = false; }
+ { key = "qemu"; system.build.qemu = qemu; }
] ++ optional minimal ../modules/testing/minimal-kernel.nix;
extraArgs = { inherit nodes; };
};
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index 58d0cb38d75..e279803f2ea 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -27,6 +27,10 @@
, name ? "nixos-disk-image"
+ # This prevents errors while checking nix-store validity, see
+ # https://github.com/NixOS/nix/issues/1134
+, fixValidity ? true
+
, format ? "raw"
}:
@@ -61,9 +65,6 @@ pkgs.vmTools.runInLinuxVM (
# Create an empty filesystem and mount it.
mkfs.${fsType} -L nixos $rootDisk
- ${optionalString (fsType == "ext4") ''
- tune2fs -c 0 -i 0 $rootDisk
- ''}
mkdir /mnt
mount $rootDisk /mnt
@@ -71,9 +72,11 @@ pkgs.vmTools.runInLinuxVM (
printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
${config.nix.package.out}/bin/nix-store --load-db --option build-users-group ""
- # Add missing size/hash fields to the database. FIXME:
- # exportReferencesGraph should provide these directly.
- ${config.nix.package.out}/bin/nix-store --verify --check-contents --option build-users-group ""
+ ${if fixValidity then ''
+ # Add missing size/hash fields to the database. FIXME:
+ # exportReferencesGraph should provide these directly.
+ ${config.nix.package.out}/bin/nix-store --verify --check-contents --option build-users-group ""
+ '' else ""}
# In case the bootloader tries to write to /dev/sda…
ln -s vda /dev/xvda
@@ -97,7 +100,9 @@ pkgs.vmTools.runInLinuxVM (
umount /mnt
- # Do a fsck to make sure resize2fs works.
- fsck.${fsType} -f -y $rootDisk
+ # Make sure resize2fs works
+ ${optionalString (fsType == "ext4") ''
+ tune2fs -c 0 -i 0 $rootDisk
+ ''}
''
)
diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix
index 3b640334e17..2baa4f66760 100644
--- a/nixos/lib/make-squashfs.nix
+++ b/nixos/lib/make-squashfs.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation {
# Generate the squashfs image.
mksquashfs nix-path-registration $storePaths $out \
- -keep-as-directory -all-root
+ -keep-as-directory -all-root -comp xz
'';
}
diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh
index e04455e889b..efb83d91428 100644
--- a/nixos/lib/make-system-tarball.sh
+++ b/nixos/lib/make-system-tarball.sh
@@ -52,9 +52,10 @@ $extraCommands
mkdir -p $out/tarball
-tar cvJf $out/tarball/$fileName.tar.xz * $extraArgs
+rm env-vars
+
+tar --sort=name --mtime='1970-01-01' -cvJf $out/tarball/$fileName.tar.xz * $extraArgs
mkdir -p $out/nix-support
echo $system > $out/nix-support/system
echo "file system-tarball $out/tarball/$fileName.tar.xz" > $out/nix-support/hydra-build-products
-
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index 1a243918c22..274b16164db 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -504,6 +504,31 @@ sub screenshot {
}, { image => $name } );
}
+# Get the text of TTY
+sub getTTYText {
+ my ($self, $tty) = @_;
+
+ my ($status, $out) = $self->execute("fold -w 80 /dev/vcs${tty}");
+ return $out;
+}
+
+# Wait until TTY's text matches a particular regular expression
+sub waitUntilTTYMatches {
+ my ($self, $tty, $regexp) = @_;
+
+ $self->nest("waiting for $regexp to appear on tty $tty", sub {
+ retry sub {
+ return 1 if $self->getTTYText($tty) =~ /$regexp/;
+ }
+ });
+}
+
+# Debugging: Dump the contents of the TTY
+sub dumpTTYContents {
+ my ($self, $tty) = @_;
+
+ $self->execute("fold -w 80 /dev/vcs${tty} | systemd-cat");
+}
# Take a screenshot and return the result as text using optical character
# recognition.
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 7fad5cbc3cd..c1cb5072aca 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -29,7 +29,7 @@ rec {
cp ${./test-driver/Logger.pm} $libDir/Logger.pm
wrapProgram $out/bin/nixos-test-driver \
- --prefix PATH : "${lib.makeBinPath [ qemu_kvm vde2 netpbm coreutils ]}" \
+ --prefix PATH : "${lib.makeBinPath [ qemu vde2 netpbm coreutils ]}" \
--prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl"
'';
};
@@ -93,7 +93,7 @@ rec {
vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);
- ocrProg = tesseract.override { enableLanguages = [ "eng" ]; };
+ ocrProg = tesseract;
# Generate onvenience wrappers for running the test driver
# interactively with the specified network, and for starting the
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index e26caa19164..0750a1b18c9 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -1,4 +1,8 @@
-#! /bin/sh -e
+#!/usr/bin/env nix-shell
+#! 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"
+
set -o pipefail
#set -x
@@ -15,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
@@ -57,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 770c3a03f9d..52ad1e714fb 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/gnu.nix b/nixos/modules/config/gnu.nix
index f8c35b440d1..ef48ccb7b4f 100644
--- a/nixos/modules/config/gnu.nix
+++ b/nixos/modules/config/gnu.nix
@@ -7,11 +7,11 @@ with lib;
gnu = mkOption {
type = types.bool;
default = false;
- description =
- '' When enabled, GNU software is chosen by default whenever a there is
- a choice between GNU and non-GNU software (e.g., GNU lsh
- vs. OpenSSH).
- '';
+ description = ''
+ When enabled, GNU software is chosen by default whenever a there is
+ a choice between GNU and non-GNU software (e.g., GNU lsh
+ vs. OpenSSH).
+ '';
};
};
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index e341931aacc..799f0793c74 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -44,8 +44,9 @@ 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
+ List of additional packages that provide console fonts, keymaps and
other resources.
'';
};
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index fdc782b0579..adc05f60231 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -84,6 +84,18 @@ in
'';
};
+ networking.timeServers = mkOption {
+ default = [
+ "0.nixos.pool.ntp.org"
+ "1.nixos.pool.ntp.org"
+ "2.nixos.pool.ntp.org"
+ "3.nixos.pool.ntp.org"
+ ];
+ description = ''
+ The set of NTP servers from which to synchronise.
+ '';
+ };
+
networking.proxy = {
default = lib.mkOption {
diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix
index f30136be44e..3f96cea2270 100644
--- a/nixos/modules/config/nsswitch.nix
+++ b/nixos/modules/config/nsswitch.nix
@@ -10,9 +10,21 @@ let
inherit (config.services.samba) nsswins;
ldap = (config.users.ldap.enable && config.users.ldap.nsswitch);
-in
+ hostArray = [ "files" "mymachines" ]
+ ++ optionals nssmdns [ "mdns_minimal [!UNAVAIL=return]" ]
+ ++ optionals nsswins [ "wins" ]
+ ++ [ "dns" ]
+ ++ optionals nssmdns [ "mdns" ]
+ ++ ["myhostname" ];
-{
+ passwdArray = [ "files" ]
+ ++ optionals ldap [ "ldap" ]
+ ++ [ "mymachines" ];
+
+ shadowArray = [ "files" ]
+ ++ optionals ldap [ "ldap" ];
+
+in {
options = {
# NSS modules. Hacky!
@@ -39,24 +51,26 @@ in
# Name Service Switch configuration file. Required by the C
# library. !!! Factor out the mdns stuff. The avahi module
# should define an option used by this module.
- environment.etc."nsswitch.conf".text =
- ''
- passwd: files ${optionalString ldap "ldap"}
- group: files ${optionalString ldap "ldap"}
- shadow: files ${optionalString ldap "ldap"}
- hosts: files ${optionalString nssmdns "mdns_minimal [NOTFOUND=return]"} dns ${optionalString nssmdns "mdns"} ${optionalString nsswins "wins"} myhostname mymachines
- networks: files dns
- ethers: files
- services: files
- protocols: files
- '';
+ environment.etc."nsswitch.conf".text = ''
+ passwd: ${concatStringsSep " " passwdArray}
+ group: ${concatStringsSep " " passwdArray}
+ shadow: ${concatStringsSep " " shadowArray}
+
+ hosts: ${concatStringsSep " " hostArray}
+ networks: files
+
+ ethers: files
+ services: files
+ protocols: files
+ rpc: files
+ '';
# Systemd provides nss-myhostname to ensure that our hostname
# always resolves to a valid IP address. It returns all locally
# configured IP addresses, or ::1 and 127.0.0.2 as
# fallbacks. Systemd also provides nss-mymachines to return IP
# addresses of local containers.
- system.nssModules = [ config.systemd.package ];
+ system.nssModules = [ config.systemd.package.out ];
};
}
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index 775d0c39c4f..3ac5f634c7a 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -118,6 +118,7 @@ in
"/share/terminfo"
"/share/themes"
"/share/vim-plugins"
+ "/share/vulkan"
];
system.path = pkgs.buildEnv {
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index bef500e30c0..c4fad9a6672 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -135,6 +135,12 @@ in
environment.sessionVariables.LD_LIBRARY_PATH =
[ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ];
+ environment.extraInit = ''
+ export XDG_DATA_DIRS=$XDG_DATA_DIRS:/run/opengl-driver/share
+ '' + optionalString cfg.driSupport32Bit ''
+ export XDG_DATA_DIRS=$XDG_DATA_DIRS:/run/opengl-driver-32/share
+ '';
+
hardware.opengl.package = mkDefault (makePackage pkgs);
hardware.opengl.package32 = mkDefault (makePackage pkgs_i686);
diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix
index 3723d7690dc..979810abf90 100644
--- a/nixos/modules/hardware/video/amdgpu-pro.nix
+++ b/nixos/modules/hardware/video/amdgpu-pro.nix
@@ -45,10 +45,8 @@ in
"amd/amdapfxx.blb".source = package + "/etc/amd/amdapfxx.blb";
"gbm/gbm.conf".source = package + "/etc/gbm/gbm.conf";
"OpenCL/vendors/amdocl64.icd".source = package + "/etc/OpenCL/vendors/amdocl64.icd";
- "vulkan/icd.d/amd_icd64.json".source = package + "/etc/vulkan/icd.d/amd_icd64.json";
} // optionalAttrs opengl.driSupport32Bit {
"OpenCL/vendors/amdocl32.icd".source = package32 + "/etc/OpenCL/vendors/amdocl32.icd";
- "vulkan/icd.d/amd_icd32.json".source = package32 + "/etc/vulkan/icd.d/amd_icd32.json";
};
};
diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix
index 69db518ab21..3ce97ad31c2 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 b5ee57d9e22..c44dff3bb60 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/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix
index 366591a8114..5908ff6cb94 100644
--- a/nixos/modules/installer/netboot/netboot.nix
+++ b/nixos/modules/installer/netboot/netboot.nix
@@ -26,11 +26,6 @@ with lib;
# here and it causes a cyclic dependency.
boot.loader.grub.enable = false;
- boot.initrd.postMountCommands = ''
- mkdir -p /mnt-root/nix/store
- mount -t squashfs /nix-store.squashfs /mnt-root/nix/store
- '';
-
# !!! Hack - attributes expected by other modules.
system.boot.loader.kernelFile = "bzImage";
environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ];
@@ -42,13 +37,34 @@ with lib;
options = [ "mode=0755" ];
};
+ # In stage 1, mount a tmpfs on top of /nix/store (the squashfs
+ # image) to make this a live CD.
+ fileSystems."/nix/.ro-store" =
+ { fsType = "squashfs";
+ device = "../nix-store.squashfs";
+ options = [ "loop" ];
+ neededForBoot = true;
+ };
+
+ fileSystems."/nix/.rw-store" =
+ { fsType = "tmpfs";
+ options = [ "mode=0755" ];
+ neededForBoot = true;
+ };
+
+ fileSystems."/nix/store" =
+ { fsType = "unionfs-fuse";
+ device = "unionfs";
+ options = [ "allow_other" "cow" "nonempty" "chroot=/mnt-root" "max_files=32768" "hide_meta_files" "dirs=/nix/.rw-store=rw:/nix/.ro-store=ro" ];
+ };
+
boot.initrd.availableKernelModules = [ "squashfs" ];
boot.initrd.kernelModules = [ "loop" ];
# Closures to be copied to the Nix store, namely the init
# script and the top-level system configuration directory.
- netboot.storeContents =
+ netboot.storeContents =
[ config.system.build.toplevel ];
# Create the squashfs image that contains the Nix store.
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 36700d2bf56..8e55a4f525f 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -126,9 +126,9 @@ targetHostCmd() {
copyToTarget() {
if ! [ "$targetHost" = "$buildHost" ]; then
if [ -z "$targetHost" ]; then
- NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --from "$buildHost" "$1"
+ NIX_SSHOPTS=$SSHOPTS nix-copy-closure --from "$buildHost" "$1"
elif [ -z "$buildHost" ]; then
- NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --to "$targetHost" "$1"
+ NIX_SSHOPTS=$SSHOPTS nix-copy-closure --to "$targetHost" "$1"
else
buildHostCmd nix-copy-closure --to "$targetHost" "$1"
fi
@@ -169,7 +169,7 @@ nixBuild() {
local drv="$(nix-instantiate "${instArgs[@]}" "${extraBuildFlags[@]}")"
if [ -a "$drv" ]; then
- NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --to "$buildHost" "$drv"
+ NIX_SSHOPTS=$SSHOPTS nix-copy-closure --to "$buildHost" "$drv"
buildHostCmd nix-store -r "$drv" "${buildArgs[@]}"
else
echo "nix-instantiate failed"
diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix
index 49ec0899610..5316cfce906 100644
--- a/nixos/modules/installer/virtualbox-demo.nix
+++ b/nixos/modules/installer/virtualbox-demo.nix
@@ -18,5 +18,5 @@ with lib;
# Add some more video drivers to give X11 a shot at working in
# VMware and QEMU.
- services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" ];
+ services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" "modesetting" ];
}
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 80a9a520e24..70705771183 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -58,7 +58,6 @@
#utmp = 29; # unused
ddclient = 30;
davfs2 = 31;
- privoxy = 32;
#disnix = 33; # unused
osgi = 34;
tor = 35;
@@ -84,7 +83,7 @@
spamd = 56;
#networkmanager = 57; # unused
nslcd = 58;
- #scanner = 59; # unused
+ scanner = 59;
nginx = 60;
chrony = 61;
#systemd-journal = 62; # unused
@@ -212,7 +211,6 @@
lambdabot = 191;
asterisk = 192;
plex = 193;
- bird = 195;
grafana = 196;
skydns = 197;
ripple-rest = 198;
@@ -279,6 +277,10 @@
hound = 259;
leaps = 260;
ipfs = 261;
+ stanchion = 262;
+ riak-cs = 263;
+ infinoted = 264;
+ keystone = 265;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@@ -319,7 +321,6 @@
utmp = 29;
#ddclient = 30; # unused
davfs2 = 31;
- privoxy = 32;
disnix = 33;
osgi = 34;
tor = 35;
@@ -469,7 +470,6 @@
#asterisk = 192; # unused
plex = 193;
sabnzbd = 194;
- bird = 195;
#grafana = 196; #unused
#skydns = 197; #unused
#ripple-rest = 198; #unused
@@ -528,6 +528,10 @@
hound = 259;
leaps = 260;
ipfs = 261;
+ stanchion = 262;
+ riak-cs = 263;
+ infinoted = 264;
+ keystone = 265;
# 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 8254ada3ddf..cd12fe4f9b3 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -133,9 +133,11 @@
./services/cluster/fleet.nix
./services/cluster/kubernetes.nix
./services/cluster/panamax.nix
+ ./services/computing/boinc/client.nix
./services/computing/torque/server.nix
./services/computing/torque/mom.nix
./services/computing/slurm/slurm.nix
+ ./services/continuous-integration/buildbot/master.nix
./services/continuous-integration/buildkite-agent.nix
./services/continuous-integration/hydra/default.nix
./services/continuous-integration/gitlab-runner.nix
@@ -159,6 +161,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
@@ -178,6 +182,7 @@
./services/desktops/telepathy.nix
./services/development/hoogle.nix
./services/editors/emacs.nix
+ ./services/editors/infinoted.nix
./services/games/factorio.nix
./services/games/ghost-one.nix
./services/games/minecraft-server.nix
@@ -346,6 +351,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
@@ -354,6 +360,7 @@
./services/networking/dnsmasq.nix
./services/networking/ejabberd.nix
./services/networking/fan.nix
+ ./services/networking/fakeroute.nix
./services/networking/ferm.nix
./services/networking/firefox/sync-server.nix
./services/networking/firewall.nix
@@ -478,6 +485,7 @@
./services/security/torify.nix
./services/security/tor.nix
./services/security/torsocks.nix
+ ./services/system/cgmanager.nix
./services/system/cloud-init.nix
./services/system/dbus.nix
./services/system/kerberos.nix
@@ -519,6 +527,7 @@
./services/x11/colord.nix
./services/x11/compton.nix
./services/x11/unclutter.nix
+ ./services/x11/unclutter-xfixes.nix
./services/x11/desktop-managers/default.nix
./services/x11/display-managers/auto.nix
./services/x11/display-managers/default.nix
@@ -539,7 +548,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
@@ -612,6 +620,7 @@
./virtualisation/docker.nix
./virtualisation/libvirtd.nix
./virtualisation/lxc.nix
+ ./virtualisation/lxcfs.nix
./virtualisation/lxd.nix
./virtualisation/amazon-options.nix
./virtualisation/openvswitch.nix
@@ -622,4 +631,5 @@
./virtualisation/vmware-guest.nix
./virtualisation/xen-dom0.nix
./virtualisation/xe-guest-utilities.nix
+ ./virtualisation/openstack/keystone.nix
]
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 32bea97823c..f90d0d992ec 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -7,7 +7,7 @@
# Include some utilities that are useful for installing or repairing
# the system.
environment.systemPackages = [
- pkgs.w3m # needed for the manual anyway
+ pkgs.w3m-nox # needed for the manual anyway
pkgs.testdisk # useful for repairing boot problems
pkgs.mssys # for writing Microsoft boot sectors / MBRs
pkgs.efibootmgr
@@ -42,8 +42,6 @@
# Some compression/archiver tools.
pkgs.unzip
pkgs.zip
- pkgs.dar # disk archiver
- pkgs.cabextract
];
# Include support for various filesystems.
diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix
index b047b706365..e2497d04252 100644
--- a/nixos/modules/profiles/minimal.nix
+++ b/nixos/modules/profiles/minimal.nix
@@ -14,4 +14,6 @@ with lib;
programs.man.enable = mkDefault false;
programs.info.enable = mkDefault false;
+
+ sound.enable = mkDefault false;
}
diff --git a/nixos/modules/programs/java.nix b/nixos/modules/programs/java.nix
index 3292aa369d2..d31698c3b39 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/mosh.nix b/nixos/modules/programs/mosh.nix
index b478f8e180f..1c29eddf01d 100644
--- a/nixos/modules/programs/mosh.nix
+++ b/nixos/modules/programs/mosh.nix
@@ -9,14 +9,14 @@ let
in
{
options.programs.mosh = {
- enable = mkOption {
- description = ''
- Whether to enable mosh. Note, this will open ports in your firewall!
- '';
- default = false;
- example = true;
- type = lib.types.bool;
- };
+ enable = mkOption {
+ description = ''
+ Whether to enable mosh. Note, this will open ports in your firewall!
+ '';
+ default = false;
+ example = true;
+ type = lib.types.bool;
+ };
};
config = mkIf cfg.enable {
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index b6fd9868f98..5f4d4dc9475 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 44e07f4618d..a89ce2c743d 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/acme.nix b/nixos/modules/security/acme.nix
index 12736e57b4a..726e5471141 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -178,6 +178,7 @@ in
path = [ pkgs.simp_le ];
preStart = ''
mkdir -p '${cfg.directory}'
+ chown '${data.user}:${data.group}' '${cfg.directory}'
if [ ! -d '${cpath}' ]; then
mkdir '${cpath}'
fi
diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml
index 226cf0382da..6fddb27e6a3 100644
--- a/nixos/modules/security/acme.xml
+++ b/nixos/modules/security/acme.xml
@@ -75,7 +75,7 @@ options for the security.acme module.
security.acme.certs."foo.example.com" = {
- webroot = "/var/www/challenges";
+ webroot = config.security.acme.directory + "/acme-challenge";
email = "foo@example.com";
user = "nginx";
group = "nginx";
diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix
index 0e3a54325ca..97e2d39dc07 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 53c2ace784e..3726b6c7818 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,19 +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.kernelPackages = mkForce 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")
- ];
+ boot.kernelParams = [ "grsec_sysfs_restrict=0" ]
+ ++ optional cfg.disableEfiRuntimeServices "noefi";
nixpkgs.config.grsecurity = true;
@@ -120,26 +110,63 @@ in
boot.kernel.sysctl = {
# Read-only under grsecurity
"kernel.kptr_restrict" = mkForce null;
+
+ # All grsec tunables default to off, those not enabled below are
+ # *disabled*. We use mkDefault to allow expert users to override
+ # our choices, but use mkForce where tunables would outright
+ # conflict with other settings.
+
+ # Enable all chroot restrictions by default (overwritten as
+ # necessary below)
+ "kernel.grsecurity.chroot_caps" = mkDefault 1;
+ "kernel.grsecurity.chroot_deny_bad_rename" = mkDefault 1;
+ "kernel.grsecurity.chroot_deny_chmod" = mkDefault 1;
+ "kernel.grsecurity.chroot_deny_chroot" = mkDefault 1;
+ "kernel.grsecurity.chroot_deny_fchdir" = mkDefault 1;
+ "kernel.grsecurity.chroot_deny_mknod" = mkDefault 1;
+ "kernel.grsecurity.chroot_deny_mount" = mkDefault 1;
+ "kernel.grsecurity.chroot_deny_pivot" = mkDefault 1;
+ "kernel.grsecurity.chroot_deny_shmat" = mkDefault 1;
+ "kernel.grsecurity.chroot_deny_sysctl" = mkDefault 1;
+ "kernel.grsecurity.chroot_deny_unix" = mkDefault 1;
+ "kernel.grsecurity.chroot_enforce_chdir" = mkDefault 1;
+ "kernel.grsecurity.chroot_findtask" = mkDefault 1;
+ "kernel.grsecurity.chroot_restrict_nice" = mkDefault 1;
+
+ # Enable various grsec protections
+ "kernel.grsecurity.consistent_setxid" = mkDefault 1;
+ "kernel.grsecurity.deter_bruteforce" = mkDefault 1;
+ "kernel.grsecurity.fifo_restrictions" = mkDefault 1;
+ "kernel.grsecurity.harden_ipc" = mkDefault 1;
+ "kernel.grsecurity.harden_ptrace" = mkDefault 1;
+ "kernel.grsecurity.harden_tty" = mkDefault 1;
+ "kernel.grsecurity.ip_blackhole" = mkDefault 1;
+ "kernel.grsecurity.linking_restrictions" = mkDefault 1;
+ "kernel.grsecurity.ptrace_readexec" = mkDefault 1;
+
+ # Enable auditing
+ "kernel.grsecurity.audit_ptrace" = mkDefault 1;
+ "kernel.grsecurity.forkfail_logging" = mkDefault 1;
+ "kernel.grsecurity.rwxmap_logging" = mkDefault 1;
+ "kernel.grsecurity.signal_logging" = mkDefault 1;
+ "kernel.grsecurity.timechange_logging" = mkDefault 1;
} // optionalAttrs config.nix.useSandbox {
# chroot(2) restrictions that conflict with sandboxed Nix builds
"kernel.grsecurity.chroot_caps" = mkForce 0;
+ "kernel.grsecurity.chroot_deny_chmod" = mkForce 0;
"kernel.grsecurity.chroot_deny_chroot" = mkForce 0;
"kernel.grsecurity.chroot_deny_mount" = mkForce 0;
"kernel.grsecurity.chroot_deny_pivot" = mkForce 0;
- "kernel.grsecurity.chroot_deny_chmod" = mkForce 0;
} // optionalAttrs containerSupportRequired {
# chroot(2) restrictions that conflict with NixOS lightweight containers
+ "kernel.grsecurity.chroot_caps" = mkForce 0;
"kernel.grsecurity.chroot_deny_chmod" = mkForce 0;
"kernel.grsecurity.chroot_deny_mount" = mkForce 0;
"kernel.grsecurity.chroot_restrict_nice" = mkForce 0;
- "kernel.grsecurity.chroot_caps" = mkForce 0;
+ # Disable privileged IO by default, unless X is enabled
+ } // optionalAttrs (!config.services.xserver.enable) {
+ "kernel.grsecurity.disable_priv_io" = mkDefault 1;
};
- 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 37314bdba8a..a7bcf4924f0 100644
--- a/nixos/modules/security/grsecurity.xml
+++ b/nixos/modules/security/grsecurity.xml
@@ -51,6 +51,13 @@
# nixos-rebuild boot
# reboot
+
+ Enabling the grsecurity module overrides
+ , to reduce the risk of
+ misconfiguration.
+ describes how to use a custom kernel package set.
+
+
For most users, further configuration should be unnecessary. All users
are encouraged to look over before
using the system, however. If you experience problems, please refer to
@@ -144,15 +151,8 @@
a TCP simultaneous OPEN on that port before the connection is actually
established.
- /sys hardening:
- breaks systemd.
-
Trusted path execution: a desirable feature, but
requires some more work to operate smoothly on NixOS.
-
- Module hardening: would break user initiated module
- loading. Might enable this at some point, depending on the potential
- breakage.
@@ -205,31 +205,42 @@
- To use a custom kernel with upstream's recommended settings for server
- deployments:
+ To build a custom kernel using upstream's recommended settings for server
+ deployments, while still using the NixOS module:
- boot.kernelPackages =
- let
- kernel = pkgs.linux_grsec_nixos.override {
- extraConfig = ''
- GRKERNSEC_CONFIG_AUTO y
- GRKERNSEC_CONFIG_SERVER y
- GRKERNSEC_CONFIG_SECURITY y
- '';
+ nixpkgs.config.packageOverrides = super: {
+ linux_grsec_nixos = super.linux_grsec_nixos.override {
+ extraConfig = ''
+ GRKERNSEC_CONFIG_AUTO y
+ GRKERNSEC_CONFIG_SERVER y
+ GRKERNSEC_CONFIG_SECURITY y
+ '';
};
- self = pkgs.linuxPackagesFor kernel self;
- in self;
+ }
+
+
+
The wikibook provides an exhaustive listing of
kernel configuration options.
- 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.
+
+ If not using the NixOS module, a custom grsecurity package set can
+ be specified inline instead, as in
+
+ boot.kernelPackages =
+ let
+ kernel = pkgs.linux_grsec_nixos.override {
+ extraConfig = /* as above */;
+ };
+ self = pkgs.linuxPackagesFor kernel self;
+ in self;
+
@@ -277,6 +288,10 @@
to override
this behavior.
+ User initiated autoloading of modules (e.g., when
+ using fuse or loop devices) is disallowed; either load requisite modules
+ as root or add them to.
+
Virtualization: KVM is the preferred virtualization
solution. Xen, Virtualbox, and VMWare are
unsupported and most likely require a custom kernel.
@@ -310,6 +325,19 @@
+
+ The gitlab service ()
+ requires a variant of the ruby interpreter
+ built without `mprotect()` hardening, as in
+
+ services.gitlab.packages.gitlab = pkgs.gitlab.override {
+ ruby = pkgs.ruby.overrideAttrs (attrs: {
+ postFixup = "paxmark m $out/bin/ruby";
+ });
+ };
+
+
+
@@ -332,13 +360,19 @@
pax_sanitize_slab={off|fast|full}: control kernel
- slab object sanitization
+ slab object sanitization. Defaults to fast
pax_size_overflow_report_only: log size overflow
violations but leave the violating task running
+
+
+ grsec_sysfs_restrict=[0|1]: toggle sysfs
+ restrictions. The NixOS module sets this to 0
+ for systemd compatibility
+
diff --git a/nixos/modules/security/hidepid.nix b/nixos/modules/security/hidepid.nix
index ee351eb8447..96443fda758 100644
--- a/nixos/modules/security/hidepid.nix
+++ b/nixos/modules/security/hidepid.nix
@@ -19,7 +19,9 @@ with lib;
config = mkIf config.security.hideProcessInformation {
users.groups.proc.gid = config.ids.gids.proc;
+ users.groups.proc.members = [ "polkituser" ];
boot.specialFileSystems."/proc".options = [ "hidepid=2" "gid=${toString config.ids.gids.proc}" ];
+ systemd.services.systemd-logind.serviceConfig.SupplementaryGroups = [ "proc" ];
};
}
diff --git a/nixos/modules/services/backup/crashplan.nix b/nixos/modules/services/backup/crashplan.nix
index 38cf8eb72fb..d0af2e416b6 100644
--- a/nixos/modules/services/backup/crashplan.nix
+++ b/nixos/modules/services/backup/crashplan.nix
@@ -49,7 +49,7 @@ with lib;
ensureDir ${crashplan.vardir}/backupArchives 700
ensureDir ${crashplan.vardir}/log 777
cp -avn ${crashplan}/conf.template/* ${crashplan.vardir}/conf
- for x in app.asar bin EULA.txt install.vars lang lib libjniwrap64.so libjniwrap.so libjtux64.so libjtux.so libmd564.so libmd5.so share skin upgrade; do
+ for x in app.asar bin install.vars lang lib libc42archive64.so libc52archive.so libjniwrap64.so libjniwrap.so libjtux64.so libjtux.so libleveldb64.so libleveldb.so libmd564.so libmd5.so share skin upgrade; do
rm -f ${crashplan.vardir}/$x;
ln -sf ${crashplan}/$x ${crashplan.vardir}/$x;
done
diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index 24892a2a59a..67112343c33 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/cluster/fleet.nix b/nixos/modules/services/cluster/fleet.nix
index 78d4ea93c49..ec03be39594 100644
--- a/nixos/modules/services/cluster/fleet.nix
+++ b/nixos/modules/services/cluster/fleet.nix
@@ -28,7 +28,7 @@ in {
etcdServers = mkOption {
type = types.listOf types.str;
- default = [ "http://127.0.0.1:4001" ];
+ default = [ "http://127.0.0.1:2379" ];
description = ''
Fleet list of etcd endpoints to use.
'';
diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix
index 4bdd7f95f77..fbf7412a6cd 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes.nix
@@ -5,28 +5,62 @@ with lib;
let
cfg = config.services.kubernetes;
+ skipAttrs = attrs: map (filterAttrs (k: v: k != "enable"))
+ (filter (v: !(hasAttr "enable" v) || v.enable) attrs);
+
+ infraContainer = pkgs.dockerTools.buildImage {
+ name = "pause";
+ tag = "latest";
+ contents = cfg.package.pause;
+ config.Cmd = "/bin/pause";
+ };
+
+ kubeconfig = pkgs.writeText "kubeconfig" (builtins.toJSON {
+ apiVersion = "v1";
+ kind = "Config";
+ clusters = [{
+ name = "local";
+ cluster.certificate-authority = cfg.kubeconfig.caFile;
+ cluster.server = cfg.kubeconfig.server;
+ }];
+ users = [{
+ name = "kubelet";
+ user = {
+ client-certificate = cfg.kubeconfig.certFile;
+ client-key = cfg.kubeconfig.keyFile;
+ };
+ }];
+ contexts = [{
+ context = {
+ cluster = "local";
+ user = "kubelet";
+ };
+ current-context = "kubelet-context";
+ }];
+ });
+
+ policyFile = pkgs.writeText "kube-policy"
+ concatStringsSep "\n" (map (builtins.toJSON cfg.apiserver.authorizationPolicy));
+
+ cniConfig = pkgs.buildEnv {
+ name = "kubernetes-cni-config";
+ paths = imap (i: entry:
+ pkgs.writeTextDir "${10+i}-${entry.type}.conf" (builtins.toJSON entry)
+ ) cfg.kubelet.cni.config;
+ };
+
+ manifests = pkgs.buildEnv {
+ name = "kubernetes-manifests";
+ paths = mapAttrsToList (name: manifest:
+ pkgs.writeTextDir "${name}.json" (builtins.toJSON manifest)
+ ) cfg.kubelet.manifests;
+ };
+
in {
###### interface
options.services.kubernetes = {
- package = mkOption {
- description = "Kubernetes package to use.";
- type = types.package;
- };
-
- verbose = mkOption {
- description = "Kubernetes enable verbose mode for debugging";
- default = false;
- type = types.bool;
- };
-
- etcdServers = mkOption {
- description = "Kubernetes list of etcd servers to watch.";
- default = [ "127.0.0.1:4001" ];
- type = types.listOf types.str;
- };
-
roles = mkOption {
description = ''
Kubernetes role that this machine should take.
@@ -38,18 +72,76 @@ in {
type = types.listOf (types.enum ["master" "node"]);
};
+ package = mkOption {
+ description = "Kubernetes package to use.";
+ type = types.package;
+ default = pkgs.kubernetes;
+ };
+
+ verbose = mkOption {
+ description = "Kubernetes enable verbose mode for debugging";
+ default = false;
+ type = types.bool;
+ };
+
+ etcd = {
+ servers = mkOption {
+ description = "List of etcd servers. By default etcd is started, except if this option is changed.";
+ default = ["http://127.0.0.1:2379"];
+ type = types.listOf types.str;
+ };
+
+ keyFile = mkOption {
+ description = "Etcd key file";
+ default = null;
+ type = types.nullOr types.path;
+ };
+
+ certFile = mkOption {
+ description = "Etcd cert file";
+ default = null;
+ type = types.nullOr types.path;
+ };
+
+ caFile = mkOption {
+ description = "Etcd ca file";
+ default = null;
+ type = types.nullOr types.path;
+ };
+ };
+
+ kubeconfig = {
+ server = mkOption {
+ description = "Kubernetes apiserver server address";
+ default = "http://${cfg.apiserver.address}:${toString cfg.apiserver.port}";
+ type = types.str;
+ };
+
+ caFile = mkOption {
+ description = "Certificate authrority file to use to connect to kuberentes apiserver";
+ type = types.nullOr types.path;
+ default = null;
+ };
+
+ certFile = mkOption {
+ description = "Client certificate file to use to connect to kubernetes";
+ type = types.nullOr types.path;
+ default = null;
+ };
+
+ keyFile = mkOption {
+ description = "Client key file to use to connect to kubernetes";
+ type = types.nullOr types.path;
+ default = null;
+ };
+ };
+
dataDir = mkOption {
description = "Kubernetes root directory for managing kubelet files.";
default = "/var/lib/kubernetes";
type = types.path;
};
- dockerCfg = mkOption {
- description = "Kubernetes contents of dockercfg file.";
- default = "";
- type = types.lines;
- };
-
apiserver = {
enable = mkOption {
description = "Whether to enable kubernetes apiserver.";
@@ -72,6 +164,16 @@ in {
type = types.str;
};
+ advertiseAddress = mkOption {
+ description = ''
+ Kubernetes apiserver IP address on which to advertise the apiserver
+ to members of the cluster. This address must be reachable by the rest
+ of the cluster.
+ '';
+ default = null;
+ type = types.nullOr types.str;
+ };
+
port = mkOption {
description = "Kubernetes apiserver listening port.";
default = 8080;
@@ -80,41 +182,36 @@ in {
securePort = mkOption {
description = "Kubernetes apiserver secure port.";
- default = 6443;
+ default = 443;
type = types.int;
};
tlsCertFile = mkOption {
description = "Kubernetes apiserver certificate file.";
- default = "";
- type = types.str;
+ default = null;
+ type = types.nullOr types.path;
};
- tlsPrivateKeyFile = mkOption {
+ tlsKeyFile = mkOption {
description = "Kubernetes apiserver private key file.";
- default = "";
- type = types.str;
+ default = null;
+ type = types.nullOr types.path;
};
clientCaFile = mkOption {
description = "Kubernetes apiserver CA file for client auth.";
- default = "";
- type = types.str;
+ default = null;
+ type = types.nullOr types.path;
};
tokenAuth = mkOption {
description = ''
Kubernetes apiserver token authentication file. See
-
+
'';
- default = {};
- example = literalExample ''
- {
- alice = "abc123";
- bob = "xyz987";
- }
- '';
- type = types.attrsOf types.str;
+ default = null;
+ example = ''token,user,uid,"group1,group2,group3"'';
+ type = types.nullOr types.lines;
};
authorizationMode = mkOption {
@@ -148,13 +245,13 @@ in {
allowPrivileged = mkOption {
description = "Whether to allow privileged containers on kubernetes.";
- default = false;
+ default = true;
type = types.bool;
};
portalNet = mkOption {
description = "Kubernetes CIDR notation IP range from which to assign portal IPs";
- default = "10.10.10.10/16";
+ default = "10.10.10.10/24";
type = types.str;
};
@@ -171,9 +268,9 @@ in {
admissionControl = mkOption {
description = ''
Kubernetes admission control plugins to use. See
-
+
'';
- default = ["AlwaysAdmit"];
+ default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota"];
example = [
"NamespaceLifecycle" "NamespaceExists" "LimitRanger"
"SecurityContextDeny" "ServiceAccount" "ResourceQuota"
@@ -181,15 +278,40 @@ in {
type = types.listOf types.str;
};
- serviceAccountKey = mkOption {
+ serviceAccountKeyFile = mkOption {
description = ''
Kubernetes apiserver PEM-encoded x509 RSA private or public key file,
- used to verify ServiceAccount tokens.
+ used to verify ServiceAccount tokens. By default tls private key file
+ is used.
'';
default = null;
type = types.nullOr types.path;
};
+ kubeletClientCaFile = mkOption {
+ description = "Path to a cert file for connecting to kubelet";
+ default = null;
+ type = types.nullOr types.path;
+ };
+
+ kubeletClientCertFile = mkOption {
+ description = "Client certificate to use for connections to kubelet";
+ default = null;
+ type = types.nullOr types.path;
+ };
+
+ kubeletClientKeyFile = mkOption {
+ description = "Key to use for connections to kubelet";
+ default = null;
+ type = types.nullOr types.path;
+ };
+
+ kubeletHttps = mkOption {
+ description = "Whether to use https for connections to kubelet";
+ default = true;
+ type = types.bool;
+ };
+
extraOpts = mkOption {
description = "Kubernetes apiserver extra command line options.";
default = "";
@@ -216,10 +338,10 @@ in {
type = types.int;
};
- master = mkOption {
- description = "Kubernetes apiserver address";
- default = "${cfg.apiserver.address}:${toString cfg.apiserver.port}";
- type = types.str;
+ leaderElect = mkOption {
+ description = "Whether to start leader election before executing main loop";
+ type = types.bool;
+ default = false;
};
extraOpts = mkOption {
@@ -248,13 +370,13 @@ in {
type = types.int;
};
- master = mkOption {
- description = "Kubernetes apiserver address";
- default = "${cfg.apiserver.address}:${toString cfg.apiserver.port}";
- type = types.str;
+ leaderElect = mkOption {
+ description = "Whether to start leader election before executing main loop";
+ type = types.bool;
+ default = false;
};
- serviceAccountPrivateKey = mkOption {
+ serviceAccountKeyFile = mkOption {
description = ''
Kubernetes controller manager PEM-encoded private RSA key file used to
sign service account tokens
@@ -272,6 +394,12 @@ in {
type = types.nullOr types.path;
};
+ clusterCidr = mkOption {
+ description = "Kubernetes controller manager CIDR Range for Pods in cluster";
+ default = "10.10.0.0/16";
+ type = types.str;
+ };
+
extraOpts = mkOption {
description = "Kubernetes controller manager extra command line options.";
default = "";
@@ -292,6 +420,12 @@ in {
type = types.bool;
};
+ registerSchedulable = mkOption {
+ description = "Register the node as schedulable. No-op if register-node is false.";
+ default = true;
+ type = types.bool;
+ };
+
address = mkOption {
description = "Kubernetes kubelet info server listening address.";
default = "0.0.0.0";
@@ -304,6 +438,18 @@ in {
type = types.int;
};
+ tlsCertFile = mkOption {
+ description = "File containing x509 Certificate for HTTPS.";
+ default = null;
+ type = types.nullOr types.path;
+ };
+
+ tlsKeyFile = mkOption {
+ description = "File containing x509 private key matching tlsCertFile.";
+ default = null;
+ type = types.nullOr types.path;
+ };
+
healthz = {
bind = mkOption {
description = "Kubernetes kubelet healthz listening address.";
@@ -326,19 +472,10 @@ in {
allowPrivileged = mkOption {
description = "Whether to allow kubernetes containers to request privileged mode.";
- default = false;
+ default = true;
type = types.bool;
};
- apiServers = mkOption {
- description = ''
- Kubernetes kubelet list of Kubernetes API servers for publishing events,
- and reading pods and services.
- '';
- default = ["${cfg.apiserver.address}:${toString cfg.apiserver.port}"];
- type = types.listOf types.str;
- };
-
cadvisorPort = mkOption {
description = "Kubernetes kubelet local cadvisor port.";
default = 4194;
@@ -347,16 +484,62 @@ in {
clusterDns = mkOption {
description = "Use alternative dns.";
- default = "";
+ default = "10.10.0.1";
type = types.str;
};
clusterDomain = mkOption {
description = "Use alternative domain.";
- default = "kubernetes.io";
+ default = "cluster.local";
type = types.str;
};
+ networkPlugin = mkOption {
+ description = "Network plugin to use by kubernetes";
+ type = types.nullOr (types.enum ["cni" "kubenet"]);
+ default = "kubenet";
+ };
+
+ cni = {
+ packages = mkOption {
+ description = "List of network plugin packages to install";
+ type = types.listOf types.package;
+ default = [];
+ };
+
+ config = mkOption {
+ description = "Kubernetes CNI configuration";
+ type = types.listOf types.attrs;
+ default = [];
+ example = literalExample ''
+ [{
+ "cniVersion": "0.2.0",
+ "name": "mynet",
+ "type": "bridge",
+ "bridge": "cni0",
+ "isGateway": true,
+ "ipMasq": true,
+ "ipam": {
+ "type": "host-local",
+ "subnet": "10.22.0.0/16",
+ "routes": [
+ { "dst": "0.0.0.0/0" }
+ ]
+ }
+ } {
+ "cniVersion": "0.2.0",
+ "type": "loopback"
+ }]
+ '';
+ };
+ };
+
+ manifests = mkOption {
+ description = "List of manifests to bootstrap with kubelet";
+ type = types.attrsOf types.attrs;
+ default = {};
+ };
+
extraOpts = mkOption {
description = "Kubernetes kubelet extra command line options.";
default = "";
@@ -377,12 +560,6 @@ in {
type = types.str;
};
- master = mkOption {
- description = "Kubernetes apiserver address";
- default = "${cfg.apiserver.address}:${toString cfg.apiserver.port}";
- type = types.str;
- };
-
extraOpts = mkOption {
description = "Kubernetes proxy extra command line options.";
default = "";
@@ -390,23 +567,23 @@ in {
};
};
- kube2sky = {
- enable = mkEnableOption "Whether to enable kube2sky dns service.";
+ dns = {
+ enable = mkEnableOption "kubernetes dns service.";
+
+ port = mkOption {
+ description = "Kubernetes dns listening port";
+ default = 53;
+ type = types.int;
+ };
domain = mkOption {
- description = "Kuberntes kube2sky domain under which all DNS names will be hosted.";
+ description = "Kuberntes dns domain under which to create names.";
default = cfg.kubelet.clusterDomain;
type = types.str;
};
- master = mkOption {
- description = "Kubernetes apiserver address";
- default = "${cfg.apiserver.address}:${toString cfg.apiserver.port}";
- type = types.str;
- };
-
extraOpts = mkOption {
- description = "Kubernetes kube2sky extra command line options.";
+ description = "Kubernetes dns extra command line options.";
default = "";
type = types.str;
};
@@ -416,50 +593,118 @@ in {
###### implementation
config = mkMerge [
+ (mkIf cfg.kubelet.enable {
+ systemd.services.kubelet = {
+ description = "Kubernetes Kubelet Service";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" "docker.service" "kube-apiserver.service" ];
+ path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables ];
+ preStart = ''
+ docker load < ${infraContainer}
+ rm /opt/cni/bin/* || true
+ ${concatMapStringsSep "\n" (p: "ln -fs ${p.plugins}/* /opt/cni/bin") cfg.kubelet.cni.packages}
+ '';
+ serviceConfig = {
+ ExecStart = ''${cfg.package}/bin/kubelet \
+ --pod-manifest-path=${manifests} \
+ --kubeconfig=${kubeconfig} \
+ --require-kubeconfig \
+ --address=${cfg.kubelet.address} \
+ --port=${toString cfg.kubelet.port} \
+ --register-node=${if cfg.kubelet.registerNode then "true" else "false"} \
+ --register-schedulable=${if cfg.kubelet.registerSchedulable then "true" else "false"} \
+ ${optionalString (cfg.kubelet.tlsCertFile != null)
+ "--tls-cert-file=${cfg.kubelet.tlsCertFile}"} \
+ ${optionalString (cfg.kubelet.tlsKeyFile != null)
+ "--tls-private-key-file=${cfg.kubelet.tlsKeyFile}"} \
+ --healthz-bind-address=${cfg.kubelet.healthz.bind} \
+ --healthz-port=${toString cfg.kubelet.healthz.port} \
+ --hostname-override=${cfg.kubelet.hostname} \
+ --allow-privileged=${if cfg.kubelet.allowPrivileged then "true" else "false"} \
+ --root-dir=${cfg.dataDir} \
+ --cadvisor_port=${toString cfg.kubelet.cadvisorPort} \
+ ${optionalString (cfg.kubelet.clusterDns != "")
+ "--cluster-dns=${cfg.kubelet.clusterDns}"} \
+ ${optionalString (cfg.kubelet.clusterDomain != "")
+ "--cluster-domain=${cfg.kubelet.clusterDomain}"} \
+ --pod-infra-container-image=pause \
+ ${optionalString (cfg.kubelet.networkPlugin != null)
+ "--network-plugin=${cfg.kubelet.networkPlugin}"} \
+ --cni-conf-dir=${cniConfig} \
+ --reconcile-cidr \
+ --hairpin-mode=hairpin-veth \
+ ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \
+ ${cfg.kubelet.extraOpts}
+ '';
+ WorkingDirectory = cfg.dataDir;
+ };
+ };
+
+ environment.etc = mapAttrs' (name: manifest:
+ nameValuePair "kubernetes/manifests/${name}.json" {
+ text = builtins.toJSON manifest;
+ mode = "0755";
+ }
+ ) cfg.kubelet.manifests;
+
+ # Allways include cni plugins
+ services.kubernetes.kubelet.cni.packages = [pkgs.cni];
+ })
+
(mkIf cfg.apiserver.enable {
systemd.services.kube-apiserver = {
- description = "Kubernetes Api Server";
+ description = "Kubernetes Kubelet Service";
wantedBy = [ "multi-user.target" ];
- requires = ["kubernetes-setup.service"];
- after = [ "network.target" "etcd.service" "kubernetes-setup.service" ];
+ after = [ "network.target" "docker.service" ];
serviceConfig = {
- ExecStart = let
- authorizationPolicyFile =
- pkgs.writeText "kubernetes-policy"
- (builtins.toJSON cfg.apiserver.authorizationPolicy);
- tokenAuthFile =
- pkgs.writeText "kubernetes-auth"
- (concatImapStringsSep "\n" (i: v: v + "," + (toString i))
- (mapAttrsToList (name: token: token + "," + name) cfg.apiserver.tokenAuth));
- in ''${cfg.package}/bin/kube-apiserver \
- --etcd-servers=${concatMapStringsSep "," (f: "http://${f}") cfg.etcdServers} \
- --insecure-bind-address=${cfg.apiserver.address} \
+ ExecStart = ''${cfg.package}/bin/kube-apiserver \
+ --etcd-servers=${concatStringsSep "," cfg.etcd.servers} \
+ ${optionalString (cfg.etcd.caFile != null)
+ "--etcd-cafile=${cfg.etcd.caFile}"} \
+ ${optionalString (cfg.etcd.certFile != null)
+ "--etcd-certfile=${cfg.etcd.certFile}"} \
+ ${optionalString (cfg.etcd.keyFile != null)
+ "--etcd-keyfile=${cfg.etcd.keyFile}"} \
--insecure-port=${toString cfg.apiserver.port} \
- --bind-address=${cfg.apiserver.publicAddress} \
+ --bind-address=0.0.0.0 \
+ ${optionalString (cfg.apiserver.advertiseAddress != null)
+ "--advertise-address=${cfg.apiserver.advertiseAddress}"} \
--allow-privileged=${if cfg.apiserver.allowPrivileged then "true" else "false"} \
- ${optionalString (cfg.apiserver.tlsCertFile!="")
+ ${optionalString (cfg.apiserver.tlsCertFile != null)
"--tls-cert-file=${cfg.apiserver.tlsCertFile}"} \
- ${optionalString (cfg.apiserver.tlsPrivateKeyFile!="")
- "--tls-private-key-file=${cfg.apiserver.tlsPrivateKeyFile}"} \
- ${optionalString (cfg.apiserver.tokenAuth!=[])
- "--token-auth-file=${tokenAuthFile}"} \
- ${optionalString (cfg.apiserver.clientCaFile!="")
+ ${optionalString (cfg.apiserver.tlsKeyFile != null)
+ "--tls-private-key-file=${cfg.apiserver.tlsKeyFile}"} \
+ ${optionalString (cfg.apiserver.tokenAuth != null)
+ "--token-auth-file=${cfg.apiserver.tokenAuth}"} \
+ --kubelet-https=${if cfg.apiserver.kubeletHttps then "true" else "false"} \
+ ${optionalString (cfg.apiserver.kubeletClientCaFile != null)
+ "--kubelet-certificate-authority=${cfg.apiserver.kubeletClientCaFile}"} \
+ ${optionalString (cfg.apiserver.kubeletClientCertFile != null)
+ "--kubelet-client-certificate=${cfg.apiserver.kubeletClientCertFile}"} \
+ ${optionalString (cfg.apiserver.kubeletClientKeyFile != null)
+ "--kubelet-client-key=${cfg.apiserver.kubeletClientKeyFile}"} \
+ ${optionalString (cfg.apiserver.clientCaFile != null)
"--client-ca-file=${cfg.apiserver.clientCaFile}"} \
--authorization-mode=${cfg.apiserver.authorizationMode} \
${optionalString (cfg.apiserver.authorizationMode == "ABAC")
- "--authorization-policy-file=${authorizationPolicyFile}"} \
+ "--authorization-policy-file=${policyFile}"} \
--secure-port=${toString cfg.apiserver.securePort} \
--service-cluster-ip-range=${cfg.apiserver.portalNet} \
- ${optionalString (cfg.apiserver.runtimeConfig!="")
+ ${optionalString (cfg.apiserver.runtimeConfig != "")
"--runtime-config=${cfg.apiserver.runtimeConfig}"} \
--admission_control=${concatStringsSep "," cfg.apiserver.admissionControl} \
- ${optionalString (cfg.apiserver.serviceAccountKey!=null)
- "--service-account-key-file=${cfg.apiserver.serviceAccountKey}"} \
- --logtostderr=true \
- ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \
+ ${optionalString (cfg.apiserver.serviceAccountKeyFile!=null)
+ "--service-account-key-file=${cfg.apiserver.serviceAccountKeyFile}"} \
+ ${optionalString cfg.verbose "--v=6"} \
+ ${optionalString cfg.verbose "--log-flush-frequency=1s"} \
${cfg.apiserver.extraOpts}
'';
+ WorkingDirectory = cfg.dataDir;
User = "kubernetes";
+ Group = "kubernetes";
+ AmbientCapabilities = "cap_net_bind_service";
+ Restart = "on-failure";
+ RestartSec = 5;
};
};
})
@@ -468,17 +713,20 @@ in {
systemd.services.kube-scheduler = {
description = "Kubernetes Scheduler Service";
wantedBy = [ "multi-user.target" ];
- after = [ "network.target" "kubernetes-apiserver.service" ];
+ after = [ "kube-apiserver.service" ];
serviceConfig = {
ExecStart = ''${cfg.package}/bin/kube-scheduler \
--address=${cfg.scheduler.address} \
--port=${toString cfg.scheduler.port} \
- --master=${cfg.scheduler.master} \
- --logtostderr=true \
- ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \
+ --leader-elect=${if cfg.scheduler.leaderElect then "true" else "false"} \
+ --kubeconfig=${kubeconfig} \
+ ${optionalString cfg.verbose "--v=6"} \
+ ${optionalString cfg.verbose "--log-flush-frequency=1s"} \
${cfg.scheduler.extraOpts}
'';
+ WorkingDirectory = cfg.dataDir;
User = "kubernetes";
+ Group = "kubernetes";
};
};
})
@@ -487,113 +735,94 @@ in {
systemd.services.kube-controller-manager = {
description = "Kubernetes Controller Manager Service";
wantedBy = [ "multi-user.target" ];
- after = [ "network.target" "kubernetes-apiserver.service" ];
+ after = [ "kube-apiserver.service" ];
serviceConfig = {
ExecStart = ''${cfg.package}/bin/kube-controller-manager \
--address=${cfg.controllerManager.address} \
--port=${toString cfg.controllerManager.port} \
- --master=${cfg.controllerManager.master} \
- ${optionalString (cfg.controllerManager.serviceAccountPrivateKey!=null)
- "--service-account-private-key-file=${cfg.controllerManager.serviceAccountPrivateKey}"} \
+ --kubeconfig=${kubeconfig} \
+ --leader-elect=${if cfg.controllerManager.leaderElect then "true" else "false"} \
+ ${if (cfg.controllerManager.serviceAccountKeyFile!=null)
+ then "--service-account-private-key-file=${cfg.controllerManager.serviceAccountKeyFile}"
+ else "--service-account-private-key-file=/var/run/kubernetes/apiserver.key"} \
${optionalString (cfg.controllerManager.rootCaFile!=null)
"--root-ca-file=${cfg.controllerManager.rootCaFile}"} \
- --logtostderr=true \
- ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \
+ ${optionalString (cfg.controllerManager.clusterCidr!=null)
+ "--cluster-cidr=${cfg.controllerManager.clusterCidr}"} \
+ --allocate-node-cidrs=true \
+ ${optionalString cfg.verbose "--v=6"} \
+ ${optionalString cfg.verbose "--log-flush-frequency=1s"} \
${cfg.controllerManager.extraOpts}
'';
+ WorkingDirectory = cfg.dataDir;
User = "kubernetes";
+ Group = "kubernetes";
};
};
})
- (mkIf cfg.kubelet.enable {
- systemd.services.kubelet = {
- description = "Kubernetes Kubelet Service";
- wantedBy = [ "multi-user.target" ];
- requires = ["kubernetes-setup.service"];
- after = [ "network.target" "etcd.service" "docker.service" "kubernetes-setup.service" ];
- path = [ pkgs.gitMinimal pkgs.openssh ];
- script = ''
- export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PATH"
- exec ${cfg.package}/bin/kubelet \
- --api-servers=${concatMapStringsSep "," (f: "http://${f}") cfg.kubelet.apiServers} \
- --register-node=${if cfg.kubelet.registerNode then "true" else "false"} \
- --address=${cfg.kubelet.address} \
- --port=${toString cfg.kubelet.port} \
- --healthz-bind-address=${cfg.kubelet.healthz.bind} \
- --healthz-port=${toString cfg.kubelet.healthz.port} \
- --hostname-override=${cfg.kubelet.hostname} \
- --allow-privileged=${if cfg.kubelet.allowPrivileged then "true" else "false"} \
- --root-dir=${cfg.dataDir} \
- --cadvisor_port=${toString cfg.kubelet.cadvisorPort} \
- ${optionalString (cfg.kubelet.clusterDns != "")
- ''--cluster-dns=${cfg.kubelet.clusterDns}''} \
- ${optionalString (cfg.kubelet.clusterDomain != "")
- ''--cluster-domain=${cfg.kubelet.clusterDomain}''} \
- --logtostderr=true \
- ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \
- ${cfg.kubelet.extraOpts}
- '';
- serviceConfig.WorkingDirectory = cfg.dataDir;
- };
- })
-
(mkIf cfg.proxy.enable {
systemd.services.kube-proxy = {
description = "Kubernetes Proxy Service";
wantedBy = [ "multi-user.target" ];
- after = [ "network.target" "etcd.service" ];
+ after = [ "kube-apiserver.service" ];
+ path = [pkgs.iptables];
serviceConfig = {
ExecStart = ''${cfg.package}/bin/kube-proxy \
- --master=${cfg.proxy.master} \
+ --kubeconfig=${kubeconfig} \
--bind-address=${cfg.proxy.address} \
- --logtostderr=true \
- ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \
- ${cfg.proxy.extraOpts}
+ ${optionalString cfg.verbose "--v=6"} \
+ ${optionalString cfg.verbose "--log-flush-frequency=1s"} \
+ ${cfg.controllerManager.extraOpts}
'';
- Restart = "always"; # Retry connection
- RestartSec = "5s";
+ WorkingDirectory = cfg.dataDir;
};
};
})
- (mkIf cfg.kube2sky.enable {
- systemd.services.kube2sky = {
- description = "Kubernetes Dns Bridge Service";
+ (mkIf cfg.dns.enable {
+ systemd.services.kube-dns = {
+ description = "Kubernetes Dns Service";
wantedBy = [ "multi-user.target" ];
- after = [ "network.target" "skydns.service" "etcd.service" "kubernetes-apiserver.service" ];
+ after = [ "kube-apiserver.service" ];
serviceConfig = {
- ExecStart = ''${cfg.package}/bin/kube2sky \
- -etcd-server=http://${head cfg.etcdServers} \
- -domain=${cfg.kube2sky.domain} \
- -kube_master_url=http://${cfg.kube2sky.master} \
- -logtostderr=true \
- ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \
- ${cfg.kube2sky.extraOpts}
+ ExecStart = ''${cfg.package}/bin/kube-dns \
+ --kubecfg-file=${kubeconfig} \
+ --dns-port=${toString cfg.dns.port} \
+ --domain=${cfg.dns.domain} \
+ ${optionalString cfg.verbose "--v=6"} \
+ ${optionalString cfg.verbose "--log-flush-frequency=1s"} \
+ ${cfg.dns.extraOpts}
'';
+ WorkingDirectory = cfg.dataDir;
User = "kubernetes";
+ Group = "kubernetes";
+ AmbientCapabilities = "cap_net_bind_service";
+ SendSIGHUP = true;
};
};
})
+ (mkIf cfg.kubelet.enable {
+ boot.kernelModules = ["br_netfilter"];
+ })
+
(mkIf (any (el: el == "master") cfg.roles) {
+ virtualisation.docker.enable = mkDefault true;
+ services.kubernetes.kubelet.enable = mkDefault true;
+ services.kubernetes.kubelet.allowPrivileged = mkDefault true;
services.kubernetes.apiserver.enable = mkDefault true;
services.kubernetes.scheduler.enable = mkDefault true;
services.kubernetes.controllerManager.enable = mkDefault true;
- services.kubernetes.kube2sky.enable = mkDefault true;
+ services.etcd.enable = mkDefault (cfg.etcd.servers == ["http://127.0.0.1:2379"]);
})
(mkIf (any (el: el == "node") cfg.roles) {
virtualisation.docker.enable = mkDefault true;
+ virtualisation.docker.logDriver = mkDefault "json-file";
services.kubernetes.kubelet.enable = mkDefault true;
services.kubernetes.proxy.enable = mkDefault true;
- })
-
- (mkIf (any (el: el == "node" || el == "master") cfg.roles) {
- services.etcd.enable = mkDefault true;
-
- services.skydns.enable = mkDefault true;
- services.skydns.domain = mkDefault cfg.kubelet.clusterDomain;
+ services.kubernetes.dns.enable = mkDefault true;
})
(mkIf (
@@ -601,24 +830,16 @@ in {
cfg.scheduler.enable ||
cfg.controllerManager.enable ||
cfg.kubelet.enable ||
- cfg.proxy.enable
+ cfg.proxy.enable ||
+ cfg.dns.enable
) {
- systemd.services.kubernetes-setup = {
- description = "Kubernetes setup.";
- serviceConfig.Type = "oneshot";
- script = ''
- mkdir -p /var/run/kubernetes
- chown kubernetes /var/lib/kubernetes
-
- rm ${cfg.dataDir}/.dockercfg || true
- ln -fs ${pkgs.writeText "kubernetes-dockercfg" cfg.dockerCfg} ${cfg.dataDir}/.dockercfg
- '';
- };
-
- services.kubernetes.package = mkDefault pkgs.kubernetes;
+ systemd.tmpfiles.rules = [
+ "d /opt/cni/bin 0755 root root -"
+ "d /var/run/kubernetes 0755 kubernetes kubernetes -"
+ "d /var/lib/kubernetes 0755 kubernetes kubernetes -"
+ ];
environment.systemPackages = [ cfg.package ];
-
users.extraUsers = singleton {
name = "kubernetes";
uid = config.ids.uids.kubernetes;
@@ -630,6 +851,5 @@ in {
};
users.extraGroups.kubernetes.gid = config.ids.gids.kubernetes;
})
-
];
}
diff --git a/nixos/modules/services/cluster/panamax.nix b/nixos/modules/services/cluster/panamax.nix
index b47ff744fc2..4475e8d8c24 100644
--- a/nixos/modules/services/cluster/panamax.nix
+++ b/nixos/modules/services/cluster/panamax.nix
@@ -46,7 +46,7 @@ in {
fleetctlEndpoint = mkOption {
type = types.str;
- default = "http://127.0.0.1:4001";
+ default = "http://127.0.0.1:2379";
description = ''
Panamax fleetctl endpoint.
'';
diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix
new file mode 100644
index 00000000000..91bd463732d
--- /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/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix
new file mode 100644
index 00000000000..a40be4f546e
--- /dev/null
+++ b/nixos/modules/services/continuous-integration/buildbot/master.nix
@@ -0,0 +1,250 @@
+# NixOS module for Buildbot continous integration server.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.buildbot-master;
+ escapeStr = s: escape ["'"] s;
+ masterCfg = pkgs.writeText "master.cfg" ''
+ from buildbot.plugins import *
+ factory = util.BuildFactory()
+ c = BuildmasterConfig = dict(
+ workers = [${concatStringsSep "," cfg.workers}],
+ protocols = { 'pb': {'port': ${cfg.bpPort} } },
+ title = '${escapeStr cfg.title}',
+ titleURL = '${escapeStr cfg.titleUrl}',
+ buildbotURL = '${escapeStr cfg.buildbotUrl}',
+ db = dict(db_url='${escapeStr cfg.dbUrl}'),
+ www = dict(port=${toString cfg.port}),
+ change_source = [ ${concatStringsSep "," cfg.changeSource} ],
+ schedulers = [ ${concatStringsSep "," cfg.schedulers} ],
+ builders = [ ${concatStringsSep "," cfg.builders} ],
+ status = [ ${concatStringsSep "," cfg.status} ],
+ )
+ for step in [ ${concatStringsSep "," cfg.factorySteps} ]:
+ factory.addStep(step)
+
+ ${cfg.extraConfig}
+ '';
+
+ configFile = if cfg.masterCfg == null then masterCfg else cfg.masterCfg;
+
+in {
+ options = {
+ services.buildbot-master = {
+
+ factorySteps = mkOption {
+ type = types.listOf types.str;
+ description = "Factory Steps";
+ default = [];
+ example = [
+ "steps.Git(repourl='git://github.com/buildbot/pyflakes.git', mode='incremental')"
+ "steps.ShellCommand(command=['trial', 'pyflakes'])"
+ ];
+ };
+
+ changeSource = mkOption {
+ type = types.listOf types.str;
+ description = "List of Change Sources.";
+ default = [];
+ example = [
+ "changes.GitPoller('git://github.com/buildbot/pyflakes.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)"
+ ];
+ };
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable the Buildbot continuous integration server.";
+ };
+
+ extraConfig = mkOption {
+ type = types.str;
+ description = "Extra configuration to append to master.cfg";
+ default = "";
+ };
+
+ masterCfg = mkOption {
+ type = with types; nullOr path;
+ description = ''
+ Optionally pass path to raw master.cfg file.
+ Other options in this configuration will be ignored.
+ '';
+ default = null;
+ example = literalExample ''
+ pkgs.writeText "master.cfg" "BuildmasterConfig = c = {}"
+ '';
+ };
+
+ schedulers = mkOption {
+ type = types.listOf types.str;
+ description = "List of Schedulers.";
+ default = [
+ "schedulers.SingleBranchScheduler(name='all', change_filter=util.ChangeFilter(branch='master'), treeStableTimer=None, builderNames=['runtests'])"
+ "schedulers.ForceScheduler(name='force',builderNames=['runtests'])"
+ ];
+ };
+
+ builders = mkOption {
+ type = types.listOf types.str;
+ description = "List of Builders.";
+ default = [
+ "util.BuilderConfig(name='runtests',workernames=['default-worker'],factory=factory)"
+ ];
+ };
+
+ workers = mkOption {
+ type = types.listOf types.str;
+ description = "List of Workers.";
+ default = [
+ "worker.Worker('default-worker', 'password')"
+ ];
+ example = [ "worker.LocalWorker('default-worker')" ];
+ };
+
+ status = mkOption {
+ default = [];
+ type = types.listOf types.str;
+ description = "List of status notification endpoints.";
+ };
+
+ user = mkOption {
+ default = "buildbot";
+ type = types.str;
+ description = "User the buildbot server should execute under.";
+ };
+
+ group = mkOption {
+ default = "buildbot";
+ type = types.str;
+ description = "Primary group of buildbot user.";
+ };
+
+ extraGroups = mkOption {
+ type = types.listOf types.str;
+ default = [ "nixbld" ];
+ description = "List of extra groups that the buildbot user should be a part of.";
+ };
+
+ home = mkOption {
+ default = "/home/buildbot";
+ type = types.path;
+ description = "Buildbot home directory.";
+ };
+
+ buildbotDir = mkOption {
+ default = "${cfg.home}/master";
+ type = types.path;
+ description = "Specifies the Buildbot directory.";
+ };
+
+ bpPort = mkOption {
+ default = "9989";
+ type = types.string;
+ example = "tcp:10000:interface=127.0.0.1";
+ description = "Port where the master will listen to Buildbot Worker.";
+ };
+
+ listenAddress = mkOption {
+ default = "0.0.0.0";
+ type = types.str;
+ description = "Specifies the bind address on which the buildbot HTTP interface listens.";
+ };
+
+ buildbotUrl = mkOption {
+ default = "http://localhost:8010/";
+ type = types.str;
+ description = "Specifies the Buildbot URL.";
+ };
+
+ title = mkOption {
+ default = "Buildbot";
+ type = types.str;
+ description = "Specifies the Buildbot Title.";
+ };
+
+ titleUrl = mkOption {
+ default = "Buildbot";
+ type = types.str;
+ description = "Specifies the Buildbot TitleURL.";
+ };
+
+ dbUrl = mkOption {
+ default = "sqlite:///state.sqlite";
+ type = types.str;
+ description = "Specifies the database connection string.";
+ };
+
+ port = mkOption {
+ default = 8010;
+ type = types.int;
+ description = "Specifies port number on which the buildbot HTTP interface listens.";
+ };
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.buildbot-ui;
+ description = ''
+ Package to use for buildbot.
+ buildbot-full is required in order to use local workers.
+ '';
+ example = pkgs.buildbot-full;
+ };
+
+ packages = mkOption {
+ default = [ ];
+ example = [ pkgs.git ];
+ type = types.listOf types.package;
+ description = "Packages to add to PATH for the buildbot process.";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ users.extraGroups = optional (cfg.group == "buildbot") {
+ name = "buildbot";
+ };
+
+ users.extraUsers = optional (cfg.user == "buildbot") {
+ name = "buildbot";
+ description = "buildbot user";
+ isNormalUser = true;
+ createHome = true;
+ home = cfg.home;
+ group = cfg.group;
+ extraGroups = cfg.extraGroups;
+ useDefaultShell = true;
+ };
+
+ systemd.services.buildbot-master = {
+ description = "Buildbot Continuous Integration Server";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ path = cfg.packages;
+
+ serviceConfig = {
+ Type = "forking";
+ User = cfg.user;
+ Group = cfg.group;
+ WorkingDirectory = cfg.home;
+ ExecStart = "${cfg.package}/bin/buildbot start ${cfg.buildbotDir}";
+ };
+
+ preStart = ''
+ mkdir -vp ${cfg.buildbotDir}
+ chown -c ${cfg.user}:${cfg.group} ${cfg.buildbotDir}
+ ln -sf ${configFile} ${cfg.buildbotDir}/master.cfg
+ ${cfg.package}/bin/buildbot create-master ${cfg.buildbotDir}
+ '';
+
+ postStart = ''
+ until [[ $(${pkgs.curl}/bin/curl -s --head -w '\n%{http_code}' http://localhost:${toString cfg.port} | tail -n1) =~ ^(200|403)$ ]]; do
+ sleep 1
+ done
+ '';
+ };
+ };
+
+}
diff --git a/nixos/modules/services/continuous-integration/gocd-agent/default.nix b/nixos/modules/services/continuous-integration/gocd-agent/default.nix
index d60b55e83d1..05adb18fbe9 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 4bb792055d2..07e00f17f1e 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/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index b1b3404add0..fa550f68b33 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -343,7 +343,7 @@ in
{ wantedBy = [ "multi-user.target" ];
requires = [ "hydra-init.service" ];
after = [ "hydra-init.service" "network.target" ];
- path = [ pkgs.nettools ];
+ path = [ cfg.package pkgs.nettools ];
environment = env;
serviceConfig =
{ ExecStart = "@${cfg.package}/bin/hydra-evaluator hydra-evaluator";
diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix
index ae0589b399e..d4d231456c5 100644
--- a/nixos/modules/services/databases/couchdb.nix
+++ b/nixos/modules/services/databases/couchdb.nix
@@ -162,7 +162,7 @@ in {
if [ "$(id -u)" = 0 ]; then
chown ${cfg.user}:${cfg.group} `dirname ${cfg.uriFile}`;
- (-f ${cfg.uriFile} && chown ${cfg.user}:${cfg.group} ${cfg.uriFile}) || true
+ (test -f ${cfg.uriFile} && chown ${cfg.user}:${cfg.group} ${cfg.uriFile}) || true
chown ${cfg.user}:${cfg.group} ${cfg.databaseDir}
chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir}
chown ${cfg.user}:${cfg.group} ${cfg.configFile}
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 1180531248f..fcf1f123cfb 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -52,9 +52,7 @@ in
package = mkOption {
type = types.package;
- default = pkgs.mysql;
- defaultText = "pkgs.mysql";
- example = literalExample "pkgs.mysql55";
+ example = literalExample "pkgs.mysql";
description = "
Which MySQL derivation to use.
";
diff --git a/nixos/modules/services/databases/riak-cs.nix b/nixos/modules/services/databases/riak-cs.nix
new file mode 100644
index 00000000000..198efc29222
--- /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 4477904f78c..e0ebf164aef 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 00000000000..f2dbb78b5c4
--- /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/desktops/profile-sync-daemon.nix b/nixos/modules/services/desktops/profile-sync-daemon.nix
index d66ecef2385..e3f74df3e57 100644
--- a/nixos/modules/services/desktops/profile-sync-daemon.nix
+++ b/nixos/modules/services/desktops/profile-sync-daemon.nix
@@ -86,6 +86,12 @@ in {
};
config = mkIf cfg.enable {
+ assertions = [
+ { assertion = cfg.users != [];
+ message = "services.psd.users must contain at least one user";
+ }
+ ];
+
systemd = {
services = {
psd = {
diff --git a/nixos/modules/services/editors/infinoted.nix b/nixos/modules/services/editors/infinoted.nix
new file mode 100644
index 00000000000..963147b18a0
--- /dev/null
+++ b/nixos/modules/services/editors/infinoted.nix
@@ -0,0 +1,158 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.infinoted;
+in {
+ options.services.infinoted = {
+ enable = mkEnableOption "infinoted";
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.libinfinity.override { daemon = true; };
+ defaultText = "pkgs.libinfinity.override { daemon = true; }";
+ description = ''
+ Package providing infinoted
+ '';
+ };
+
+ keyFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = ''
+ Private key to use for TLS
+ '';
+ };
+
+ certificateFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = ''
+ Server certificate to use for TLS
+ '';
+ };
+
+ certificateChain = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = ''
+ Chain of CA-certificates to which our `certificateFile` is relative.
+ Optional for TLS.
+ '';
+ };
+
+ securityPolicy = mkOption {
+ type = types.enum ["no-tls" "allow-tls" "require-tls"];
+ default = "require-tls";
+ description = ''
+ How strictly to enforce clients connection with TLS.
+ '';
+ };
+
+ port = mkOption {
+ type = types.int;
+ default = 6523;
+ description = ''
+ Port to listen on
+ '';
+ };
+
+ rootDirectory = mkOption {
+ type = types.path;
+ default = "/var/lib/infinoted/documents/";
+ description = ''
+ Root of the directory structure to serve
+ '';
+ };
+
+ plugins = mkOption {
+ type = types.listOf types.str;
+ default = [ "note-text" "note-chat" "logging" "autosave" ];
+ description = ''
+ Plugins to enable
+ '';
+ };
+
+ passwordFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = ''
+ File to read server-wide password from
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = ''
+ [autosave]
+ interval=10
+ '';
+ description = ''
+ Additional configuration to append to infinoted.conf
+ '';
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = "infinoted";
+ description = ''
+ What to call the dedicated user under which infinoted is run
+ '';
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = "infinoted";
+ description = ''
+ What to call the primary group of the dedicated user under which infinoted is run
+ '';
+ };
+ };
+
+ config = mkIf (cfg.enable) {
+ users.extraUsers = optional (cfg.user == "infinoted")
+ { name = "infinoted";
+ description = "Infinoted user";
+ group = cfg.group;
+ };
+ users.extraGroups = optional (cfg.group == "infinoted")
+ { name = "infinoted";
+ };
+
+ systemd.services.infinoted =
+ { description = "Gobby Dedicated Server";
+
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+
+ serviceConfig = {
+ Type = "simple";
+ Restart = "always";
+ ExecStart = "${cfg.package}/bin/infinoted-0.6 --config-file=/var/lib/infinoted/infinoted.conf";
+ User = cfg.user;
+ Group = cfg.group;
+ PermissionsStartOnly = true;
+ };
+ preStart = ''
+ mkdir -p /var/lib/infinoted
+ install -o ${cfg.user} -g ${cfg.group} -m 0600 /dev/null /var/lib/infinoted/infinoted.conf
+ cat >>/var/lib/infinoted/infinoted.conf <.wld) which should be loaded.
@@ -126,8 +126,8 @@ in
User = "terraria";
Type = "oneshot";
RemainAfterExit = true;
- ExecStart = "${pkgs.tmux.bin}/bin/tmux -S /var/lib/terraria/terraria.sock new -d ${pkgs.terraria-server}/bin/TerrariaServer ${concatStringsSep " " flags}";
- ExecStop = "${pkgs.tmux.bin}/bin/tmux -S /var/lib/terraria/terraria.sock send-keys Enter \"exit\" Enter";
+ ExecStart = "${getBin pkgs.tmux}/bin/tmux -S /var/lib/terraria/terraria.sock new -d ${pkgs.terraria-server}/bin/TerrariaServer ${concatStringsSep " " flags}";
+ ExecStop = "${getBin pkgs.tmux}/bin/tmux -S /var/lib/terraria/terraria.sock send-keys Enter \"exit\" Enter";
};
postStart = ''
diff --git a/nixos/modules/services/hardware/brltty.nix b/nixos/modules/services/hardware/brltty.nix
index b416ba33222..1266e8f81e5 100644
--- a/nixos/modules/services/hardware/brltty.nix
+++ b/nixos/modules/services/hardware/brltty.nix
@@ -39,6 +39,8 @@ in {
ProtectSystem = "full";
SystemCallArchitectures = "native";
};
+ wants = [ "systemd-udev-settle.service" ];
+ after = [ "local-fs.target" "systemd-udev-settle.service" ];
before = [ "sysinit.target" ];
wantedBy = [ "sysinit.target" ];
};
diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix
index a3403740312..8ddb9ef9c53 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/logging/syslogd.nix b/nixos/modules/services/logging/syslogd.nix
index a0f8e89fa69..fe0b0490811 100644
--- a/nixos/modules/services/logging/syslogd.nix
+++ b/nixos/modules/services/logging/syslogd.nix
@@ -100,6 +100,12 @@ in
config = mkIf cfg.enable {
+ assertions =
+ [ { assertion = !config.services.rsyslogd.enable;
+ message = "rsyslogd conflicts with syslogd";
+ }
+ ];
+
environment.systemPackages = [ pkgs.sysklogd ];
services.syslogd.extraParams = optional cfg.enableNetworkInput "-r";
diff --git a/nixos/modules/services/mail/postsrsd.nix b/nixos/modules/services/mail/postsrsd.nix
index 68a4c101206..a1af16ec9ac 100644
--- a/nixos/modules/services/mail/postsrsd.nix
+++ b/nixos/modules/services/mail/postsrsd.nix
@@ -20,17 +20,29 @@ in {
description = "Whether to enable the postsrsd SRS server for Postfix.";
};
- domain = mkOption {
- type = types.str;
- description = "Domain name for rewrite";
- };
-
secretsFile = mkOption {
type = types.path;
default = "/var/lib/postsrsd/postsrsd.secret";
description = "Secret keys used for signing and verification";
};
+ domain = mkOption {
+ type = types.str;
+ description = "Domain name for rewrite";
+ };
+
+ separator = mkOption {
+ type = types.enum ["-" "=" "+"];
+ default = "=";
+ description = "First separator character in generated addresses";
+ };
+
+ # bindAddress = mkOption { # uncomment once 1.5 is released
+ # type = types.str;
+ # default = "127.0.0.1";
+ # description = "Socket listen address";
+ # };
+
forwardPort = mkOption {
type = types.int;
default = 10001;
@@ -43,6 +55,18 @@ in {
description = "Port for the reverse SRS lookup";
};
+ timeout = mkOption {
+ type = types.int;
+ default = 1800;
+ description = "Timeout for idle client connections in seconds";
+ };
+
+ excludeDomains = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = "Origin domains to exclude from rewriting in addition to primary domain";
+ };
+
user = mkOption {
type = types.str;
default = "postsrsd";
@@ -86,7 +110,7 @@ in {
path = [ pkgs.coreutils ];
serviceConfig = {
- ExecStart = ''${pkgs.postsrsd}/sbin/postsrsd "-s${cfg.secretsFile}" "-d${cfg.domain}" -f${toString cfg.forwardPort} -r${toString cfg.reversePort}'';
+ ExecStart = ''${pkgs.postsrsd}/sbin/postsrsd "-s${cfg.secretsFile}" "-d${cfg.domain}" -a${cfg.separator} -f${toString cfg.forwardPort} -r${toString cfg.reversePort} -t${toString cfg.timeout} "-X${concatStringsSep "," cfg.excludeDomains}"'';
User = cfg.user;
Group = cfg.group;
PermissionsStartOnly = true;
diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix
index e27b38bc0e2..8f18b929c11 100644
--- a/nixos/modules/services/mail/rmilter.nix
+++ b/nixos/modules/services/mail/rmilter.nix
@@ -203,7 +203,7 @@ milter_default_action = accept
PermissionsStartOnly = true;
Restart = "always";
RuntimeDirectory = "rmilter";
- RuntimeDirectoryPermissions="0755";
+ RuntimeDirectoryMode = "0755";
};
};
diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix
index 24dca15dd91..7e3b6431a13 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 e5a125ad324..e96645c79c7 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 3e4584c7a51..1fc3a5cc869 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";
};
@@ -425,7 +428,7 @@ in {
TimeoutSec = "300";
Restart = "on-failure";
WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab";
- ExecStart="${cfg.packages.gitlab.env}/bin/bundle exec \"sidekiq -q post_receive -q mailers -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e production -P ${cfg.statePath}/tmp/sidekiq.pid\"";
+ ExecStart="${cfg.packages.gitlab.env}/bin/bundle exec \"sidekiq -C \"${cfg.packages.gitlab}/share/gitlab/config/sidekiq_queues.yml\" -e production -P ${cfg.statePath}/tmp/sidekiq.pid\"";
};
};
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index 277fc9a3902..4a1bea50c14 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -59,7 +59,12 @@ uploads_path: "/var/lib/matrix-synapse/uploads"
max_upload_size: "${cfg.max_upload_size}"
max_image_pixels: "${cfg.max_image_pixels}"
dynamic_thumbnails: ${fromBool cfg.dynamic_thumbnails}
-url_preview_enabled: False
+url_preview_enabled: ${fromBool cfg.url_preview_enabled}
+${optionalString (cfg.url_preview_enabled == true) ''
+url_preview_ip_range_blacklist: ${builtins.toJSON cfg.url_preview_ip_range_blacklist}
+url_preview_ip_range_whitelist: ${builtins.toJSON cfg.url_preview_ip_range_whitelist}
+url_preview_url_blacklist: ${builtins.toJSON cfg.url_preview_url_blacklist}
+''}
recaptcha_private_key: "${cfg.recaptcha_private_key}"
recaptcha_public_key: "${cfg.recaptcha_public_key}"
enable_registration_captcha: ${fromBool cfg.enable_registration_captcha}
@@ -355,6 +360,47 @@ in {
default = "10K";
description = "Number of events to cache in memory.";
};
+ url_preview_enabled = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Is the preview URL API enabled? If enabled, you *must* specify an
+ explicit url_preview_ip_range_blacklist of IPs that the spider is
+ denied from accessing.
+ '';
+ };
+ url_preview_ip_range_blacklist = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = ''
+ List of IP address CIDR ranges that the URL preview spider is denied
+ from accessing.
+ '';
+ };
+ url_preview_ip_range_whitelist = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = ''
+ List of IP address CIDR ranges that the URL preview spider is allowed
+ to access even if they are specified in
+ url_preview_ip_range_blacklist.
+ '';
+ };
+ url_preview_url_blacklist = mkOption {
+ type = types.listOf types.str;
+ default = [
+ "127.0.0.0/8"
+ "10.0.0.0/8"
+ "172.16.0.0/12"
+ "192.168.0.0/16"
+ "100.64.0.0/10"
+ "169.254.0.0/16"
+ ];
+ description = ''
+ Optional list of URL matches that the URL preview spider is
+ denied from accessing.
+ '';
+ };
recaptcha_private_key = mkOption {
type = types.str;
default = "";
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 333782d15bc..e2bbd4b01aa 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -172,8 +172,8 @@ in
sshKey = "/root/.ssh/id_buildfarm";
system = "x86_64-linux";
maxJobs = 2;
- supportedFeatures = "kvm";
- mandatoryFeatures = "perf";
+ supportedFeatures = [ "kvm" ];
+ mandatoryFeatures = [ "perf" ];
}
];
description = ''
diff --git a/nixos/modules/services/misc/parsoid.nix b/nixos/modules/services/misc/parsoid.nix
index ab1b5406877..ae3f84333d2 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/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix
index 3c3d83c66ed..641da60e9ad 100644
--- a/nixos/modules/services/monitoring/collectd.nix
+++ b/nixos/modules/services/monitoring/collectd.nix
@@ -9,7 +9,7 @@ let
BaseDir "${cfg.dataDir}"
PIDFile "${cfg.pidFile}"
AutoLoadPlugin ${if cfg.autoLoadPlugin then "true" else "false"}
- Hostname ${config.networking.hostName}
+ Hostname "${config.networking.hostName}"
LoadPlugin syslog
@@ -108,7 +108,8 @@ in {
};
preStart = ''
- mkdir -m 0700 -p ${cfg.dataDir}
+ mkdir -p ${cfg.dataDir}
+ chmod 755 ${cfg.dataDir}
install -D /dev/null ${cfg.pidFile}
if [ "$(id -u)" = 0 ]; then
chown -R ${cfg.user} ${cfg.dataDir};
diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index 82b97bd92f8..d692dd5fc79 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -25,9 +25,16 @@ let
scrape_configs = cfg.scrapeConfigs;
};
+ generatedPrometheusYml = writePrettyJSON "prometheus.yml" promConfig;
+
+ prometheusYml =
+ if cfg.configText != null then
+ pkgs.writeText "prometheus.yml" cfg.configText
+ else generatedPrometheusYml;
+
cmdlineArgs = cfg.extraFlags ++ [
"-storage.local.path=${cfg.dataDir}/metrics"
- "-config.file=${writePrettyJSON "prometheus.yml" promConfig}"
+ "-config.file=${prometheusYml}"
"-web.listen-address=${cfg.listenAddress}"
"-alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}"
"-alertmanager.timeout=${toString cfg.alertmanagerTimeout}s"
@@ -359,6 +366,16 @@ in {
'';
};
+ configText = mkOption {
+ type = types.nullOr types.lines;
+ default = null;
+ description = ''
+ If non-null, this option defines the text that is written to
+ prometheus.yml. If null, the contents of prometheus.yml is generated
+ from the structured config options.
+ '';
+ };
+
globalConfig = mkOption {
type = promTypes.globalConfig;
default = {};
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index c26a7073703..104b5b92620 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -47,6 +47,18 @@ in
'';
};
+ gatewayAddress = mkOption {
+ type = types.str;
+ default = "/ip4/127.0.0.1/tcp/8080";
+ description = "Where the IPFS Gateway can be reached";
+ };
+
+ apiAddress = mkOption {
+ type = types.str;
+ default = "/ip4/127.0.0.1/tcp/5001";
+ description = "Where IPFS exposes its API to";
+ };
+
enableGC = mkOption {
type = types.bool;
default = false;
@@ -98,6 +110,8 @@ in
cd ${cfg.dataDir}
${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c "${ipfs}/bin/ipfs init"
fi
+ ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c "${ipfs}/bin/ipfs config Addresses.API ${cfg.apiAddress}"
+ ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c "${ipfs}/bin/ipfs config Addresses.Gateway ${cfg.gatewayAddress}"
'';
serviceConfig = {
diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix
index f1846b96325..ab9eac3829f 100644
--- a/nixos/modules/services/network-filesystems/tahoe.nix
+++ b/nixos/modules/services/network-filesystems/tahoe.nix
@@ -138,6 +138,45 @@ in
'';
};
helper.enable = mkEnableOption "helper service";
+ sftpd.enable = mkEnableOption "SFTP service";
+ sftpd.port = mkOption {
+ default = null;
+ type = types.nullOr types.int;
+ description = ''
+ The port on which the SFTP server will listen.
+
+ This is the correct setting to tweak if you want Tahoe's SFTP
+ daemon to listen on a different port.
+ '';
+ };
+ sftpd.hostPublicKeyFile = mkOption {
+ default = null;
+ type = types.nullOr types.path;
+ description = ''
+ Path to the SSH host public key.
+ '';
+ };
+ sftpd.hostPrivateKeyFile = mkOption {
+ default = null;
+ type = types.nullOr types.path;
+ description = ''
+ Path to the SSH host private key.
+ '';
+ };
+ sftpd.accounts.file = mkOption {
+ default = null;
+ type = types.nullOr types.path;
+ description = ''
+ Path to the accounts file.
+ '';
+ };
+ sftpd.accounts.url = mkOption {
+ default = null;
+ type = types.nullOr types.str;
+ description = ''
+ URL of the accounts server.
+ '';
+ };
package = mkOption {
default = pkgs.tahoelafs;
defaultText = "pkgs.tahoelafs";
@@ -194,6 +233,12 @@ in
serviceConfig = {
Type = "simple";
PIDFile = pidfile;
+ # Believe it or not, Tahoe is very brittle about the order of
+ # arguments to $(tahoe start). The node directory must come first,
+ # and arguments which alter Twisted's behavior come afterwards.
+ ExecStart = ''
+ ${settings.package}/bin/tahoe start ${nodedir} -n -l- --pidfile=${pidfile}
+ '';
};
preStart = ''
if [ \! -d ${nodedir} ]; then
@@ -209,12 +254,6 @@ in
# ln -s /etc/tahoe-lafs/introducer-${node}.cfg ${nodedir}/tahoe.cfg
cp /etc/tahoe-lafs/introducer-${node}.cfg ${nodedir}/tahoe.cfg
'';
- # Believe it or not, Tahoe is very brittle about the order of
- # arguments to $(tahoe start). The node directory must come first,
- # and arguments which alter Twisted's behavior come afterwards.
- script = ''
- tahoe start ${nodedir} -n -l- --pidfile=${pidfile}
- '';
});
users.extraUsers = flip mapAttrs' cfg.introducers (node: _:
nameValuePair "tahoe.introducer-${node}" {
@@ -256,6 +295,19 @@ in
[helper]
enabled = ${if settings.helper.enable then "true" else "false"}
+
+ [sftpd]
+ enabled = ${if settings.sftpd.enable then "true" else "false"}
+ ${optionalString (settings.sftpd.port != null)
+ "port = ${toString settings.sftpd.port}"}
+ ${optionalString (settings.sftpd.hostPublicKeyFile != null)
+ "host_pubkey_file = ${settings.sftpd.hostPublicKeyFile}"}
+ ${optionalString (settings.sftpd.hostPrivateKeyFile != null)
+ "host_privkey_file = ${settings.sftpd.hostPrivateKeyFile}"}
+ ${optionalString (settings.sftpd.accounts.file != null)
+ "accounts.file = ${settings.sftpd.accounts.file}"}
+ ${optionalString (settings.sftpd.accounts.url != null)
+ "accounts.url = ${settings.sftpd.accounts.url}"}
'';
});
# Actually require Tahoe, so that we will have it installed.
@@ -281,6 +333,12 @@ in
serviceConfig = {
Type = "simple";
PIDFile = pidfile;
+ # Believe it or not, Tahoe is very brittle about the order of
+ # arguments to $(tahoe start). The node directory must come first,
+ # and arguments which alter Twisted's behavior come afterwards.
+ ExecStart = ''
+ ${settings.package}/bin/tahoe start ${nodedir} -n -l- --pidfile=${pidfile}
+ '';
};
preStart = ''
if [ \! -d ${nodedir} ]; then
@@ -296,12 +354,6 @@ in
# ln -s /etc/tahoe-lafs/${node}.cfg ${nodedir}/tahoe.cfg
cp /etc/tahoe-lafs/${node}.cfg ${nodedir}/tahoe.cfg
'';
- # Believe it or not, Tahoe is very brittle about the order of
- # arguments to $(tahoe start). The node directory must come first,
- # and arguments which alter Twisted's behavior come afterwards.
- script = ''
- tahoe start ${nodedir} -n -l- --pidfile=${pidfile}
- '';
});
users.extraUsers = flip mapAttrs' cfg.nodes (node: _:
nameValuePair "tahoe.${node}" {
diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix
index 982b6ca5ea7..4de20664133 100644
--- a/nixos/modules/services/network-filesystems/yandex-disk.nix
+++ b/nixos/modules/services/network-filesystems/yandex-disk.nix
@@ -55,6 +55,15 @@ in
description = "The directory to use for Yandex.Disk storage";
};
+ excludes = mkOption {
+ default = "";
+ type = types.string;
+ example = "data,backup";
+ description = ''
+ Comma-separated list of directories which are excluded from synchronization.
+ '';
+ };
+
};
};
@@ -86,7 +95,7 @@ in
chown ${u} ${dir}
if ! test -d "${cfg.directory}" ; then
- mkdir -p -m 755 ${cfg.directory} ||
+ (mkdir -p -m 755 ${cfg.directory} && chown ${u} ${cfg.directory}) ||
exit 1
fi
@@ -94,7 +103,7 @@ in
-c '${pkgs.yandex-disk}/bin/yandex-disk token -p ${cfg.password} ${cfg.username} ${dir}/token'
${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${u} \
- -c '${pkgs.yandex-disk}/bin/yandex-disk start --no-daemon -a ${dir}/token -d ${cfg.directory}'
+ -c '${pkgs.yandex-disk}/bin/yandex-disk start --no-daemon -a ${dir}/token -d ${cfg.directory} --exclude-dirs=${cfg.excludes}'
'';
};
diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix
index e76cdac14ca..174354c9eb4 100644
--- a/nixos/modules/services/networking/bird.nix
+++ b/nixos/modules/services/networking/bird.nix
@@ -1,76 +1,68 @@
{ config, lib, pkgs, ... }:
let
- inherit (lib) mkEnableOption mkIf mkOption singleton types;
- inherit (pkgs) bird;
- cfg = config.services.bird;
+ inherit (lib) mkEnableOption mkIf mkOption types;
- configFile = pkgs.writeText "bird.conf" ''
- ${cfg.config}
- '';
-in
-
-{
-
- ###### interface
-
- options = {
-
- services.bird = {
-
- enable = mkEnableOption "BIRD Internet Routing Daemon";
-
- config = mkOption {
- type = types.string;
- description = ''
- BIRD Internet Routing Daemon configuration file.
-
+ generic = variant:
+ let
+ cfg = config.services.${variant};
+ pkg = pkgs.${variant};
+ birdc = if variant == "bird6" then "birdc6" else "birdc";
+ configFile = pkgs.stdenv.mkDerivation {
+ name = "${variant}.conf";
+ text = cfg.config;
+ preferLocalBuild = true;
+ buildCommand = ''
+ echo -n "$text" > $out
+ ${pkg}/bin/${variant} -d -p -c $out
'';
};
-
- user = mkOption {
- type = types.string;
- default = "bird";
- description = ''
- BIRD Internet Routing Daemon user.
- '';
+ in {
+ ###### interface
+ options = {
+ services.${variant} = {
+ enable = mkEnableOption "BIRD Internet Routing Daemon";
+ config = mkOption {
+ type = types.lines;
+ description = ''
+ BIRD Internet Routing Daemon configuration file.
+
+ '';
+ };
+ };
};
- group = mkOption {
- type = types.string;
- default = "bird";
- description = ''
- BIRD Internet Routing Daemon group.
- '';
- };
-
- };
-
- };
-
-
- ###### implementation
-
- config = mkIf cfg.enable {
-
- users.extraUsers = singleton {
- name = cfg.user;
- description = "BIRD Internet Routing Daemon user";
- uid = config.ids.uids.bird;
- group = cfg.group;
- };
-
- users.extraGroups = singleton {
- name = cfg.group;
- gid = config.ids.gids.bird;
- };
-
- systemd.services.bird = {
- description = "BIRD Internet Routing Daemon";
- wantedBy = [ "multi-user.target" ];
- serviceConfig = {
- ExecStart = "${bird}/bin/bird -d -c ${configFile} -s /var/run/bird.ctl -u ${cfg.user} -g ${cfg.group}";
+ ###### implementation
+ config = mkIf cfg.enable {
+ systemd.services.${variant} = {
+ description = "BIRD Internet Routing Daemon";
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ Type = "forking";
+ Restart = "on-failure";
+ ExecStart = "${pkg}/bin/${variant} -c ${configFile} -u ${variant} -g ${variant}";
+ ExecReload = "${pkg}/bin/${birdc} configure";
+ ExecStop = "${pkg}/bin/${birdc} down";
+ CapabilityBoundingSet = [ "CAP_CHOWN" "CAP_FOWNER" "CAP_DAC_OVERRIDE" "CAP_SETUID" "CAP_SETGID"
+ # see bird/sysdep/linux/syspriv.h
+ "CAP_NET_BIND_SERVICE" "CAP_NET_BROADCAST" "CAP_NET_ADMIN" "CAP_NET_RAW" ];
+ ProtectSystem = "full";
+ ProtectHome = "yes";
+ SystemCallFilter="~@cpu-emulation @debug @keyring @module @mount @obsolete @raw-io";
+ MemoryDenyWriteExecute = "yes";
+ };
+ };
+ users = {
+ extraUsers.${variant} = {
+ description = "BIRD Internet Routing Daemon user";
+ group = "${variant}";
+ };
+ extraGroups.${variant} = {};
+ };
};
};
- };
+
+ inherit (config.services) bird bird6;
+in {
+ imports = [(generic "bird") (generic "bird6")];
}
diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix
index d40865ebbd5..f2ff11633b1 100644
--- a/nixos/modules/services/networking/chrony.nix
+++ b/nixos/modules/services/networking/chrony.nix
@@ -31,7 +31,7 @@ in
};
servers = mkOption {
- default = config.services.ntp.servers;
+ default = config.networking.timeServers;
description = ''
The set of NTP servers from which to synchronise.
'';
@@ -102,7 +102,7 @@ in
home = stateDir;
};
- systemd.services.ntpd.enable = mkForce false;
+ systemd.services.timesyncd.enable = mkForce false;
systemd.services.chronyd =
{ description = "chrony NTP daemon";
diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 7e981183353..0dd028997f4 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";
};
};
@@ -207,8 +198,9 @@ in
systemd.services.cjdns = {
description = "cjdns: routing engine designed for security, scalability, speed and ease of use";
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" "sleep.target"];
+ after = [ "network-online.target" ];
+ bindsTo = [ "network-online.target" ];
preStart = if cfg.confFile != null then "" else ''
[ -e /etc/cjdns.keys ] && source /etc/cjdns.keys
@@ -244,7 +236,9 @@ in
serviceConfig = {
Type = "forking";
- Restart = "on-failure";
+ Restart = "always";
+ StartLimitInterval = 0;
+ RestartSec = 1;
CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW";
AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_RAW";
ProtectSystem = "full";
@@ -254,8 +248,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 00000000000..a9a77f3412a
--- /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.nullOr 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/fakeroute.nix b/nixos/modules/services/networking/fakeroute.nix
new file mode 100644
index 00000000000..82a9fb729d8
--- /dev/null
+++ b/nixos/modules/services/networking/fakeroute.nix
@@ -0,0 +1,63 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.fakeroute;
+ routeConf = pkgs.writeText "route.conf" (concatStringsSep "\n" cfg.route);
+
+in
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.fakeroute = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable the fakeroute service.
+ '';
+ };
+
+ route = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = [
+ "216.102.187.130"
+ "4.0.1.122"
+ "198.116.142.34"
+ "63.199.8.242"
+ ];
+ description = ''
+ Fake route that will appear after the real
+ one to any host running a traceroute.
+ '';
+ };
+
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+ systemd.services.fakeroute = {
+ description = "Fakeroute Daemon";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ Type = "forking";
+ User = "root";
+ ExecStart = "${pkgs.fakeroute}/bin/fakeroute -f ${routeConf}";
+ };
+ };
+
+ };
+
+}
diff --git a/nixos/modules/services/networking/ferm.nix b/nixos/modules/services/networking/ferm.nix
index 6271e82541f..8933e166f59 100644
--- a/nixos/modules/services/networking/ferm.nix
+++ b/nixos/modules/services/networking/ferm.nix
@@ -51,6 +51,7 @@ in {
before = [ "network-pre.target" ];
wants = [ "network-pre.target" ];
wantedBy = [ "multi-user.target" ];
+ reloadIfChanged = true;
serviceConfig = {
Type="oneshot";
RemainAfterExit = "yes";
diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix
index 28b6c4f657d..ca47a18bc1f 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 51f95af4802..fd4545e88e2 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 dca8ccac762..7eebecb23b0 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 6af1dd73643..481e267f6c3 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -118,8 +118,8 @@ let
'';
yesOrNo = b: if b then "yes" else "no";
- maybeString = prefix: x: if x == null then "" else ''${prefix} "${s}"'';
- maybeToString = prefix: x: if x == null then "" else ''${prefix} ${toString s}'';
+ maybeString = prefix: x: if x == null then "" else ''${prefix} "${x}"'';
+ maybeToString = prefix: x: if x == null then "" else ''${prefix} ${toString x}'';
forEach = pre: l: concatMapStrings (x: pre + x + "\n") l;
@@ -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/ntpd.nix b/nixos/modules/services/networking/ntpd.nix
index c8a08567928..88e6dbf22b9 100644
--- a/nixos/modules/services/networking/ntpd.nix
+++ b/nixos/modules/services/networking/ntpd.nix
@@ -34,7 +34,7 @@ in
services.ntp = {
enable = mkOption {
- default = !config.boot.isContainer;
+ default = false;
description = ''
Whether to synchronise your machine's time using the NTP
protocol.
@@ -42,12 +42,7 @@ in
};
servers = mkOption {
- default = [
- "0.nixos.pool.ntp.org"
- "1.nixos.pool.ntp.org"
- "2.nixos.pool.ntp.org"
- "3.nixos.pool.ntp.org"
- ];
+ default = config.networking.timeServers;
description = ''
The set of NTP servers from which to synchronise.
'';
@@ -70,6 +65,7 @@ in
# Make tools such as ntpq available in the system path.
environment.systemPackages = [ pkgs.ntp ];
+ services.timesyncd.enable = mkForce false;
users.extraUsers = singleton
{ name = ntpUser;
diff --git a/nixos/modules/services/networking/openfire.nix b/nixos/modules/services/networking/openfire.nix
index 454b504eda2..4059eb3db83 100644
--- a/nixos/modules/services/networking/openfire.nix
+++ b/nixos/modules/services/networking/openfire.nix
@@ -34,7 +34,7 @@ with lib;
assertions = singleton
{ assertion = !(config.services.openfire.usePostgreSQL -> config.services.postgresql.enable);
- message = "OpenFire assertion failed.";
+ message = "OpenFire configured to use PostgreSQL but services.postgresql.enable is not enabled.";
};
systemd.services.openfire = {
diff --git a/nixos/modules/services/networking/openntpd.nix b/nixos/modules/services/networking/openntpd.nix
index a8625fa2fa9..13a1b5258ce 100644
--- a/nixos/modules/services/networking/openntpd.nix
+++ b/nixos/modules/services/networking/openntpd.nix
@@ -49,7 +49,7 @@ in
###### implementation
config = mkIf cfg.enable {
- services.ntp.enable = mkForce false;
+ services.timesyncd.enable = mkForce false;
# Add ntpctl to the environment for status checking
environment.systemPackages = [ package ];
diff --git a/nixos/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix
index 94beb78ef5a..49ca839a2c3 100644
--- a/nixos/modules/services/networking/privoxy.nix
+++ b/nixos/modules/services/networking/privoxy.nix
@@ -6,8 +6,6 @@ let
inherit (pkgs) privoxy;
- privoxyUser = "privoxy";
-
cfg = config.services.privoxy;
confFile = pkgs.writeText "privoxy.conf" ''
@@ -88,18 +86,25 @@ in
###### implementation
config = mkIf cfg.enable {
-
- users.extraUsers = singleton
- { name = privoxyUser;
- uid = config.ids.uids.privoxy;
- description = "Privoxy daemon user";
- };
+
+ users.users.privoxy = {
+ isSystemUser = true;
+ home = "/var/empty";
+ group = "privoxy";
+ };
+
+ users.groups.privoxy = {};
systemd.services.privoxy = {
description = "Filtering web proxy";
after = [ "network.target" "nss-lookup.target" ];
wantedBy = [ "multi-user.target" ];
- serviceConfig.ExecStart = "${privoxy}/sbin/privoxy --no-daemon --user ${privoxyUser} ${confFile}";
+ serviceConfig.ExecStart = "${privoxy}/bin/privoxy --no-daemon --user privoxy ${confFile}";
+
+ serviceConfig.PrivateDevices = true;
+ serviceConfig.PrivateTmp = true;
+ serviceConfig.ProtectHome = true;
+ serviceConfig.ProtectSystem = "full";
};
};
diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix
index 3f0906fdb80..edcc12170b2 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/skydns.nix b/nixos/modules/services/networking/skydns.nix
index ba913482e3c..6ad18bb2240 100644
--- a/nixos/modules/services/networking/skydns.nix
+++ b/nixos/modules/services/networking/skydns.nix
@@ -11,7 +11,7 @@ in {
etcd = {
machines = mkOption {
- default = [ "http://localhost:4001" ];
+ default = [ "http://127.0.0.1:2379" ];
type = types.listOf types.str;
description = "Skydns list of etcd endpoints to connect to.";
};
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 81941ce1cfb..073391ffdbb 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/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 35918e42b40..368d89e2e32 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -31,18 +31,22 @@ let
default = null;
example = "rVXs/Ni9tu3oDBLS4hOyAUAa1qTWVA3loR8eL20os3I=";
type = with types; nullOr str;
- description = ''base64 preshared key generated by wg genpsk. Optional,
- and may be omitted. This option adds an additional layer of
- symmetric-key cryptography to be mixed into the already existing
- public-key cryptography, for post-quantum resistance.'';
+ description = ''
+ base64 preshared key generated by wg genpsk. Optional,
+ and may be omitted. This option adds an additional layer of
+ symmetric-key cryptography to be mixed into the already existing
+ public-key cryptography, for post-quantum resistance.
+ '';
};
listenPort = mkOption {
default = null;
type = with types; nullOr int;
example = 51820;
- description = ''16-bit port for listening. Optional; if not specified,
- automatically generated based on interface name.'';
+ description = ''
+ 16-bit port for listening. Optional; if not specified,
+ automatically generated based on interface name.
+ '';
};
preSetup = mkOption {
@@ -51,8 +55,9 @@ let
''];
default = [];
type = with types; listOf str;
- description = ''A list of commands called at the start of the interface
- setup.'';
+ description = ''
+ A list of commands called at the start of the interface setup.
+ '';
};
postSetup = mkOption {
@@ -151,7 +156,8 @@ let
nameValuePair "wireguard-${name}"
{
description = "WireGuard Tunnel - ${name}";
- wantedBy = [ "ip-up.target" ];
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 368d7ac761a..3041dccfd15 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -75,7 +75,7 @@ let
'') cfg.listenAddresses}
Listen /var/run/cups/cups.sock
- SetEnv PATH ${bindir}/lib/cups/filter:${bindir}/bin
+ SetEnv PATH /var/lib/cups/path/lib/cups/filter:/var/lib/cups/path/bin
DefaultShared ${if cfg.defaultShared then "Yes" else "No"}
@@ -310,6 +310,13 @@ in
for i in *; do
[ ! -e "/var/lib/cups/$i" ] && ln -s "${rootdir}/etc/cups/$i" "/var/lib/cups/$i"
done
+
+ #update path reference
+ [ -L /var/lib/cups/path ] && \
+ rm /var/lib/cups/path
+ [ ! -e /var/lib/cups/path ] && \
+ ln -s ${bindir} /var/lib/cups/path
+
${optionalString cfg.gutenprint ''
if [ -d /var/lib/cups/ppd ]; then
${gutenprint}/bin/cups-genppdupdate -p /var/lib/cups/ppd
diff --git a/nixos/modules/services/search/hound.nix b/nixos/modules/services/search/hound.nix
index 1226cba682e..a94a851e80e 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 e4e5c1253b7..b045e140546 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.override { freshclamConf = cfg.updater.config; };
+
+ 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/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix
index 22e3bb0066c..716ae7a2d2f 100644
--- a/nixos/modules/services/security/fail2ban.nix
+++ b/nixos/modules/services/security/fail2ban.nix
@@ -143,7 +143,7 @@ in
services.fail2ban.jails.ssh-iptables =
''
filter = sshd
- action = iptables[name=SSH, port=ssh, protocol=tcp]
+ action = iptables-multiport[name=SSH, port="${concatMapStringsSep "," (p: toString p) config.services.openssh.ports}", protocol=tcp]
maxretry = 5
'';
diff --git a/nixos/modules/services/system/cgmanager.nix b/nixos/modules/services/system/cgmanager.nix
new file mode 100644
index 00000000000..59d3deced86
--- /dev/null
+++ b/nixos/modules/services/system/cgmanager.nix
@@ -0,0 +1,27 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.cgmanager;
+in {
+ meta.maintainers = [ maintainers.mic92 ];
+
+ ###### interface
+ options.services.cgmanager.enable = mkEnableOption "cgmanager";
+
+ ###### implementation
+ config = mkIf cfg.enable {
+ systemd.services.cgmanager = {
+ wantedBy = [ "multi-user.target" ];
+ after = [ "local-fs.target" ];
+ description = "Cgroup management daemon";
+ restartIfChanged = false;
+ serviceConfig = {
+ ExecStart = "${pkgs.cgmanager}/bin/cgmanager -m name=systemd";
+ KillMode = "process";
+ Restart = "on-failure";
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/torrent/opentracker.nix b/nixos/modules/services/torrent/opentracker.nix
index d86b9fea2d7..74f443381d9 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 7de9480d4c4..d19e4bc5827 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/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 397857ea085..2d71bcc0c79 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -16,7 +16,17 @@ let
phpMajorVersion = head (splitString "." php.version);
- getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80;
+ defaultListen = cfg: if cfg.enableSSL
+ then [{ip = "*"; port = 443;}]
+ else [{ip = "*"; port = 80;}];
+
+ getListen = cfg:
+ let list = (lib.optional (cfg.port != 0) {ip = "*"; port = cfg.port;}) ++ cfg.listen;
+ in if list == []
+ then defaultListen cfg
+ else list;
+
+ listenToString = l: "${l.ip}:${toString l.port}";
extraModules = attrByPath ["extraModules"] [] mainCfg;
extraForeignModules = filter isAttrs extraModules;
@@ -25,10 +35,13 @@ let
makeServerInfo = cfg: {
# Canonical name must not include a trailing slash.
- canonicalName =
- (if cfg.enableSSL then "https" else "http") + "://" +
- cfg.hostName +
- (if getPort cfg != (if cfg.enableSSL then 443 else 80) then ":${toString (getPort cfg)}" else "");
+ canonicalNames =
+ let defaultPort = (head (defaultListen cfg)).port; in
+ map (port:
+ (if cfg.enableSSL then "https" else "http") + "://" +
+ cfg.hostName +
+ (if port != defaultPort then ":${toString port}" else "")
+ ) (map (x: x.port) (getListen cfg));
# Admin address: inherit from the main server if not specified for
# a virtual host.
@@ -224,7 +237,7 @@ let
++ (map (svc: svc.robotsEntries) subservices)));
in ''
- ServerName ${serverInfo.canonicalName}
+ ${concatStringsSep "\n" (map (n: "ServerName ${n}") serverInfo.canonicalNames)}
${concatMapStrings (alias: "ServerAlias ${alias}\n") cfg.serverAliases}
@@ -326,9 +339,10 @@ let
${let
- ports = map getPort allHosts;
- uniquePorts = uniqList {inputList = ports;};
- in concatMapStrings (port: "Listen ${toString port}\n") uniquePorts
+ listen = concatMap getListen allHosts;
+ toStr = listen: "Listen ${listenToString listen}\n";
+ uniqueListen = uniqList {inputList = map toStr listen;};
+ in concatStrings uniqueListen
}
User ${mainCfg.user}
@@ -382,15 +396,15 @@ let
# Always enable virtual hosts; it doesn't seem to hurt.
${let
- ports = map getPort allHosts;
- uniquePorts = uniqList {inputList = ports;};
- directives = concatMapStrings (port: "NameVirtualHost *:${toString port}\n") uniquePorts;
+ listen = concatMap getListen allHosts;
+ uniqueListen = uniqList {inputList = listen;};
+ directives = concatMapStrings (listen: "NameVirtualHost ${listenToString listen}\n") uniqueListen;
in optionalString (!version24) directives
}
${let
makeVirtualHost = vhost: ''
-
+
${perServerConf false vhost}
'';
@@ -628,6 +642,8 @@ in
message = "SSL is enabled for httpd, but sslServerCert and/or sslServerKey haven't been specified."; }
];
+ warnings = map (cfg: ''apache-httpd's port option is deprecated. Use listen = [{/*ip = "*"; */ port = ${toString cfg.port}";}]; instead'' ) (lib.filter (cfg: cfg.port != 0) allHosts);
+
users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") (singleton
{ name = "wwwrun";
group = mainCfg.group;
@@ -712,5 +728,4 @@ in
};
};
-
}
diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
index 5abcc5e7490..1d53ce65900 100644
--- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
@@ -28,9 +28,30 @@ with lib;
type = types.int;
default = 0;
description = ''
- Port for the server. 0 means use the default port: 80 for http
- and 443 for https (i.e. when enableSSL is set).
+ Port for the server. Option will be removed, use instead.
+ '';
+ };
+
+ listen = mkOption {
+ type = types.listOf (types.submodule (
+ {
+ options = {
+ port = mkOption {
+ type = types.int;
+ description = "port to listen on";
+ };
+ ip = mkOption {
+ type = types.string;
+ default = "*";
+ description = "Ip to listen on. 0.0.0.0 for ipv4 only, * for all.";
+ };
+ };
+ } ));
+ description = ''
+ List of { /* ip: "*"; */ port = 80;} to listen on
'';
+
+ default = [];
};
enableSSL = mkOption {
diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix
index 56f077e62a8..14596bb3add 100644
--- a/nixos/modules/services/web-servers/uwsgi.nix
+++ b/nixos/modules/services/web-servers/uwsgi.nix
@@ -29,7 +29,6 @@ let
pythonPackages = pkgs.pythonPackages.override {
inherit python;
- self = pythonPackages;
};
penv = python.buildEnv.override {
diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix
index bda4eec0102..7cbca1dcddf 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 bc010d1ce1c..9b51b92faa4 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/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix
index d13b7352c95..89ad2882363 100644
--- a/nixos/modules/services/x11/desktop-managers/lxqt.nix
+++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix
@@ -4,6 +4,14 @@ with lib;
let
+ # Remove packages of ys from xs, based on their names
+ removePackagesByName = xs: ys:
+ let
+ pkgName = drv: (builtins.parseDrvName drv.name).name;
+ ysNames = map pkgName ys;
+ in
+ filter (x: !(builtins.elem (pkgName x) ysNames)) xs;
+
xcfg = config.services.xserver;
cfg = xcfg.desktopManager.lxqt;
@@ -18,59 +26,31 @@ in
description = "Enable the LXQt desktop manager";
};
- };
+ environment.lxqt.excludePackages = mkOption {
+ default = [];
+ example = literalExample "[ pkgs.lxqt.qterminal ]";
+ type = types.listOf types.package;
+ description = "Which LXQt packages to exclude from the default environment";
+ };
+ };
config = mkIf (xcfg.enable && cfg.enable) {
services.xserver.desktopManager.session = singleton {
name = "lxqt";
+ bgSupport = true;
start = ''
exec ${pkgs.lxqt.lxqt-common}/bin/startlxqt
'';
};
- environment.systemPackages = [
- pkgs.kde5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel
- pkgs.kde5.libkscreen # provides plugins for screen management software
- pkgs.kde5.oxygen-icons5 # default icon theme
- pkgs.libfm
- pkgs.libfm-extra
- pkgs.lxmenu-data
- pkgs.lxqt.compton-conf
- pkgs.lxqt.libfm-qt
- pkgs.lxqt.liblxqt
- pkgs.lxqt.libqtxdg
- pkgs.lxqt.libsysstat
- pkgs.lxqt.lximage-qt
- pkgs.lxqt.lxqt-about
- pkgs.lxqt.lxqt-admin
- pkgs.lxqt.lxqt-common
- pkgs.lxqt.lxqt-config
- pkgs.lxqt.lxqt-globalkeys
- pkgs.lxqt.lxqt-l10n
- pkgs.lxqt.lxqt-notificationd
- pkgs.lxqt.lxqt-openssh-askpass
- pkgs.lxqt.lxqt-panel
- pkgs.lxqt.lxqt-policykit
- pkgs.lxqt.lxqt-powermanagement
- pkgs.lxqt.lxqt-qtplugin
- pkgs.lxqt.lxqt-runner
- pkgs.lxqt.lxqt-session
- pkgs.lxqt.lxqt-sudo
- pkgs.lxqt.obconf-qt
- pkgs.lxqt.pavucontrol-qt
- pkgs.lxqt.pcmanfm-qt
- pkgs.lxqt.qlipper
- pkgs.lxqt.qps
- pkgs.lxqt.qterminal
- pkgs.lxqt.qtermwidget
- pkgs.lxqt.screengrab
- pkgs.menu-cache
- pkgs.openbox # default window manager
- pkgs.qt5.qtsvg # provides QT5 plugins for svg icons
- pkgs.xscreensaver
- ];
+ environment.systemPackages =
+ pkgs.lxqt.preRequisitePackages ++
+ pkgs.lxqt.corePackages ++
+ (removePackagesByName
+ pkgs.lxqt.optionalPackages
+ config.environment.lxqt.excludePackages);
# Link some extra directories in /run/current-system/software/share
environment.pathsToLink = [
@@ -79,5 +59,8 @@ in
"/share/lxqt"
];
+ environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ];
+
};
+
}
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index ce82af4ca68..c0daf30d04e 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -82,12 +82,12 @@ let
# Speed up application start by 50-150ms according to
# http://kdemonkey.blogspot.nl/2008/04/magic-trick.html
- rm -rf $HOME/.compose-cache
- mkdir $HOME/.compose-cache
+ rm -rf "$HOME/.compose-cache"
+ mkdir "$HOME/.compose-cache"
# Work around KDE errors when a user first logs in and
# .local/share doesn't exist yet.
- mkdir -p $HOME/.local/share
+ mkdir -p "$HOME/.local/share"
unset _DID_SYSTEMD_CAT
@@ -148,7 +148,7 @@ let
allowSubstitutes = false;
}
''
- mkdir -p $out
+ mkdir -p "$out"
${concatMapStrings (n: ''
cat - > "$out/${n}.desktop" << EODESKTOP
[Desktop Entry]
@@ -187,7 +187,6 @@ in
default = [];
example = [ "-ac" "-logverbose" "-verbose" "-nolisten tcp" ];
description = "List of arguments for the X server.";
- apply = toString;
};
sessionCommands = mkOption {
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index d3aa63fd428..6c63fede857 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -92,10 +92,15 @@ in
users.extraGroups.gdm.gid = config.ids.gids.gdm;
+ # GDM needs different xserverArgs, presumable because using wayland by default.
+ services.xserver.tty = null;
+ services.xserver.display = null;
+
services.xserver.displayManager.job =
{
environment = {
- GDM_X_SERVER_EXTRA_ARGS = "${cfg.xserverArgs}";
+ GDM_X_SERVER_EXTRA_ARGS = toString
+ (filter (arg: arg != "-terminate") cfg.xserverArgs);
GDM_SESSIONS_DIR = "${cfg.session.desktops}";
# Find the mouse
XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons";
diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix
index 8b51c621e11..04701a1640c 100644
--- a/nixos/modules/services/x11/display-managers/kdm.nix
+++ b/nixos/modules/services/x11/display-managers/kdm.nix
@@ -25,7 +25,7 @@ let
FailsafeClient=${pkgs.xterm}/bin/xterm
[X-:*-Core]
- ServerCmd=${dmcfg.xserverBin} ${dmcfg.xserverArgs}
+ ServerCmd=${dmcfg.xserverBin} ${toString dmcfg.xserverArgs}
# KDM calls `rm' somewhere to clean up some temporary directory.
SystemPath=${pkgs.coreutils}/bin
# The default timeout (15) is too short in a heavily loaded boot process.
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 1d309aa3429..4afef32aaa4 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -23,7 +23,7 @@ let
else additionalArgs="-logfile /var/log/X.$display.log"
fi
- exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs} $additionalArgs "$@"
+ exec ${dmcfg.xserverBin} ${toString dmcfg.xserverArgs} $additionalArgs "$@"
'';
usersConf = writeText "users.conf"
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index 36daf55a36a..6630b8257e4 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -14,7 +14,7 @@ let
xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
#!/bin/sh
${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)}
- exec systemd-cat ${dmcfg.xserverBin} ${dmcfg.xserverArgs} "$@"
+ exec systemd-cat ${dmcfg.xserverBin} ${toString dmcfg.xserverArgs} "$@"
'';
Xsetup = pkgs.writeScript "Xsetup" ''
@@ -27,7 +27,6 @@ let
${cfg.stopScript}
'';
-
cfgFile = pkgs.writeText "sddm.conf" ''
[General]
HaltCommand=${pkgs.systemd}/bin/systemctl poweroff
@@ -47,7 +46,7 @@ let
HideShells=/run/current-system/sw/bin/nologin
[X11]
- MinimumVT=${toString xcfg.tty}
+ MinimumVT=${toString (if xcfg.tty != null then xcfg.tty else 7)}
ServerPath=${xserverWrapper}
XephyrPath=${pkgs.xorg.xorgserver.out}/bin/Xephyr
SessionCommand=${dmcfg.session.script}
@@ -254,5 +253,10 @@ in
users.extraGroups.sddm.gid = config.ids.gids.sddm;
+ services.dbus.packages = [ sddm.unwrapped ];
+
+ # To enable user switching, allow sddm to allocate TTYs/displays dynamically.
+ services.xserver.tty = null;
+ services.xserver.display = null;
};
}
diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index ca2ae1a4772..68acde85b5d 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -12,7 +12,7 @@ let
''
xauth_path ${dmcfg.xauthBin}
default_xserver ${dmcfg.xserverBin}
- xserver_arguments ${dmcfg.xserverArgs}
+ xserver_arguments ${toString dmcfg.xserverArgs}
sessiondir ${dmcfg.session.desktops}
login_cmd exec ${pkgs.stdenv.shell} ${dmcfg.session.script} "%session"
halt_cmd ${config.systemd.package}/sbin/shutdown -h now
diff --git a/nixos/modules/services/x11/unclutter-xfixes.nix b/nixos/modules/services/x11/unclutter-xfixes.nix
new file mode 100644
index 00000000000..bd02c5ed989
--- /dev/null
+++ b/nixos/modules/services/x11/unclutter-xfixes.nix
@@ -0,0 +1,58 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let cfg = config.services.unclutter-xfixes;
+
+in {
+ options.services.unclutter-xfixes = {
+
+ enable = mkOption {
+ description = "Enable unclutter-xfixes to hide your mouse cursor when inactive.";
+ type = types.bool;
+ default = false;
+ example = true;
+ };
+
+ package = mkOption {
+ description = "unclutter-xfixes derivation to use.";
+ type = types.package;
+ default = pkgs.unclutter-xfixes;
+ defaultText = "pkgs.unclutter-xfixes";
+ };
+
+ timeout = mkOption {
+ description = "Number of seconds before the cursor is marked inactive.";
+ type = types.int;
+ default = 1;
+ };
+
+ threshold = mkOption {
+ description = "Minimum number of pixels considered cursor movement.";
+ type = types.int;
+ default = 1;
+ };
+
+ extraOptions = mkOption {
+ description = "More arguments to pass to the unclutter-xfixes command.";
+ type = types.listOf types.str;
+ default = [];
+ example = [ "exclude-root" "ignore-scrolling" "fork" ];
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.user.services.unclutter-xfixes = {
+ description = "unclutter-xfixes";
+ wantedBy = [ "graphical.target" ];
+ serviceConfig.ExecStart = ''
+ ${cfg.package}/bin/unclutter \
+ --timeout ${toString cfg.timeout} \
+ --jitter ${toString (cfg.threshold - 1)} \
+ ${concatMapStrings (x: " --"+x) cfg.extraOptions} \
+ '';
+ serviceConfig.RestartSec = 3;
+ serviceConfig.Restart = "always";
+ };
+ };
+}
diff --git a/nixos/modules/services/x11/urxvtd.nix b/nixos/modules/services/x11/urxvtd.nix
index ab47f4547ae..be36efaa589 100644
--- a/nixos/modules/services/x11/urxvtd.nix
+++ b/nixos/modules/services/x11/urxvtd.nix
@@ -32,6 +32,7 @@ in {
services.urxvtd = {
description = "urxvt terminal daemon";
+ path = [ pkgs.xsel ];
serviceConfig = {
ExecStart = "${pkgs.rxvt_unicode-with-plugins}/bin/urxvtd -o";
Environment = "RXVT_SOCKET=%t/urxvtd-socket";
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 3282e0d0851..00000000000
--- 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 03a1b7a72e8..6783ac3479e 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 dabe2c26a72..f005decfa33 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/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix
index cfe9439b688..f9c75e80db4 100644
--- a/nixos/modules/services/x11/window-managers/i3.nix
+++ b/nixos/modules/services/x11/window-managers/i3.nix
@@ -3,52 +3,58 @@
with lib;
let
- wmCfg = config.services.xserver.windowManager;
+ cfg = config.services.xserver.windowManager.i3;
+in
+
+{
+ options.services.xserver.windowManager.i3 = {
+ enable = mkEnableOption "i3 window manager";
- i3option = name: {
- enable = mkEnableOption name;
configFile = mkOption {
- default = null;
- type = types.nullOr types.path;
+ default = null;
+ type = with types; nullOr path;
description = ''
Path to the i3 configuration file.
If left at the default value, $HOME/.i3/config will be used.
'';
};
+
extraSessionCommands = mkOption {
- default = "";
- type = types.lines;
+ default = "";
+ type = types.lines;
description = ''
Shell commands executed just before i3 is started.
'';
};
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.i3;
+ defaultText = "pkgs.i3";
+ example = "pkgs.i3-gaps";
+ description = ''
+ i3 package to use.
+ '';
+ };
};
- i3config = name: pkg: cfg: {
+ config = mkIf cfg.enable {
services.xserver.windowManager.session = [{
- inherit name;
+ name = "i3";
start = ''
${cfg.extraSessionCommands}
- ${pkg}/bin/i3 ${optionalString (cfg.configFile != null)
+ ${cfg.package}/bin/i3 ${optionalString (cfg.configFile != null)
"-c \"${cfg.configFile}\""
} &
waitPID=$!
'';
}];
- environment.systemPackages = [ pkg ];
+ environment.systemPackages = [ cfg.package ];
};
-in
-
-{
- options.services.xserver.windowManager = {
- i3 = i3option "i3";
- i3-gaps = i3option "i3-gaps";
- };
-
- config = mkMerge [
- (mkIf wmCfg.i3.enable (i3config "i3" pkgs.i3 wmCfg.i3))
- (mkIf wmCfg.i3-gaps.enable (i3config "i3-gaps" pkgs.i3-gaps wmCfg.i3-gaps))
+ imports = [
+ (mkRemovedOptionModule [ "services" "xserver" "windowManager" "i3-gaps" "enable" ]
+ "Use services.xserver.windowManager.i3.enable and set services.xserver.windowManager.i3.package to pkgs.i3-gaps to use i3-gaps.")
];
}
diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix
index a8c7d4b3ee5..59ecaf8d5a6 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/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
index 6153578612c..f8a00784034 100644
--- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
+++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
@@ -44,10 +44,10 @@ in
copyKernels = mkOption {
default = false;
type = types.bool;
- description = "
+ description = ''
Whether copy the necessary boot files into /boot, so
/nix/store is not needed by the boot loader.
- ";
+ '';
};
};
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 17c842ddc53..294fc1988e9 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 b93395300b7..24442ca12a3 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 b7400e333e2..eb8ea613097 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/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 8c139a94c0c..b828ad53dc5 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -165,6 +165,11 @@ let
'';
};
+ extraConfig = mkOption {
+ default = "";
+ type = types.lines;
+ description = "Extra configuration append to unit";
+ };
};
linkOptions = commonNetworkOptions // {
@@ -515,6 +520,8 @@ let
''
[Link]
${attrsToSection def.linkConfig}
+
+ ${def.extraConfig}
'';
};
@@ -565,6 +572,7 @@ let
${attrsToSection def.bondConfig}
''}
+ ${def.extraConfig}
'';
};
@@ -603,9 +611,14 @@ let
${attrsToSection x.routeConfig}
'')}
+ ${def.extraConfig}
'';
};
+ unitFiles = map (name: {
+ target = "systemd/network/${name}";
+ source = "${cfg.units.${name}.unit}/${name}";
+ }) (attrNames cfg.units);
in
{
@@ -657,17 +670,15 @@ in
systemd.additionalUpstreamSystemUnits =
[ "systemd-networkd.service" "systemd-networkd-wait-online.service" ];
- systemd.network.units =
- mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links
+ systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links
// mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs
// mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.networks;
- environment.etc."systemd/network".source =
- generateUnits "network" cfg.units [] [];
+ environment.etc = unitFiles;
systemd.services.systemd-networkd = {
wantedBy = [ "multi-user.target" ];
- restartTriggers = [ config.environment.etc."systemd/network".source ];
+ restartTriggers = map (f: f.source) (unitFiles);
};
systemd.services.systemd-networkd-wait-online = {
@@ -687,8 +698,5 @@ in
};
services.resolved.enable = mkDefault true;
- services.timesyncd.enable = mkDefault config.services.ntp.enable;
-
};
-
}
diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index 60a587af8e9..d45b1686c1e 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/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 4c3fc30358c..69af2398148 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -465,4 +465,20 @@ in rec {
targetOptions = commonUnitOptions;
+ sliceOptions = commonUnitOptions // {
+
+ sliceConfig = mkOption {
+ default = {};
+ example = { MemoryMax = "2G"; };
+ type = types.attrsOf unitOption;
+ description = ''
+ Each attribute in this set specifies an option in the
+ [Slice] section of the unit. See
+ systemd.slice
+ 5 for details.
+ '';
+ };
+
+ };
+
}
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index d1f3f923e5e..a2ee5166971 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -375,6 +375,15 @@ let
'';
};
+ sliceToUnit = name: def:
+ { inherit (def) wantedBy requiredBy enable;
+ text = commonUnitText def +
+ ''
+ [Slice]
+ ${attrsToSection def.sliceConfig}
+ '';
+ };
+
in
{
@@ -458,6 +467,12 @@ in
'';
};
+ systemd.slices = mkOption {
+ default = {};
+ type = with types; attrsOf (submodule [ { options = sliceOptions; } unitConfig] );
+ description = "Definition of slice configurations.";
+ };
+
systemd.generators = mkOption {
type = types.attrsOf types.path;
default = {};
@@ -748,6 +763,7 @@ in
// mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets
// mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.timers
// mapAttrs' (n: v: nameValuePair "${n}.path" (pathToUnit n v)) cfg.paths
+ // mapAttrs' (n: v: nameValuePair "${n}.slice" (sliceToUnit n v)) cfg.slices
// listToAttrs (map
(v: let n = escapeSystemdPath v.where;
in nameValuePair "${n}.mount" (mountToUnit n v)) cfg.mounts)
diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix
index cba965b1cd2..f643723ab14 100644
--- a/nixos/modules/system/boot/timesyncd.nix
+++ b/nixos/modules/system/boot/timesyncd.nix
@@ -6,14 +6,21 @@ with lib;
options = {
- services.timesyncd.enable = mkOption {
- default = false;
- type = types.bool;
- description = ''
- Enables the systemd NTP client daemon.
- '';
+ services.timesyncd = {
+ enable = mkOption {
+ default = !config.boot.isContainer;
+ type = types.bool;
+ description = ''
+ Enables the systemd NTP client daemon.
+ '';
+ };
+ servers = mkOption {
+ default = config.networking.timeServers;
+ description = ''
+ The set of NTP servers from which to synchronise.
+ '';
+ };
};
-
};
config = mkIf config.services.timesyncd.enable {
@@ -30,8 +37,6 @@ with lib;
NTP=${concatStringsSep " " config.services.ntp.servers}
'';
- systemd.services.ntpd.enable = false;
-
users.extraUsers.systemd-timesync.uid = config.ids.uids.systemd-timesync;
users.extraGroups.systemd-timesync.gid = config.ids.gids.systemd-timesync;
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 1faa8abd5f7..aaa78daeb3a 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/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index e216351b434..099ead3d846 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -9,6 +9,15 @@ let kernel = config.boot.kernelPackages.kernel; in
{
+ # This option is a dummy that if used in conjunction with
+ # modules/virtualisation/qemu-vm.nix gets merged with the same option defined
+ # there and only is declared here because some modules use
+ # test-instrumentation.nix but not qemu-vm.nix.
+ #
+ # One particular example are the boot tests where we want instrumentation
+ # within the images but not other stuff like setting up 9p filesystems.
+ options.virtualisation.qemu.program = mkOption { type = types.path; };
+
config = {
systemd.services.backdoor =
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index aa28a25be7a..7d445fa0951 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
@@ -472,6 +476,17 @@ in
'';
};
+ macvlans = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = [ "eth1" "eth2" ];
+ description = ''
+ The list of host interfaces from which macvlans will be
+ created. For each interface specified, a macvlan interface
+ will be created and moved to the container.
+ '';
+ };
+
extraVeths = mkOption {
type = with types; attrsOf (submodule { options = networkOptions; });
default = {};
@@ -510,6 +525,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
@@ -638,6 +665,7 @@ in
''}
''}
INTERFACES="${toString cfg.interfaces}"
+ MACVLANS="${toString cfg.macvlans}"
${optionalString cfg.autoStart ''
AUTO_START=1
''}
@@ -648,10 +676,10 @@ in
# Generate /etc/hosts entries for the containers.
networking.extraHosts = concatStrings (mapAttrsToList (name: cfg: optionalString (cfg.localAddress != null)
''
- ${cfg.localAddress} ${name}.containers
+ ${head (splitString "/" cfg.localAddress)} ${name}.containers
'') config.containers);
- networking.dhcpcd.denyInterfaces = [ "ve-*" ];
+ networking.dhcpcd.denyInterfaces = [ "ve-*" "vb-*" ];
environment.systemPackages = [ pkgs.nixos-container ];
});
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 90dbd3b6d63..0e6825c3f5d 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -125,7 +125,7 @@ in
169.254.169.254 metadata.google.internal metadata
'';
- services.ntp.servers = [ "metadata.google.internal" ];
+ networking.timeServers = [ "metadata.google.internal" ];
networking.usePredictableInterfaceNames = false;
diff --git a/nixos/modules/virtualisation/grow-partition.nix b/nixos/modules/virtualisation/grow-partition.nix
index abc2e766959..5039118d78e 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/lxcfs.nix b/nixos/modules/virtualisation/lxcfs.nix
new file mode 100644
index 00000000000..48462dc66da
--- /dev/null
+++ b/nixos/modules/virtualisation/lxcfs.nix
@@ -0,0 +1,49 @@
+# LXC Configuration
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.virtualisation.lxc.lxcfs;
+in {
+ meta.maintainers = [ maintainers.mic92 ];
+
+ ###### interface
+ options.virtualisation.lxc.lxcfs = {
+ enable =
+ mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ This enables LXCFS, a FUSE filesystem for LXC.
+ To use lxcfs in include the following configuration in your
+ container configuration:
+
+ virtualisation.lxc.defaultConfig = "lxc.include = ''${pkgs.lxcfs}/share/lxc/config/common.conf.d/00-lxcfs.conf";
+
+ '';
+ };
+ };
+
+ ###### implementation
+ config = mkIf cfg.enable {
+ services.cgmanager.enable = true;
+
+ systemd.services.lxcfs = {
+ description = "FUSE filesystem for LXC";
+ wantedBy = [ "multi-user.target" ];
+ requires = [ "cgmanager.service" ];
+ after = [ "cgmanager.service" ];
+ before = [ "lxc.service" ];
+ restartIfChanged = false;
+ serviceConfig = {
+ ExecStartPre="${pkgs.coreutils}/bin/mkdir -p /var/lib/lxcfs";
+ ExecStart="${pkgs.lxcfs}/bin/lxcfs /var/lib/lxcfs";
+ ExecStopPost="-${pkgs.fuse}/bin/fusermount -u /var/lib/lxcfs";
+ KillMode="process";
+ Restart="on-failure";
+ };
+ };
+ };
+}
diff --git a/nixos/modules/virtualisation/openstack/common.nix b/nixos/modules/virtualisation/openstack/common.nix
new file mode 100644
index 00000000000..3fce54a2fa5
--- /dev/null
+++ b/nixos/modules/virtualisation/openstack/common.nix
@@ -0,0 +1,54 @@
+{ lib }:
+
+with lib;
+
+rec {
+ # A shell script string helper to get the value of a secret at
+ # runtime.
+ getSecret = secretOption:
+ if secretOption.storage == "fromFile"
+ then ''$(cat ${secretOption.value})''
+ else ''${secretOption.value}'';
+
+
+ # A shell script string help to replace at runtime in a file the
+ # pattern of a secret by its value.
+ replaceSecret = secretOption: filename: ''
+ sed -i "s/${secretOption.pattern}/${getSecret secretOption}/g" ${filename}
+ '';
+
+ # This generates an option that can be used to declare secrets which
+ # can be stored in the nix store, or not. A pattern is written in
+ # the nix store to represent the secret. The pattern can
+ # then be overwritten with the value of the secret at runtime.
+ mkSecretOption = {name, description ? ""}:
+ mkOption {
+ description = description;
+ type = types.submodule ({
+ options = {
+ pattern = mkOption {
+ type = types.str;
+ default = "##${name}##";
+ description = "The pattern that represent the secret.";
+ };
+ storage = mkOption {
+ type = types.enum [ "fromNixStore" "fromFile" ];
+ description = ''
+ Choose the way the password is provisionned. If
+ fromNixStore is used, the value is the password and it is
+ written in the nix store. If fromFile is used, the value
+ is a path from where the password will be read at
+ runtime. This is generally used with
+ deployment keys of Nixops.
+ '';};
+ value = mkOption {
+ type = types.str;
+ description = ''
+ If the storage is fromNixStore, the value is the password itself,
+ otherwise it is a path to the file that contains the password.
+ '';
+ };
+ };});
+ };
+}
diff --git a/nixos/modules/virtualisation/openstack/keystone.nix b/nixos/modules/virtualisation/openstack/keystone.nix
new file mode 100644
index 00000000000..e32c5a4cae1
--- /dev/null
+++ b/nixos/modules/virtualisation/openstack/keystone.nix
@@ -0,0 +1,220 @@
+{ config, lib, pkgs, ... }:
+
+with lib; with import ./common.nix {inherit lib;};
+
+let
+ cfg = config.virtualisation.openstack.keystone;
+ keystoneConfTpl = pkgs.writeText "keystone.conf" ''
+ [DEFAULT]
+ admin_token = ${cfg.adminToken.pattern}
+ policy_file=${cfg.package}/etc/policy.json
+
+ [database]
+
+ connection = "mysql://${cfg.database.user}:${cfg.database.password.pattern}@${cfg.database.host}/${cfg.database.name}"
+
+ [paste_deploy]
+ config_file = ${cfg.package}/etc/keystone-paste.ini
+
+ ${cfg.extraConfig}
+ '';
+ keystoneConf = "/var/lib/keystone/keystone.conf";
+
+in {
+ options.virtualisation.openstack.keystone = {
+ package = mkOption {
+ type = types.package;
+ example = literalExample "pkgs.keystone";
+ description = ''
+ Keystone package to use.
+ '';
+ };
+
+ enable = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Enable Keystone, the OpenStack Identity Service
+ '';
+ };
+
+ extraConfig = mkOption {
+ default = "";
+ type = types.lines;
+ description = ''
+ Additional text appended to keystone.conf,
+ the main Keystone configuration file.
+ '';
+ };
+
+ adminToken = mkSecretOption {
+ name = "adminToken";
+ description = ''
+ This is the admin token used to boostrap keystone,
+ ie. to provision first resources.
+ '';
+ };
+
+ bootstrap = {
+ enable = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Bootstrap the Keystone service by creating the service
+ tenant, an admin account and a public endpoint. This options
+ provides a ready-to-use admin account. This is only done at
+ the first Keystone execution by the systemd post start.
+
+ Note this option is a helper for setting up development or
+ testing environments.
+ '';
+ };
+
+ endpointPublic = mkOption {
+ type = types.str;
+ default = "http://localhost:5000/v2.0";
+ description = ''
+ The public identity endpoint. The link
+ create keystone endpoint provides more informations
+ about that.
+ '';
+ };
+
+ adminUsername = mkOption {
+ type = types.str;
+ default = "admin";
+ description = ''
+ A keystone admin username.
+ '';
+ };
+
+ adminPassword = mkSecretOption {
+ name = "keystoneAdminPassword";
+ description = ''
+ The keystone admin user's password.
+ '';
+ };
+
+ adminTenant = mkOption {
+ type = types.str;
+ default = "admin";
+ description = ''
+ A keystone admin tenant name.
+ '';
+ };
+ };
+
+ database = {
+ host = mkOption {
+ type = types.str;
+ default = "localhost";
+ description = ''
+ Host of the database.
+ '';
+ };
+
+ name = mkOption {
+ type = types.str;
+ default = "keystone";
+ description = ''
+ Name of the existing database.
+ '';
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = "keystone";
+ description = ''
+ The database user. The user must exist and has access to
+ the specified database.
+ '';
+ };
+ password = mkSecretOption {
+ name = "mysqlPassword";
+ description = "The database user's password";};
+ };
+ };
+
+ config = mkIf cfg.enable {
+ # Note: when changing the default, make it conditional on
+ # ‘system.stateVersion’ to maintain compatibility with existing
+ # systems!
+ virtualisation.openstack.keystone.package = mkDefault pkgs.keystone;
+
+ users.extraUsers = [{
+ name = "keystone";
+ group = "keystone";
+ uid = config.ids.uids.keystone;
+ }];
+ users.extraGroups = [{
+ name = "keystone";
+ gid = config.ids.gids.keystone;
+ }];
+
+ systemd.services.keystone-all = {
+ description = "OpenStack Keystone Daemon";
+ after = [ "network.target"];
+ path = [ cfg.package pkgs.mysql pkgs.curl pkgs.pythonPackages.keystoneclient pkgs.gawk ];
+ wantedBy = [ "multi-user.target" ];
+ preStart = ''
+ mkdir -m 755 -p /var/lib/keystone
+
+ cp ${keystoneConfTpl} ${keystoneConf};
+ chown keystone:keystone ${keystoneConf};
+ chmod 640 ${keystoneConf}
+
+ ${replaceSecret cfg.database.password keystoneConf}
+ ${replaceSecret cfg.adminToken keystoneConf}
+
+ # Initialise the database
+ ${cfg.package}/bin/keystone-manage --config-file=${keystoneConf} db_sync
+ # Set up the keystone's PKI infrastructure
+ ${cfg.package}/bin/keystone-manage --config-file=${keystoneConf} pki_setup --keystone-user keystone --keystone-group keystone
+ '';
+ postStart = optionalString cfg.bootstrap.enable ''
+ set -eu
+ # Wait until the keystone is available for use
+ count=0
+ while ! curl --fail -s http://localhost:35357/v2.0 > /dev/null
+ do
+ if [ $count -eq 30 ]
+ then
+ echo "Tried 30 times, giving up..."
+ exit 1
+ fi
+
+ echo "Keystone not yet started. Waiting for 1 second..."
+ count=$((count++))
+ sleep 1
+ done
+
+ # We use the service token to create a first admin user
+ export OS_SERVICE_ENDPOINT=http://localhost:35357/v2.0
+ export OS_SERVICE_TOKEN=${getSecret cfg.adminToken}
+
+ # If the tenant service doesn't exist, we consider
+ # keystone is not initialized
+ if ! keystone tenant-get service
+ then
+ keystone tenant-create --name service
+ keystone tenant-create --name ${cfg.bootstrap.adminTenant}
+ keystone user-create --name ${cfg.bootstrap.adminUsername} --tenant ${cfg.bootstrap.adminTenant} --pass ${getSecret cfg.bootstrap.adminPassword}
+ keystone role-create --name admin
+ keystone role-create --name Member
+ keystone user-role-add --tenant ${cfg.bootstrap.adminTenant} --user ${cfg.bootstrap.adminUsername} --role admin
+ keystone service-create --type identity --name keystone
+ ID=$(keystone service-get keystone | awk '/ id / { print $4 }')
+ keystone endpoint-create --region RegionOne --service $ID --publicurl ${cfg.bootstrap.endpointPublic} --adminurl http://localhost:35357/v2.0 --internalurl http://localhost:5000/v2.0
+ fi
+ '';
+ serviceConfig = {
+ PermissionsStartOnly = true; # preStart must be run as root
+ TimeoutStartSec = "600"; # 10min for initial db migrations
+ User = "keystone";
+ Group = "keystone";
+ ExecStart = "${cfg.package}/bin/keystone-all --config-file=${keystoneConf}";
+ };
+ };
+ };
+}
diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix
index 204ab0b0df6..bd85973ee56 100644
--- a/nixos/modules/virtualisation/parallels-guest.nix
+++ b/nixos/modules/virtualisation/parallels-guest.nix
@@ -57,7 +57,7 @@ in
boot.kernelModules = [ "prl_tg" "prl_eth" "prl_fs" "prl_fs_freeze" "acpi_memhotplug" ];
- services.ntp.enable = false;
+ services.timesyncd.enable = false;
systemd.services.prltoolsd = {
description = "Parallels Tools' service";
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 777ee31e4dc..6423432c78b 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -13,6 +13,8 @@ with lib;
let
+ qemu = config.system.build.qemu or pkgs.qemu_test;
+
vmName =
if config.networking.hostName == ""
then "noname"
@@ -32,7 +34,7 @@ let
NIX_DISK_IMAGE=$(readlink -f ''${NIX_DISK_IMAGE:-${config.virtualisation.diskImage}})
if ! test -e "$NIX_DISK_IMAGE"; then
- ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" \
+ ${qemu}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" \
${toString config.virtualisation.diskSize}M || exit 1
fi
@@ -47,7 +49,7 @@ let
${if cfg.useBootLoader then ''
# Create a writable copy/snapshot of the boot disk.
# A writable boot disk can be booted from automatically.
- ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 -b ${bootDisk}/disk.img $TMPDIR/disk.img || exit 1
+ ${qemu}/bin/qemu-img create -f qcow2 -b ${bootDisk}/disk.img $TMPDIR/disk.img || exit 1
${if cfg.useEFIBoot then ''
# VM needs a writable flash BIOS.
@@ -63,14 +65,14 @@ let
extraDisks=""
${flip concatMapStrings cfg.emptyDiskImages (size: ''
if ! test -e "empty$idx.qcow2"; then
- ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M"
+ ${qemu}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M"
fi
extraDisks="$extraDisks -drive index=$idx,file=$(pwd)/empty$idx.qcow2,if=${cfg.qemu.diskInterface},werror=report"
idx=$((idx + 1))
'')}
# Start QEMU.
- exec ${pkgs.qemu_kvm}/bin/qemu-kvm \
+ exec ${qemu}/bin/qemu-kvm \
-name ${vmName} \
-m ${toString config.virtualisation.memorySize} \
${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \
@@ -121,7 +123,7 @@ let
mkdir $out
diskImage=$out/disk.img
bootFlash=$out/bios.bin
- ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 $diskImage "40M"
+ ${qemu}/bin/qemu-img create -f qcow2 $diskImage "40M"
${if cfg.useEFIBoot then ''
cp ${pkgs.OVMF-CSM}/FV/OVMF.fd $bootFlash
chmod 0644 $bootFlash
@@ -272,7 +274,7 @@ in
virtualisation.writableStore =
mkOption {
- default = false;
+ default = true; # FIXME
description =
''
If enabled, the Nix store in the VM is made writable by
@@ -470,7 +472,7 @@ in
boot.initrd.luks.devices = mkVMOverride {};
# Don't run ntpd in the guest. It should get the correct time from KVM.
- services.ntp.enable = false;
+ services.timesyncd.enable = false;
system.build.vm = pkgs.runCommand "nixos-vm" { preferLocalBuild = true; }
''
diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix
index b9a4f3b11dc..ac5f87817fe 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/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index a0b2d5363eb..67eef0ec1e4 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -324,18 +324,18 @@ in
domain-needed
dhcp-hostsfile=/var/run/xen/dnsmasq.etherfile
dhcp-authoritative
- dhcp-range=$XEN_BRIDGE_IP_RANGE_START,$XEN_BRIDGE_IP_RANGE_END,$XEN_BRIDGE_NETWORK_ADDRESS
+ dhcp-range=$XEN_BRIDGE_IP_RANGE_START,$XEN_BRIDGE_IP_RANGE_END
dhcp-no-override
no-ping
dhcp-leasefile=/var/run/xen/dnsmasq.leasefile
EOF
# DHCP
- ${pkgs.iptables}/bin/iptables -I INPUT -i ${cfg.bridge.name} -p tcp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT
- ${pkgs.iptables}/bin/iptables -I INPUT -i ${cfg.bridge.name} -p udp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT
+ ${pkgs.iptables}/bin/iptables -w -I INPUT -i ${cfg.bridge.name} -p tcp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT
+ ${pkgs.iptables}/bin/iptables -w -I INPUT -i ${cfg.bridge.name} -p udp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT
# DNS
- ${pkgs.iptables}/bin/iptables -I INPUT -i ${cfg.bridge.name} -p tcp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT
- ${pkgs.iptables}/bin/iptables -I INPUT -i ${cfg.bridge.name} -p udp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT
+ ${pkgs.iptables}/bin/iptables -w -I INPUT -i ${cfg.bridge.name} -p tcp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT
+ ${pkgs.iptables}/bin/iptables -w -I INPUT -i ${cfg.bridge.name} -p udp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT
${pkgs.bridge-utils}/bin/brctl addbr ${cfg.bridge.name}
${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} ${cfg.bridge.address}
@@ -347,11 +347,11 @@ in
${pkgs.bridge-utils}/bin/brctl delbr ${cfg.bridge.name}
# DNS
- ${pkgs.iptables}/bin/iptables -D INPUT -i ${cfg.bridge.name} -p udp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT
- ${pkgs.iptables}/bin/iptables -D INPUT -i ${cfg.bridge.name} -p tcp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT
+ ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p udp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT
+ ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p tcp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT
# DHCP
- ${pkgs.iptables}/bin/iptables -D INPUT -i ${cfg.bridge.name} -p udp --sport 68 --dport 67 -j ACCEPT
- ${pkgs.iptables}/bin/iptables -D INPUT -i ${cfg.bridge.name} -p tcp --sport 68 --dport 67 -j ACCEPT
+ ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p udp --sport 68 --dport 67 -j ACCEPT
+ ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p tcp --sport 68 --dport 67 -j ACCEPT
'';
};
diff --git a/nixos/modules/virtualisation/xen-domU.nix b/nixos/modules/virtualisation/xen-domU.nix
index 2db3190ad13..8dd0d1dbfd2 100644
--- a/nixos/modules/virtualisation/xen-domU.nix
+++ b/nixos/modules/virtualisation/xen-domU.nix
@@ -18,5 +18,5 @@
services.syslogd.tty = "hvc0";
# Don't run ntpd, since we should get the correct time from Dom0.
- services.ntp.enable = false;
+ services.timesyncd.enable = false;
}
diff --git a/nixos/release.nix b/nixos/release.nix
index 5687d5b0e6e..366eecf773e 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -221,13 +221,16 @@ in rec {
tests.boot-stage1 = callTest tests/boot-stage1.nix {};
tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; });
tests.chromium = (callSubTests tests/chromium.nix { system = "x86_64-linux"; }).stable;
- #tests.cjdns = callTest tests/cjdns.nix {};
+ tests.cjdns = callTest tests/cjdns.nix {};
tests.containers-ipv4 = callTest tests/containers-ipv4.nix {};
tests.containers-ipv6 = callTest tests/containers-ipv6.nix {};
tests.containers-bridge = callTest tests/containers-bridge.nix {};
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.containers-hosts = callTest tests/containers-hosts.nix {};
+ tests.containers-macvlans = callTest tests/containers-macvlans.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 {};
@@ -255,6 +258,7 @@ in rec {
tests.kde5 = callTest tests/kde5.nix {};
tests.keymap = callSubTests tests/keymap.nix {};
tests.initrdNetwork = callTest tests/initrd-network.nix {};
+ tests.keystone = callTest tests/keystone.nix {};
tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; });
tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };
#tests.lightdm = callTest tests/lightdm.nix {};
diff --git a/nixos/tests/blivet.nix b/nixos/tests/blivet.nix
index a7b836ce99a..2adc2ee1eee 100644
--- a/nixos/tests/blivet.nix
+++ b/nixos/tests/blivet.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }: with pkgs.pythonPackages; rec {
+import ./make-test.nix ({ pkgs, ... }: with pkgs.python2Packages; rec {
name = "blivet";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ aszlig ];
diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index 9a6414f81c3..55b1fb5a722 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -118,7 +118,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
"ulimit -c unlimited; ".
"chromium $args \"$url\" & disown"
);
- $machine->waitForText(qr/Type to search or enter a URL to navigate/);
+ $machine->waitForText(qr/startup done/);
$machine->waitUntilSucceeds("${xdo "check-startup" ''
search --sync --onlyvisible --name "startup done"
# close first start help popup
diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix
index 1cedf168dcb..f32ec52dfc2 100644
--- a/nixos/tests/cjdns.nix
+++ b/nixos/tests/cjdns.nix
@@ -54,10 +54,9 @@ import ./make-test.nix ({ pkgs, ...} : {
services.cjdns =
{ UDPInterface =
{ bind = "0.0.0.0:1024";
- connectTo."192.168.0.1:1024}" =
+ connectTo."192.168.0.1:1024" =
{ password = carolPassword;
publicKey = carolPubKey;
- hostname = "carol";
};
};
};
diff --git a/nixos/tests/containers-hosts.nix b/nixos/tests/containers-hosts.nix
new file mode 100644
index 00000000000..c7a85f190a5
--- /dev/null
+++ b/nixos/tests/containers-hosts.nix
@@ -0,0 +1,52 @@
+# Test for NixOS' container support.
+
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "containers-hosts";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ montag451 ];
+ };
+
+ machine =
+ { config, pkgs, lib, ... }:
+ {
+ virtualisation.memorySize = 256;
+ virtualisation.vlans = [];
+
+ networking.bridges.br0.interfaces = [];
+ networking.interfaces.br0 = {
+ ip4 = [ { address = "10.11.0.254"; prefixLength = 24; } ];
+ };
+
+ # Force /etc/hosts to be the only source for host name resolution
+ environment.etc."nsswitch.conf".text = lib.mkForce ''
+ hosts: files
+ '';
+
+ containers.simple = {
+ autoStart = true;
+ privateNetwork = true;
+ localAddress = "10.10.0.1";
+ hostAddress = "10.10.0.254";
+
+ config = {};
+ };
+
+ containers.netmask = {
+ autoStart = true;
+ privateNetwork = true;
+ hostBridge = "br0";
+ localAddress = "10.11.0.1/24";
+
+ config = {};
+ };
+ };
+
+ testScript = ''
+ startAll;
+ $machine->waitForUnit("default.target");
+
+ # Ping the containers using the entries added in /etc/hosts
+ $machine->succeed("ping -n -c 1 simple.containers");
+ $machine->succeed("ping -n -c 1 netmask.containers");
+ '';
+})
diff --git a/nixos/tests/containers-macvlans.nix b/nixos/tests/containers-macvlans.nix
new file mode 100644
index 00000000000..721f9848149
--- /dev/null
+++ b/nixos/tests/containers-macvlans.nix
@@ -0,0 +1,82 @@
+# Test for NixOS' container support.
+
+let
+ # containers IP on VLAN 1
+ containerIp1 = "192.168.1.253";
+ containerIp2 = "192.168.1.254";
+in
+
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "containers-macvlans";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ montag451 ];
+ };
+
+ nodes = {
+
+ machine1 =
+ { config, pkgs, lib, ... }:
+ {
+ virtualisation.memorySize = 256;
+ virtualisation.vlans = [ 1 ];
+
+ # To be able to ping containers from the host, it is necessary
+ # to create a macvlan on the host on the VLAN 1 network.
+ networking.macvlans.mv-eth1-host = {
+ interface = "eth1";
+ mode = "bridge";
+ };
+ networking.interfaces.eth1.ip4 = lib.mkForce [];
+ networking.interfaces.mv-eth1-host = {
+ ip4 = [ { address = "192.168.1.1"; prefixLength = 24; } ];
+ };
+
+ containers.test1 = {
+ autoStart = true;
+ macvlans = [ "eth1" ];
+
+ config = {
+ networking.interfaces.mv-eth1 = {
+ ip4 = [ { address = containerIp1; prefixLength = 24; } ];
+ };
+ };
+ };
+
+ containers.test2 = {
+ autoStart = true;
+ macvlans = [ "eth1" ];
+
+ config = {
+ networking.interfaces.mv-eth1 = {
+ ip4 = [ { address = containerIp2; prefixLength = 24; } ];
+ };
+ };
+ };
+ };
+
+ machine2 =
+ { config, pkgs, ... }:
+ {
+ virtualisation.memorySize = 256;
+ virtualisation.vlans = [ 1 ];
+ };
+
+ };
+
+ testScript = ''
+ startAll;
+ $machine1->waitForUnit("default.target");
+ $machine2->waitForUnit("default.target");
+
+ # Ping between containers to check that macvlans are created in bridge mode
+ $machine1->succeed("nixos-container run test1 -- ping -n -c 1 ${containerIp2}");
+
+ # Ping containers from the host (machine1)
+ $machine1->succeed("ping -n -c 1 ${containerIp1}");
+ $machine1->succeed("ping -n -c 1 ${containerIp2}");
+
+ # Ping containers from the second machine to check that containers are reachable from the outside
+ $machine2->succeed("ping -n -c 1 ${containerIp1}");
+ $machine2->succeed("ping -n -c 1 ${containerIp2}");
+ '';
+})
diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix
new file mode 100644
index 00000000000..564831fa273
--- /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/nixos/tests/ecryptfs.nix b/nixos/tests/ecryptfs.nix
index db800c7bb2c..041be0f5a62 100644
--- a/nixos/tests/ecryptfs.nix
+++ b/nixos/tests/ecryptfs.nix
@@ -21,13 +21,13 @@ import ./make-test.nix ({ pkgs, ... }:
$machine->log("ecryptfs-migrate-home said: $out");
# Log alice in (ecryptfs passwhrase is wrapped during first login)
- $machine->sleep(2); # urgh: wait for username prompt
+ $machine->waitUntilTTYMatches(1, "login: ");
$machine->sendChars("alice\n");
- $machine->sleep(1);
+ $machine->waitUntilTTYMatches(1, "Password: ");
$machine->sendChars("foobar\n");
- $machine->sleep(2);
+ $machine->waitUntilTTYMatches(1, "alice\@machine");
$machine->sendChars("logout\n");
- $machine->sleep(2);
+ $machine->waitUntilTTYMatches(1, "login: ");
# Why do I need to do this??
$machine->succeed("su alice -c ecryptfs-umount-private || true");
@@ -39,10 +39,11 @@ import ./make-test.nix ({ pkgs, ... }:
$machine->log("keyctl unlink said: " . $out);
# Log alice again
+ $machine->waitUntilTTYMatches(1, "login: ");
$machine->sendChars("alice\n");
- $machine->sleep(1);
+ $machine->waitUntilTTYMatches(1, "Password: ");
$machine->sendChars("foobar\n");
- $machine->sleep(2);
+ $machine->waitUntilTTYMatches(1, "alice\@machine");
# Create some files in encrypted home
$machine->succeed("su alice -c 'touch ~alice/a'");
@@ -50,7 +51,7 @@ import ./make-test.nix ({ pkgs, ... }:
# Logout
$machine->sendChars("logout\n");
- $machine->sleep(2);
+ $machine->waitUntilTTYMatches(1, "login: ");
# Why do I need to do this??
$machine->succeed("su alice -c ecryptfs-umount-private || true");
@@ -62,10 +63,11 @@ import ./make-test.nix ({ pkgs, ... }:
$machine->succeed("su alice -c 'test \! -f ~alice/b'");
# Log alice once more
+ $machine->waitUntilTTYMatches(1, "login: ");
$machine->sendChars("alice\n");
- $machine->sleep(1);
+ $machine->waitUntilTTYMatches(1, "Password: ");
$machine->sendChars("foobar\n");
- $machine->sleep(2);
+ $machine->waitUntilTTYMatches(1, "alice\@machine");
# Check that the files are there
$machine->sleep(1);
@@ -77,5 +79,6 @@ import ./make-test.nix ({ pkgs, ... }:
$machine->succeed("su alice -c 'ls -lh ~alice/'");
$machine->sendChars("logout\n");
+ $machine->waitUntilTTYMatches(1, "login: ");
'';
})
diff --git a/nixos/tests/grsecurity.nix b/nixos/tests/grsecurity.nix
index e585a7402d3..ee9e0709e5e 100644
--- a/nixos/tests/grsecurity.nix
+++ b/nixos/tests/grsecurity.nix
@@ -8,7 +8,9 @@ import ./make-test.nix ({ pkgs, ...} : {
machine = { config, pkgs, ... }:
{ security.grsecurity.enable = true;
+ boot.kernel.sysctl."kernel.grsecurity.audit_mount" = 0;
boot.kernel.sysctl."kernel.grsecurity.deter_bruteforce" = 0;
+ networking.useDHCP = false;
};
testScript = ''
@@ -20,16 +22,14 @@ import ./make-test.nix ({ pkgs, ...} : {
subtest "paxtest", sub {
# TODO: running paxtest blackhat hangs the vm
- $machine->succeed("${pkgs.paxtest}/lib/paxtest/anonmap") =~ /Killed/ or die;
- $machine->succeed("${pkgs.paxtest}/lib/paxtest/execbss") =~ /Killed/ or die;
- $machine->succeed("${pkgs.paxtest}/lib/paxtest/execdata") =~ /Killed/ or die;
- $machine->succeed("${pkgs.paxtest}/lib/paxtest/execheap") =~ /Killed/ or die;
- $machine->succeed("${pkgs.paxtest}/lib/paxtest/execstack") =~ /Killed/ or die;
- $machine->succeed("${pkgs.paxtest}/lib/paxtest/mprotanon") =~ /Killed/ or die;
- $machine->succeed("${pkgs.paxtest}/lib/paxtest/mprotbss") =~ /Killed/ or die;
- $machine->succeed("${pkgs.paxtest}/lib/paxtest/mprotdata") =~ /Killed/ or die;
- $machine->succeed("${pkgs.paxtest}/lib/paxtest/mprotheap") =~ /Killed/ or die;
- $machine->succeed("${pkgs.paxtest}/lib/paxtest/mprotstack") =~ /Killed/ or die;
+ my @pax_mustkill = (
+ "anonmap", "execbss", "execdata", "execheap", "execstack",
+ "mprotanon", "mprotbss", "mprotdata", "mprotheap", "mprotstack",
+ );
+ foreach my $name (@pax_mustkill) {
+ my $paxtest = "${pkgs.paxtest}/lib/paxtest/" . $name;
+ $machine->succeed($paxtest) =~ /Killed/ or die
+ }
};
# tcc -run executes run-time generated code and so allows us to test whether
diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix
new file mode 100644
index 00000000000..92d742e4f37
--- /dev/null
+++ b/nixos/tests/ipfs.nix
@@ -0,0 +1,37 @@
+
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "ipfs";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ mguentner ];
+ };
+
+ nodes = {
+ adder =
+ { config, pkgs, ... }:
+ {
+ services.ipfs = {
+ enable = true;
+ gatewayAddress = "/ip4/127.0.0.1/tcp/2323";
+ apiAddress = "/ip4/127.0.0.1/tcp/2324";
+ };
+ };
+ getter =
+ { config, pkgs, ... }:
+ {
+ services.ipfs.enable = true;
+ };
+ };
+
+ testScript = ''
+ startAll;
+ $adder->waitForUnit("ipfs");
+ # * => needs ipfs dht (internet)
+ # $getter->waitForUnit("ipfs");
+ $adder->waitUntilSucceeds("ipfs --api /ip4/127.0.0.1/tcp/2324 id");
+ $adder->mustSucceed("([[ -n '$(ipfs --api /ip4/127.0.0.1/tcp/2324 config Addresses.gatewayAddress | grep /ip4/127.0.0.1/tcp/2323)' ]])");
+ # * $getter->waitUntilSucceeds("ipfs --api /ip4/127.0.0.1/tcp/5001 id");
+ # * my $ipfsHash = $adder->mustSucceed("echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | cut -d' ' -f2");
+ $adder->mustSucceed("([[ -n '$(echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | grep added)' ]])");
+ # * $getter->mustSucceed("ipfs --api /ip4/127.0.0.1/tcp/5001 cat $ipfsHash");
+ '';
+})
diff --git a/nixos/tests/kde5.nix b/nixos/tests/kde5.nix
index 30a0d09d18b..30db316dba5 100644
--- a/nixos/tests/kde5.nix
+++ b/nixos/tests/kde5.nix
@@ -20,8 +20,6 @@ import ./make-test.nix ({ pkgs, ...} :
services.xserver.desktopManager.kde5.enable = true;
};
- enableOCR = true;
-
testScript = { nodes, ... }:
let xdo = "${pkgs.xdotool}/bin/xdotool"; in
''
diff --git a/nixos/tests/keystone.nix b/nixos/tests/keystone.nix
new file mode 100644
index 00000000000..358e352f776
--- /dev/null
+++ b/nixos/tests/keystone.nix
@@ -0,0 +1,82 @@
+{ system ? builtins.currentSystem }:
+
+with import ../lib/testing.nix { inherit system; };
+with pkgs.lib;
+
+let
+ keystoneMysqlPassword = "keystoneMysqlPassword";
+ keystoneMysqlPasswordFile = "/var/run/keystoneMysqlPassword";
+ keystoneAdminPassword = "keystoneAdminPassword";
+
+ createKeystoneDb = pkgs.writeText "create-keystone-db.sql" ''
+ create database keystone;
+ GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' IDENTIFIED BY '${keystoneMysqlPassword}';
+ GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' IDENTIFIED BY '${keystoneMysqlPassword}';
+ '';
+ # The admin keystone account
+ adminOpenstackCmd = "OS_TENANT_NAME=admin OS_USERNAME=admin OS_PASSWORD=${keystoneAdminPassword} OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack";
+ # The created demo keystone account
+ demoOpenstackCmd = "OS_TENANT_NAME=demo OS_USERNAME=demo OS_PASSWORD=demo OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack";
+
+in makeTest {
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ lewo ];
+ };
+ machine =
+ { config, pkgs, ... }:
+ {
+ # This is to simulate nixops deployment process.
+ # https://nixos.org/nixops/manual/#opt-deployment.keys
+ boot.postBootCommands = "echo ${keystoneMysqlPassword} > ${keystoneMysqlPasswordFile}";
+
+ services.mysql.enable = true;
+ services.mysql.initialScript = createKeystoneDb;
+
+ virtualisation = {
+
+ openstack.keystone = {
+ enable = true;
+ # Check if we can get the secret from a file
+ database.password = {
+ value = keystoneMysqlPasswordFile;
+ storage = "fromFile";
+ };
+ adminToken = {
+ value = "adminToken";
+ storage = "fromNixStore";
+ };
+
+ bootstrap.enable = true;
+ # Check if we can get the secret from the store
+ bootstrap.adminPassword = {
+ value = keystoneAdminPassword;
+ storage = "fromNixStore";
+ };
+ };
+
+ memorySize = 2096;
+ diskSize = 4 * 1024;
+ };
+
+ environment.systemPackages = with pkgs.pythonPackages; with pkgs; [
+ openstackclient
+ ];
+ };
+
+ testScript =
+ ''
+ $machine->waitForUnit("keystone-all.service");
+
+ # Verify that admin ccount is working
+ $machine->succeed("${adminOpenstackCmd} token issue");
+
+ # Try to create a new user
+ $machine->succeed("${adminOpenstackCmd} project create --domain default --description 'Demo Project' demo");
+ $machine->succeed("${adminOpenstackCmd} user create --domain default --password demo demo");
+ $machine->succeed("${adminOpenstackCmd} role create user");
+ $machine->succeed("${adminOpenstackCmd} role add --project demo --user demo user");
+
+ # Verify this new account is working
+ $machine->succeed("${demoOpenstackCmd} token issue");
+ '';
+}
diff --git a/nixos/tests/kubernetes.nix b/nixos/tests/kubernetes.nix
index b19ea67b0ba..273bd3c80c1 100644
--- a/nixos/tests/kubernetes.nix
+++ b/nixos/tests/kubernetes.nix
@@ -1,182 +1,408 @@
-# This test runs two node kubernetes cluster and checks if simple redis pod works
+{ system ? builtins.currentSystem }:
-import ./make-test.nix ({ pkgs, ...} : rec {
- name = "kubernetes";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ offline ];
+with import ../lib/testing.nix { inherit system; };
+with import ../lib/qemu-flags.nix;
+with pkgs.lib;
+
+let
+ redisPod = pkgs.writeText "redis-master-pod.json" (builtins.toJSON {
+ kind = "Pod";
+ apiVersion = "v1";
+ metadata.name = "redis";
+ metadata.labels.name = "redis";
+ spec.containers = [{
+ name = "redis";
+ image = "redis";
+ args = ["--bind" "0.0.0.0"];
+ imagePullPolicy = "Never";
+ ports = [{
+ name = "redis-server";
+ containerPort = 6379;
+ }];
+ }];
+ });
+
+ redisService = pkgs.writeText "redis-service.json" (builtins.toJSON {
+ kind = "Service";
+ apiVersion = "v1";
+ metadata.name = "redis";
+ spec = {
+ ports = [{port = 6379; targetPort = 6379;}];
+ selector = {name = "redis";};
+ };
+ });
+
+ redisImage = pkgs.dockerTools.buildImage {
+ name = "redis";
+ tag = "latest";
+ contents = pkgs.redis;
+ config.Entrypoint = "/bin/redis-server";
};
- redisMaster = builtins.toFile "redis-master-pod.yaml" ''
- id: redis-master-pod
- kind: Pod
- apiVersion: v1beta1
- desiredState:
- manifest:
- version: v1beta1
- id: redis-master-pod
- containers:
- - name: master
- image: master:5000/nix
- cpu: 100
- ports:
- - name: redis-server
- containerPort: 6379
- hostPort: 6379
- volumeMounts:
- - name: nix-store
- mountPath: /nix/store
- readOnly: true
- volumeMounts:
- - name: system-profile
- mountPath: /bin
- readOnly: true
- command:
- - /bin/redis-server
- volumes:
- - name: nix-store
- source:
- hostDir:
- path: /nix/store
- - name: system-profile
- source:
- hostDir:
- path: /run/current-system/sw/bin
- labels:
- name: redis
- role: master
+ testSimplePod = ''
+ $kubernetes->execute("docker load < ${redisImage}");
+ $kubernetes->waitUntilSucceeds("kubectl create -f ${redisPod}");
+ $kubernetes->succeed("kubectl create -f ${redisService}");
+ $kubernetes->waitUntilSucceeds("kubectl get pod redis | grep Running");
+ $kubernetes->succeed("nc -z \$\(dig \@10.10.0.1 redis.default.svc.cluster.local +short\) 6379");
'';
+in {
+ # This test runs kubernetes on a single node
+ trivial = makeTest {
+ name = "kubernetes-trivial";
- nodes = {
- master =
- { config, pkgs, lib, nodes, ... }:
- {
- virtualisation.memorySize = 768;
- services.kubernetes = {
- roles = ["master" "node"];
- dockerCfg = ''{"master:5000":{}}'';
- controllerManager.machines = ["master" "node"];
- apiserver.address = "0.0.0.0";
- verbose = true;
+ nodes = {
+ kubernetes =
+ { config, pkgs, lib, nodes, ... }:
+ {
+ virtualisation.memorySize = 768;
+ virtualisation.diskSize = 2048;
+
+ programs.bash.enableCompletion = true;
+
+ services.kubernetes.roles = ["master" "node"];
+ virtualisation.docker.extraOptions = "--iptables=false --ip-masq=false -b cbr0";
+
+ networking.bridges.cbr0.interfaces = [];
+ networking.interfaces.cbr0 = {};
};
- virtualisation.docker.extraOptions = "--iptables=false --ip-masq=false -b cbr0 --insecure-registry master:5000";
+ };
- services.etcd = {
- listenPeerUrls = ["http://0.0.0.0:7001"];
- initialAdvertisePeerUrls = ["http://master:7001"];
- initialCluster = ["master=http://master:7001" "node=http://node:7001"];
- };
- services.dockerRegistry.enable = true;
- services.dockerRegistry.host = "0.0.0.0";
- services.dockerRegistry.port = 5000;
+ testScript = ''
+ startAll;
- virtualisation.vlans = [ 1 2 ];
- networking.bridges = {
- cbr0.interfaces = [ "eth2" ];
- };
- networking.interfaces = {
- cbr0 = {
- ipAddress = "10.10.0.1";
- prefixLength = 24;
- };
- eth2.ip4 = lib.mkOverride 0 [ ];
- };
- networking.localCommands = ''
- ip route add 10.10.0.0/16 dev cbr0
- ip route flush cache
- '';
- networking.extraHosts = "127.0.0.1 master";
+ $kubernetes->waitUntilSucceeds("kubectl get nodes | grep kubernetes | grep Ready");
- networking.firewall.enable = false;
- #networking.firewall.allowedTCPPorts = [ 4001 7001 ];
-
- environment.systemPackages = [ pkgs.redis ];
- };
-
- node =
- { config, pkgs, lib, nodes, ... }:
- {
- services.kubernetes = {
- roles = ["node"];
- dockerCfg = ''{"master:5000":{}}'';
- kubelet.apiServers = ["master:8080"];
- verbose = true;
- };
- virtualisation.docker.extraOptions = "--iptables=false --ip-masq=false -b cbr0 --insecure-registry master:5000";
- services.etcd = {
- listenPeerUrls = ["http://0.0.0.0:7001"];
- initialAdvertisePeerUrls = ["http://node:7001"];
- initialCluster = ["master=http://master:7001" "node=http://node:7001"];
- };
-
- virtualisation.vlans = [ 1 2 ];
- networking.bridges = {
- cbr0.interfaces = [ "eth2" ];
- };
- networking.interfaces = {
- cbr0 = {
- ipAddress = "10.10.1.1";
- prefixLength = 24;
- };
- eth2.ip4 = lib.mkOverride 0 [ ];
- };
- networking.localCommands = ''
- ip route add 10.10.0.0/16 dev cbr0
- ip route flush cache
- '';
- networking.extraHosts = "127.0.0.1 node";
-
- networking.firewall.enable = false;
- #networking.firewall.allowedTCPPorts = [ 4001 7001 ];
-
- environment.systemPackages = [ pkgs.redis ];
- };
-
- client =
- { config, pkgs, nodes, ... }:
- {
- virtualisation.docker.enable = true;
- virtualisation.docker.extraOptions = "--insecure-registry master:5000";
- environment.systemPackages = [ pkgs.kubernetes ];
- environment.etc."test/redis-master-pod.yaml".source = redisMaster;
- environment.etc."test/pause".source = "${pkgs.kubernetes}/bin/kube-pause";
- environment.etc."test/Dockerfile".source = pkgs.writeText "Dockerfile" ''
- FROM scratch
- ADD pause /
- ENTRYPOINT ["/pause"]
- '';
- };
+ ${testSimplePod}
+ '';
};
- testScript = ''
- startAll;
+ cluster = let
+ runWithOpenSSL = file: cmd: pkgs.runCommand file {
+ buildInputs = [ pkgs.openssl ];
+ } cmd;
- $master->waitForUnit("kubernetes-apiserver.service");
- $master->waitForUnit("kubernetes-scheduler.service");
- $master->waitForUnit("kubernetes-controller-manager.service");
- $master->waitForUnit("kubernetes-kubelet.service");
- $master->waitForUnit("kubernetes-proxy.service");
+ ca_key = runWithOpenSSL "ca-key.pem" "openssl genrsa -out $out 2048";
+ ca_pem = runWithOpenSSL "ca.pem" ''
+ openssl req \
+ -x509 -new -nodes -key ${ca_key} \
+ -days 10000 -out $out -subj "/CN=etcd-ca"
+ '';
+ etcd_key = runWithOpenSSL "etcd-key.pem" "openssl genrsa -out $out 2048";
+ etcd_csr = runWithOpenSSL "etcd.csr" ''
+ openssl req \
+ -new -key ${etcd_key} \
+ -out $out -subj "/CN=etcd" \
+ -config ${openssl_cnf}
+ '';
+ etcd_cert = runWithOpenSSL "etcd.pem" ''
+ openssl x509 \
+ -req -in ${etcd_csr} \
+ -CA ${ca_pem} -CAkey ${ca_key} \
+ -CAcreateserial -out $out \
+ -days 365 -extensions v3_req \
+ -extfile ${openssl_cnf}
+ '';
- $node->waitForUnit("kubernetes-kubelet.service");
- $node->waitForUnit("kubernetes-proxy.service");
+ etcd_client_key = runWithOpenSSL "etcd-client-key.pem"
+ "openssl genrsa -out $out 2048";
- $master->waitUntilSucceeds("kubectl get minions | grep master");
- $master->waitUntilSucceeds("kubectl get minions | grep node");
+ etcd_client_csr = runWithOpenSSL "etcd-client-key.pem" ''
+ openssl req \
+ -new -key ${etcd_client_key} \
+ -out $out -subj "/CN=etcd-client" \
+ -config ${client_openssl_cnf}
+ '';
- $client->waitForUnit("docker.service");
- $client->succeed("tar cv --files-from /dev/null | docker import - nix");
- $client->succeed("docker tag nix master:5000/nix");
- $master->waitForUnit("docker-registry.service");
- $client->succeed("docker push master:5000/nix");
- $client->succeed("mkdir -p /root/pause");
- $client->succeed("cp /etc/test/pause /root/pause/");
- $client->succeed("cp /etc/test/Dockerfile /root/pause/");
- $client->succeed("cd /root/pause && docker build -t master:5000/pause .");
- $client->succeed("docker push master:5000/pause");
+ etcd_client_cert = runWithOpenSSL "etcd-client.crt" ''
+ openssl x509 \
+ -req -in ${etcd_client_csr} \
+ -CA ${ca_pem} -CAkey ${ca_key} -CAcreateserial \
+ -out $out -days 365 -extensions v3_req \
+ -extfile ${client_openssl_cnf}
+ '';
- subtest "simple pod", sub {
- $client->succeed("kubectl create -f ${redisMaster} -s http://master:8080");
- $client->waitUntilSucceeds("kubectl get pods -s http://master:8080 | grep redis-master | grep -i running");
- }
+ apiserver_key = runWithOpenSSL "apiserver-key.pem" "openssl genrsa -out $out 2048";
- '';
-})
+ apiserver_csr = runWithOpenSSL "apiserver.csr" ''
+ openssl req \
+ -new -key ${apiserver_key} \
+ -out $out -subj "/CN=kube-apiserver" \
+ -config ${apiserver_cnf}
+ '';
+
+ apiserver_cert = runWithOpenSSL "apiserver.pem" ''
+ openssl x509 \
+ -req -in ${apiserver_csr} \
+ -CA ${ca_pem} -CAkey ${ca_key} -CAcreateserial \
+ -out $out -days 365 -extensions v3_req \
+ -extfile ${apiserver_cnf}
+ '';
+
+ worker_key = runWithOpenSSL "worker-key.pem" "openssl genrsa -out $out 2048";
+
+ worker_csr = runWithOpenSSL "worker.csr" ''
+ openssl req \
+ -new -key ${worker_key} \
+ -out $out -subj "/CN=kube-worker" \
+ -config ${worker_cnf}
+ '';
+
+ worker_cert = runWithOpenSSL "worker.pem" ''
+ openssl x509 \
+ -req -in ${worker_csr} \
+ -CA ${ca_pem} -CAkey ${ca_key} -CAcreateserial \
+ -out $out -days 365 -extensions v3_req \
+ -extfile ${worker_cnf}
+ '';
+
+ openssl_cnf = pkgs.writeText "openssl.cnf" ''
+ [req]
+ req_extensions = v3_req
+ distinguished_name = req_distinguished_name
+ [req_distinguished_name]
+ [ v3_req ]
+ basicConstraints = CA:FALSE
+ keyUsage = digitalSignature, keyEncipherment
+ extendedKeyUsage = serverAuth
+ subjectAltName = @alt_names
+ [alt_names]
+ DNS.1 = etcd1
+ DNS.2 = etcd2
+ DNS.3 = etcd3
+ IP.1 = 127.0.0.1
+ '';
+
+ client_openssl_cnf = pkgs.writeText "client-openssl.cnf" ''
+ [req]
+ req_extensions = v3_req
+ distinguished_name = req_distinguished_name
+ [req_distinguished_name]
+ [ v3_req ]
+ basicConstraints = CA:FALSE
+ keyUsage = digitalSignature, keyEncipherment
+ extendedKeyUsage = clientAuth
+ '';
+
+ apiserver_cnf = pkgs.writeText "apiserver-openssl.cnf" ''
+ [req]
+ req_extensions = v3_req
+ distinguished_name = req_distinguished_name
+ [req_distinguished_name]
+ [ v3_req ]
+ basicConstraints = CA:FALSE
+ keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+ subjectAltName = @alt_names
+ [alt_names]
+ DNS.1 = kubernetes
+ DNS.2 = kubernetes.default
+ DNS.3 = kubernetes.default.svc
+ DNS.4 = kubernetes.default.svc.cluster.local
+ IP.1 = 10.10.10.1
+ '';
+
+ worker_cnf = pkgs.writeText "worker-openssl.cnf" ''
+ [req]
+ req_extensions = v3_req
+ distinguished_name = req_distinguished_name
+ [req_distinguished_name]
+ [ v3_req ]
+ basicConstraints = CA:FALSE
+ keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+ subjectAltName = @alt_names
+ [alt_names]
+ DNS.1 = kubeWorker1
+ DNS.2 = kubeWorker2
+ '';
+
+ etcdNodeConfig = {
+ virtualisation.memorySize = 128;
+
+ services = {
+ etcd = {
+ enable = true;
+ keyFile = etcd_key;
+ certFile = etcd_cert;
+ trustedCaFile = ca_pem;
+ peerClientCertAuth = true;
+ listenClientUrls = ["https://0.0.0.0:2379"];
+ listenPeerUrls = ["https://0.0.0.0:2380"];
+ };
+ };
+
+ environment.variables = {
+ ETCDCTL_CERT_FILE = "${etcd_client_cert}";
+ ETCDCTL_KEY_FILE = "${etcd_client_key}";
+ ETCDCTL_CA_FILE = "${ca_pem}";
+ ETCDCTL_PEERS = "https://127.0.0.1:2379";
+ };
+
+ networking.firewall.allowedTCPPorts = [ 2379 2380 ];
+ };
+
+ kubeConfig = {
+ virtualisation.diskSize = 2048;
+ programs.bash.enableCompletion = true;
+
+ services.flannel = {
+ enable = true;
+ network = "10.10.0.0/16";
+ iface = "eth1";
+ etcd = {
+ endpoints = ["https://etcd1:2379" "https://etcd2:2379" "https://etcd3:2379"];
+ keyFile = etcd_client_key;
+ certFile = etcd_client_cert;
+ caFile = ca_pem;
+ };
+ };
+
+ # vxlan
+ networking.firewall.allowedUDPPorts = [ 8472 ];
+
+ systemd.services.docker.after = ["flannel.service"];
+ systemd.services.docker.serviceConfig.EnvironmentFile = "/run/flannel/subnet.env";
+ virtualisation.docker.extraOptions = "--iptables=false --ip-masq=false --bip $FLANNEL_SUBNET";
+
+ services.kubernetes.verbose = true;
+ services.kubernetes.etcd = {
+ servers = ["https://etcd1:2379" "https://etcd2:2379" "https://etcd3:2379"];
+ keyFile = etcd_client_key;
+ certFile = etcd_client_cert;
+ caFile = ca_pem;
+ };
+
+ environment.systemPackages = [ pkgs.bind pkgs.tcpdump pkgs.utillinux ];
+ };
+
+ kubeMasterConfig = {pkgs, ...}: {
+ require = [kubeConfig];
+
+ # kube apiserver
+ networking.firewall.allowedTCPPorts = [ 443 ];
+
+ virtualisation.memorySize = 512;
+
+ services.kubernetes = {
+ roles = ["master"];
+ scheduler.leaderElect = true;
+ controllerManager.leaderElect = true;
+
+ apiserver = {
+ publicAddress = "0.0.0.0";
+ advertiseAddress = "192.168.1.8";
+ tlsKeyFile = apiserver_key;
+ tlsCertFile = apiserver_cert;
+ clientCaFile = ca_pem;
+ kubeletClientCaFile = ca_pem;
+ kubeletClientKeyFile = worker_key;
+ kubeletClientCertFile = worker_cert;
+ };
+ };
+ };
+
+ kubeWorkerConfig = { pkgs, ... }: {
+ require = [kubeConfig];
+
+ virtualisation.memorySize = 512;
+
+ # kubelet
+ networking.firewall.allowedTCPPorts = [ 10250 ];
+
+ services.kubernetes = {
+ roles = ["node"];
+ kubeconfig = {
+ server = "https://kubernetes:443";
+ caFile = ca_pem;
+ certFile = worker_cert;
+ keyFile = worker_key;
+ };
+ kubelet = {
+ tlsKeyFile = worker_key;
+ tlsCertFile = worker_cert;
+ };
+ };
+ };
+ in makeTest {
+ name = "kubernetes-cluster";
+
+ nodes = {
+ etcd1 = { config, pkgs, nodes, ... }: {
+ require = [etcdNodeConfig];
+ services.etcd = {
+ advertiseClientUrls = ["https://etcd1:2379"];
+ initialCluster = ["etcd1=https://etcd1:2380" "etcd2=https://etcd2:2380" "etcd3=https://etcd3:2380"];
+ initialAdvertisePeerUrls = ["https://etcd1:2380"];
+ };
+ };
+
+ etcd2 = { config, pkgs, ... }: {
+ require = [etcdNodeConfig];
+ services.etcd = {
+ advertiseClientUrls = ["https://etcd2:2379"];
+ initialCluster = ["etcd1=https://etcd1:2380" "etcd2=https://etcd2:2380" "etcd3=https://etcd3:2380"];
+ initialAdvertisePeerUrls = ["https://etcd2:2380"];
+ };
+ };
+
+ etcd3 = { config, pkgs, ... }: {
+ require = [etcdNodeConfig];
+ services.etcd = {
+ advertiseClientUrls = ["https://etcd3:2379"];
+ initialCluster = ["etcd1=https://etcd1:2380" "etcd2=https://etcd2:2380" "etcd3=https://etcd3:2380"];
+ initialAdvertisePeerUrls = ["https://etcd3:2380"];
+ };
+ };
+
+ kubeMaster1 = { config, pkgs, lib, nodes, ... }: {
+ require = [kubeMasterConfig];
+ };
+
+ kubeMaster2 = { config, pkgs, lib, nodes, ... }: {
+ require = [kubeMasterConfig];
+ };
+
+ # Kubernetes TCP load balancer
+ kubernetes = { config, pkgs, ... }: {
+ # kubernetes
+ networking.firewall.allowedTCPPorts = [ 443 ];
+
+ services.haproxy.enable = true;
+ services.haproxy.config = ''
+ global
+ log 127.0.0.1 local0 notice
+ user haproxy
+ group haproxy
+
+ defaults
+ log global
+ retries 2
+ timeout connect 3000
+ timeout server 5000
+ timeout client 5000
+
+ listen kubernetes
+ bind 0.0.0.0:443
+ mode tcp
+ option ssl-hello-chk
+ balance roundrobin
+ server kube-master-1 kubeMaster1:443 check
+ server kube-master-2 kubeMaster2:443 check
+ '';
+ };
+
+ kubeWorker1 = { config, pkgs, lib, nodes, ... }: {
+ require = [kubeWorkerConfig];
+ };
+
+ kubeWorker2 = { config, pkgs, lib, nodes, ... }: {
+ require = [kubeWorkerConfig];
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ ${testSimplePod}
+ '';
+ };
+}
diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix
index e793d89567b..a6a460fb0a7 100644
--- a/nixos/tests/login.nix
+++ b/nixos/tests/login.nix
@@ -33,10 +33,11 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }:
# Log in as alice on a virtual console.
subtest "virtual console login", sub {
- $machine->sleep(2); # urgh: wait for username prompt
+ $machine->waitUntilTTYMatches(2, "login: ");
$machine->sendChars("alice\n");
+ $machine->waitUntilTTYMatches(2, "login: alice");
$machine->waitUntilSucceeds("pgrep login");
- $machine->sleep(2); # urgh: wait for `Password:'
+ $machine->waitUntilTTYMatches(2, "Password: ");
$machine->sendChars("foobar\n");
$machine->waitUntilSucceeds("pgrep -u alice bash");
$machine->sendChars("touch done\n");
diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix
index 7605227100d..ade097597bb 100644
--- a/nixos/tests/prometheus.nix
+++ b/nixos/tests/prometheus.nix
@@ -10,7 +10,7 @@ import ./make-test.nix {
};
scrapeConfigs = [{
job_name = "prometheus";
- target_groups = [{
+ static_configs = [{
targets = [ "127.0.0.1:9090" ];
labels = { instance = "localhost"; };
}];
diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix
index 22a9e1bd2c7..041d88fbeae 100644
--- a/nixos/tests/sddm.nix
+++ b/nixos/tests/sddm.nix
@@ -19,8 +19,6 @@ import ./make-test.nix ({ pkgs, ...} : {
services.xserver.desktopManager.default = "none";
};
- enableOCR = true;
-
testScript = { nodes, ... }: ''
startAll;
$machine->waitForFile("/home/alice/.Xauthority");
diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix
index 35954471877..ddd34f1bfeb 100644
--- a/pkgs/applications/audio/a2jmidid/default.nix
+++ b/pkgs/applications/audio/a2jmidid/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, alsaLib, dbus, libjack2
-, pythonPackages}:
+, python2Packages}:
let
- inherit (pythonPackages) python dbus-python;
+ inherit (python2Packages) python dbus-python;
in stdenv.mkDerivation rec {
name = "a2jmidid-${version}";
version = "8";
diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix
new file mode 100644
index 00000000000..b86efe7eb97
--- /dev/null
+++ b/pkgs/applications/audio/audacious/qt-5.nix
@@ -0,0 +1,89 @@
+{
+ stdenv, lib, fetchurl,
+ gettext, makeQtWrapper, pkgconfig,
+ qtbase,
+ alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b,
+ libcddb, libcdio082, libcue, libjack2, libmad, libmcs, libmms, libmodplug,
+ libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp,
+ libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr,
+ wavpack
+}:
+
+let
+ version = "3.8.1";
+ sources = {
+ "audacious-${version}" = fetchurl {
+ url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
+ sha256 = "1k9blmgqia0df18l39bd2bbcwmjfxak6bd286vcd9zzmjhqs4qdc";
+ };
+
+ "audacious-plugins-${version}" = fetchurl {
+ url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
+ sha256 = "0f16ivcp8nd83r781hnw1qgbs9hi2b2v22zwv7c3sw3jq1chb70h";
+ };
+ };
+in
+
+stdenv.mkDerivation {
+ inherit version;
+ name = "audacious-${version}";
+
+ sourceFiles = lib.attrValues sources;
+ sourceRoots = lib.attrNames sources;
+
+ nativeBuildInputs = [
+ gettext makeQtWrapper pkgconfig
+ ];
+
+ buildInputs = [
+ # Core dependencies
+ qtbase
+
+ # Plugin dependencies
+ alsaLib curl faad2 ffmpeg flac fluidsynth gdk_pixbuf lame libbs2b libcddb
+ libcdio082 libcue libjack2 libmad libmcs libmms libmodplug libmowgli
+ libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile
+ libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack
+ ];
+
+ configureFlags = [ "--enable-qt" "--disable-gtk" ];
+
+ # Here we build both audacious and audacious-plugins in one
+ # derivations, since they really expect to be in the same prefix.
+ # This is slighly tricky.
+ builder = builtins.toFile "builder.sh" ''
+ sourceFiles=( $sourceFiles )
+ sourceRoots=( $sourceRoots )
+ for (( i=0 ; i < ''${#sourceFiles[*]} ; i++ )); do
+
+ (
+ src=''${sourceFiles[$i]}
+ sourceRoot=''${sourceRoots[$i]}
+ source $stdenv/setup
+ genericBuild
+ )
+
+ if [ $i == 0 ]; then
+ nativeBuildInputs="$out $nativeBuildInputs"
+ fi
+
+ done
+
+ source $stdenv/setup
+ wrapQtProgram $out/bin/audacious
+ wrapQtProgram $out/bin/audtool
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "Audio player";
+ homepage = http://audacious-media-player.org/;
+ maintainers = with maintainers; [ ttuegel ];
+ platforms = with platforms; linux;
+ license = with licenses; [
+ bsd2 bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING
+ gpl2 gpl3 lgpl2Plus #http://redmine.audacious-media-player.org/issues/46
+ ];
+ };
+}
diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix
index e19acab36b5..3b94235889c 100644
--- a/pkgs/applications/audio/bristol/default.nix
+++ b/pkgs/applications/audio/bristol/default.nix
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
xorg.xproto
];
+ patchPhase = "sed -i '41,43d' libbristolaudio/audioEngineJack.c"; # disable alsa/iatomic
+
+ configurePhase = "./configure --prefix=$out --enable-jack-default-audio --enable-jack-default-midi";
+
preInstall = ''
sed -e "s@\`which bristol\`@$out/bin/bristol@g" -i bin/startBristol
sed -e "s@\`which brighton\`@$out/bin/brighton@g" -i bin/startBristol
diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
index 1504cce1d58..871621d3bb1 100644
--- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, deadbeef, glib }:
stdenv.mkDerivation rec {
- version = "1.8";
name = "deadbeef-mpris2-plugin-${version}";
+ version = "1.10";
src = fetchurl {
url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${name}.tar.xz";
- sha256 = "1xg880zlxbqz7hs5g7xwc128l08j8c3isn45rdi138hi4fqbyjfi";
+ sha256 = "083fbvi06y85khr8hdm4rl5alxdanjbbyphizyr4hi93d7a0jg75";
};
nativeBuildInputs = [ pkgconfig ];
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "MPRISv2 plugin for the DeaDBeeF music player";
- homepage = https://github.com/Serranya/deadbeef-mpris2-plugin/;
+ homepage = "https://github.com/Serranya/deadbeef-mpris2-plugin/";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.abbradar ];
diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index 12099825757..5d4e19700d8 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -2,12 +2,12 @@
, libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }:
stdenv.mkDerivation rec {
- name = "distrho-ports-git-2015-07-18";
+ name = "distrho-ports-unstable-2016-06-26";
src = fetchgit {
url = "https://github.com/DISTRHO/DISTRHO-Ports.git";
- rev = "53458838505efef91ed069d0a7d970b6b3588eba";
- sha256 = "1wjzgy5yyi52fn4si2m8zrbbzqsh3p75avfx744jmxj5gpq5qa92";
+ rev = "e3969853ec9ba897c50ac060f0167313e2a18b29";
+ sha256 = "0id4p8dlnlv5271yvmyawfr754nzah7xhvjkj633lw5yr3mq707m";
};
patchPhase = ''
diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix
new file mode 100644
index 00000000000..36ce4049022
--- /dev/null
+++ b/pkgs/applications/audio/ecasound/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, fetchurl
+, alsaLib
+, audiofile
+, libjack2
+, liblo
+, liboil
+, libsamplerate
+, libsndfile
+, lilv
+, lv2
+}:
+
+# TODO: fix readline, ncurses, lilv, liblo, liboil and python. See configure log.
+
+stdenv.mkDerivation rec {
+ name = "ecasound-${version}";
+ version = "2.9.1";
+
+ src = fetchurl {
+ url = "http://ecasound.seul.org/download/ecasound-${version}.tar.gz";
+ sha256 = "1wyws3xc4f9pglrrqv6k9137sarv4asizqrxz8h0dn44rnzfiz1r";
+ };
+
+ buildInputs = [ alsaLib audiofile libjack2 liblo liboil libsamplerate libsndfile lilv lv2 ];
+
+ meta = {
+ description = "Ecasound is a software package designed for multitrack audio processing";
+ license = with stdenv.lib.licenses; [ gpl2 lgpl21 ];
+ homepage = http://nosignal.fi/ecasound/;
+ };
+}
diff --git a/pkgs/applications/audio/faust/faust2ladspa.nix b/pkgs/applications/audio/faust/faust2ladspa.nix
new file mode 100644
index 00000000000..67de98cab9a
--- /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/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix
index 00b6c3e0c67..bdac87aaf37 100644
--- a/pkgs/applications/audio/fomp/default.nix
+++ b/pkgs/applications/audio/fomp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lv2, pkgconfig, python }:
+{ stdenv, fetchurl, lv2, pkgconfig, python2 }:
stdenv.mkDerivation rec {
name = "fomp-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5";
};
- buildInputs = [ lv2 pkgconfig python ];
+ buildInputs = [ lv2 pkgconfig python2 ];
installPhase = ''
python waf configure --prefix=$out
diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix
index 4cb7668a43f..ea83a1012eb 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.2";
src = fetchurl {
url = "http://ftp.daper.net/pub/soft/moc/stable/moc-${version}.tar.bz2";
- sha256 = "14b0g9jn12jzxsf292g64dc6frlxv99kaagsasmc8xmg80iab7nj";
+ sha256 = "026v977kwb0wbmlmf6mnik328plxg8wykfx9ryvqhirac0aq39pk";
};
+ 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/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy-gmusic/default.nix
index 6984593cd41..850e7abaef0 100644
--- a/pkgs/applications/audio/mopidy-gmusic/default.nix
+++ b/pkgs/applications/audio/mopidy-gmusic/default.nix
@@ -2,14 +2,19 @@
pythonPackages.buildPythonApplication rec {
name = "mopidy-gmusic-${version}";
- version = "1.0.0";
+ version = "2.0.0";
src = fetchurl {
url = "https://github.com/mopidy/mopidy-gmusic/archive/v${version}.tar.gz";
- sha256 = "0yfilzfamy1bxnmgb1xk56jrk4sz0i7vcnc0a8klrm9sc7agnm9i";
+ sha256 = "1xryw2aixfza3brxlgjdlg0lghlb17g7kay9zy56mlzp0jr7m87j";
};
- propagatedBuildInputs = [ mopidy pythonPackages.requests2 pythonPackages.gmusicapi ];
+ propagatedBuildInputs = [
+ mopidy
+ pythonPackages.requests2
+ pythonPackages.gmusicapi
+ pythonPackages.cachetools
+ ];
doCheck = false;
diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix
index 9217bc285bc..a7252b9e28a 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/pkgs/applications/audio/non/default.nix
@@ -4,12 +4,12 @@
stdenv.mkDerivation rec {
name = "non-${version}";
- version = "2016-04-05";
+ version = "2016-12-07";
src = fetchFromGitHub {
owner = "original-male";
repo = "non";
- rev = "16885e69fe865495dc32d869d1454ab148b0dca6";
- sha256 = "1nwzzgcdpbqh5kjvz40yy5nmzvpp8gcr9biyhhwi68s5bsg972ss";
+ rev = "754d113b0e3144a145d50bde8370ff2cae98169c";
+ sha256 = "04h67vy966vys6krgjsxd7dph4z46r8c6maw1hascxlasy3bhhk0";
};
buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile
diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix
index 8f71c848f18..dbf3cd92b5d 100644
--- a/pkgs/applications/audio/pamix/default.nix
+++ b/pkgs/applications/audio/pamix/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "pamix-${version}";
- version = "1.4.1";
+ version = "1.5";
src = fetchFromGitHub {
owner = "patroclos";
repo = "pamix";
- rev = "v${version}";
- sha256 = "06pxpalzynb8z7qwhkfs7sj823k9chdmpyj40rp27f2znf2qga19";
+ rev = version;
+ sha256 = "1d6b0iv8p73bwq88kdaanm4igvmp9rkq082vyaxpc67mz398yjbp";
};
nativeBuildInputs = [ autoreconfHook autoconf-archive pkgconfig ];
diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix
index b8213f4d9f4..631a5701591 100644
--- a/pkgs/applications/audio/puddletag/default.nix
+++ b/pkgs/applications/audio/puddletag/default.nix
@@ -2,19 +2,20 @@
let
pypkgs = python2Packages;
+ pname = "puddletag";
in pypkgs.buildPythonApplication rec {
- name = "puddletag-${version}";
- version = "1.1.1";
+ name = "${pname}-${version}";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "keithgg";
- repo = "puddletag";
- rev = version;
- sha256 = "0zmhc01qg64fb825b3kj0mb0r0d9hms30nqvhdks0qnv7ahahqrx";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz";
};
- sourceRoot = "${name}-src/source";
+ sourceRoot = "${pname}-v${version}-src/source";
disabled = pypkgs.isPy3k; # work to support python 3 has not begun
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index 00856721f95..dd3a0b4a1c6 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, intltool
+{ stdenv, fetchurl, python2Packages, intltool
, gst_python, withGstPlugins ? false, gst_plugins_base ? null
, gst_plugins_good ? null, gst_plugins_ugly ? null, gst_plugins_bad ? null }:
@@ -9,7 +9,7 @@ assert withGstPlugins -> gst_plugins_base != null
let
version = "2.6.3";
- inherit (pythonPackages) buildPythonApplication python mutagen pygtk pygobject2 dbus-python;
+ inherit (python2Packages) buildPythonApplication python mutagen pygtk pygobject2 dbus-python;
in buildPythonApplication {
# call the package quodlibet and just quodlibet
name = "quodlibet${stdenv.lib.optionalString withGstPlugins "-with-gst-plugins"}-${version}";
diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix
new file mode 100644
index 00000000000..d429d545234
--- /dev/null
+++ b/pkgs/applications/audio/sisco.lv2/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, lv2, pkgconfig, mesa, cairo, pango, libjack2 }:
+
+let
+ name = "sisco.lv2-${version}";
+ version = "0.7.0";
+
+ robtkVersion = "80a2585253a861c81f0bfb7e4579c75f5c73af89";
+ robtkName = "robtk-${robtkVersion}";
+
+ src = fetchFromGitHub {
+ owner = "x42";
+ repo = "sisco.lv2";
+ rev = "v${version}";
+ sha256 = "1r6g29yqbdqgkh01x6d3nvmvc58rk2dp94fd0qyyizq37a1qplj1";
+ };
+
+ robtkSrc = fetchFromGitHub {
+ owner = "x42";
+ repo = "robtk";
+ rev = robtkVersion;
+ sha256 = "0gk16nrvnrffqqw0yd015kja9wkgbzvb648bl1pagriabhznhfxl";
+ };
+in
+stdenv.mkDerivation rec {
+ inherit name;
+
+ srcs = [ src robtkSrc ];
+ sourceRoot = "sisco.lv2-${src.rev}-src";
+
+ buildInputs = [ pkgconfig lv2 pango cairo libjack2 mesa ];
+
+ postUnpack = "chmod u+w -R ${robtkName}-src; mv ${robtkName}-src/* ${sourceRoot}/robtk";
+ sisco_VERSION = version;
+ preConfigure = "makeFlagsArray=(PREFIX=$out)";
+
+ meta = with stdenv.lib; {
+ description = "Simple audio oscilloscope with variable time scale, triggering, cursors and numeric readout in LV2 plugin format";
+ homepage = http://x42.github.io/sisco.lv2/;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.e-user ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix
new file mode 100644
index 00000000000..c6609814ea0
--- /dev/null
+++ b/pkgs/applications/audio/soundscape-renderer/default.nix
@@ -0,0 +1,51 @@
+{ stdenv
+, fetchgit
+, autoreconfHook
+, help2man
+, pkgconfig
+, libsndfile
+, fftwFloat
+, libjack2
+, libxml2
+, qt4
+, boost
+, ecasound
+, glibcLocales
+, mesa # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL
+}:
+
+stdenv.mkDerivation rec {
+ name = "soundscape-renderer-unstable-${version}";
+
+ version = "2016-11-03";
+
+ src = fetchgit {
+ url = https://github.com/SoundScapeRenderer/ssr;
+ rev = "0dd0136dd24e47b63d8a4e05de467f5c7b047ec9";
+ sha256 = "095x2spv9bmg6pi71mpajnghbqj58ziflg16f9854awx0qp9d8x7";
+ };
+
+ # Without it doesn't find all of the boost libraries.
+ BOOST_LIB_DIR="${boost}/lib";
+
+ LC_ALL = "en_US.UTF-8";
+
+ buildInputs = [ autoreconfHook boost boost.dev ecasound mesa help2man pkgconfig libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ];
+
+ # 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53
+ # 2) Make it find ecasound headers
+ # 3) Fix locale for help2man
+ prePatch = ''
+ substituteInPlace configure.ac --replace 'git describe ||' 'git describe 2> /dev/null ||';
+ substituteInPlace configure.ac --replace '/{usr,opt}/{,local/}' '${ecasound}/'
+ substituteInPlace man/Makefile.am --replace '--locale=en' '--locale=en_US.UTF-8'
+ '';
+
+ meta = {
+ homepage = http://spatialaudio.net/ssr/;
+ description = "The SoundScape Renderer (SSR) is a tool for real-time spatial audio reproduction";
+ license = stdenv.lib.licenses.gpl3;
+ maintainer = stdenv.lib.maintainers.fridh;
+ };
+
+}
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 0cc0740eddb..a1a4d26e2a0 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux";
let
# Please update the stable branch!
- version = "1.0.38.171.g5e1cd7b2-22";
+ version = "1.0.45.182.gbbd5909f-72";
deps = [
alsaLib
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
src =
fetchurl {
url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
- sha256 = "0mhrbcw92g11czwcclnbwz1pk1jgap4xlya7dqsrcyb50azmv450";
+ sha256 = "0vpwwla5vrx5ryx434a486l8vcgr1vxh28ri6ab4f28xrz16ipys";
};
buildInputs = [ dpkg makeWrapper ];
diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/applications/audio/ssrc/default.nix
new file mode 100644
index 00000000000..fa2b54d0e8a
--- /dev/null
+++ b/pkgs/applications/audio/ssrc/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "ssrc";
+ name = "${pname}-${version}";
+ version = "1.33";
+
+ src = fetchFromGitHub {
+ owner = "shibatch";
+ repo = "SSRC";
+ rev = "4adf75116dfc0ef709fef74a0e2f3360bd15007f";
+ sha256 = "0hgma66v7sszkpz5jkyscj0q6lmjfqdwf1hw57535c012pa2vdrh";
+ };
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp ssrc ssrc_hp $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A high quality audio sampling rate converter";
+ longDescription = ''
+ This program converts sampling rates of PCM wav files. This
+ program also has a function to apply dither to its output and
+ extend perceived dynamic range.
+
+ Sampling rates of 44.1kHz and 48kHz are popularly used, but the
+ ratio between these two frequencies is 147:160, which are not
+ small numbers. As a result, sampling rate conversion without
+ degradation of sound quality requires filter with very large
+ order, and it is difficult to have both quality and speed. This
+ program quickly converts between these sampling frequencies
+ without audible degradation.
+ '';
+
+ version = "${version}";
+ homepage = "http://shibatch.sourceforge.net/";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ leenaars];
+ platforms = with platforms; [ linux ] ;
+ };
+}
diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix
index 90e7d41a97b..d7072e96163 100644
--- a/pkgs/applications/audio/svox/default.nix
+++ b/pkgs/applications/audio/svox/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "svox-${version}";
- version = "2016-01-25";
+ version = "2016-10-20";
src = fetchgit {
url = "https://android.googlesource.com/platform/external/svox";
- rev = "dfb9937746b1828d093faf3b1494f9dc403f392d";
- sha256 = "1gkfj5avikzmr2vv8bhf83n15jcbz4phz5j13l0qnh3gjzh4f1bk";
+ rev = "2dd8f16e4436520b93e93aa72b92acad92c0127d";
+ sha256 = "064h3zb9bn1z6xbv15iy6l4rlxx8fqzy54s898qvafjhz6kawj9g";
};
postPatch = ''
diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix
index b6c658636bb..1a125de0a87 100644
--- a/pkgs/applications/backup/crashplan/default.nix
+++ b/pkgs/applications/backup/crashplan/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }:
let
- version = "4.7.0";
- rev = "2"; #tracks unversioned changes that occur on download.code42.com from time to time
+ version = "4.8.0";
+ rev = "1"; #tracks unversioned changes that occur on download.code42.com from time to time
in stdenv.mkDerivation rec {
name = "crashplan-${version}-r${rev}";
crashPlanArchive = fetchurl {
url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz";
- sha256 = "1vi6dqf8kc90axrgdcf6rwnhynxgxkc0qn6pbdp2gvkxdqxrprn8";
+ sha256 = "117k9yx10n4lc0hkx0j48f19km0jrdgfq6xmbmhv3v73zbx21axs";
};
srcs = [ crashPlanArchive ];
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
description = "An online/offline backup solution";
homepage = "http://www.crashplan.org";
license = licenses.unfree;
- maintainers = with maintainers; [ sztupi domenkozar ];
+ maintainers = with maintainers; [ sztupi domenkozar jerith666 ];
};
buildInputs = [ makeWrapper cpio ];
@@ -43,7 +43,6 @@ in stdenv.mkDerivation rec {
install -d -m 755 unpacked $out
- install -D -m 644 EULA.txt $out/EULA.txt
install -D -m 644 run.conf $out/bin/run.conf
install -D -m 755 scripts/CrashPlanDesktop $out/bin/CrashPlanDesktop
install -D -m 755 scripts/CrashPlanEngine $out/bin/CrashPlanEngine
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 3f8d5aec4aa..9fd56a49b5f 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -57,7 +57,7 @@ let
meta = with stdenv.lib; {
description = "QML based X11 display manager";
- homepage = https://github.com/sddm/sddm;
+ homepage = "https://github.com/sddm/sddm";
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ttuegel ];
};
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 4e16ceedbbb..2e14ae339cf 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -10,9 +10,15 @@
, gnutar
, gzip
, jdk
+, fontconfig
+, freetype
, libpulseaudio
, libX11
+, libXext
+, libXi
, libXrandr
+, libXrender
+, libXtst
, makeWrapper
, pciutils
, pkgsi686Linux
@@ -27,8 +33,8 @@
let
- version = "2.1.3.0";
- build = "143.3101438";
+ version = "2.2.3.0";
+ build = "145.3537739";
androidStudio = stdenv.mkDerivation {
name = "android-studio";
@@ -75,11 +81,23 @@ let
# For Android emulator
libpulseaudio
libX11
+ libXext
+ libXrender
+ libXtst
+ libXi
+ freetype
+ fontconfig
]}" --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb"
'';
src = fetchurl {
url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
- sha256 = "1xlz3ibqrm4ckw4lgbkzbxvpgg0y8hips9b54p4d15f34i0r8bvj";
+ sha256 = "10fmffkvvbnmgjxb4rq7rjwnn16jp5phw6div4n7hh2ad6spf8wq";
+ };
+ meta = {
+ description = "The Official IDE for Android";
+ homepage = https://developer.android.com/studio/index.html;
+ license = stdenv.lib.licenses.asl20;
+ platforms = [ "x86_64-linux" ];
};
};
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index a044f82baaf..58eb2e568c1 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, lib, makeWrapper, gvfs, atomEnv }:
+{ stdenv, fetchurl, lib, makeWrapper, gvfs, atomEnv, libXScrnSaver, libxkbfile }:
stdenv.mkDerivation rec {
name = "atom-${version}";
- version = "1.11.2";
+ version = "1.12.7";
src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
- sha256 = "1mvlj1j0hyvm5di95nn0x99lm5arw2amm1s1va1m73zss3bzlhpm";
+ sha256 = "1kkw6wixri8iddnmscza1d4riq4m9yr78y0d9y76vdnxarma0bfq";
name = "${name}.deb";
};
@@ -21,7 +21,9 @@ stdenv.mkDerivation rec {
rm -r $out/share/lintian
rm -r $out/usr/
wrapProgram $out/bin/atom \
- --prefix "PATH" : "${gvfs}/bin"
+ --prefix "PATH" : "${gvfs}/bin" \
+ --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \
+ --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libxkbfile ]}/libxkbfile.so.1
fixupPhase
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index bc3f7b064d4..1ad97a0f764 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -83,16 +83,16 @@ rec {
acejump = buildEclipsePlugin rec {
name = "acejump-${version}";
- version = "1.0.0.201501181511";
+ version = "1.0.0.201610261941";
srcFeature = fetchurl {
url = "https://tobiasmelcher.github.io/acejumpeclipse/features/acejump.feature_${version}.jar";
- sha256 = "127xqrnns4h96g21c9zg0iblxprx3fg6fg0w5f413rf84415z884";
+ sha256 = "1szswjxp9g70ibfbv3p8dlq1bngq7nc22kp657z9i9kp8309md2d";
};
srcPlugin = fetchurl {
url = "https://tobiasmelcher.github.io/acejumpeclipse/plugins/acejump_${version}.jar";
- sha256 = "0mz79ca32yryidd1wijirvnmfg4j5q4g84vdspdi56z0r4xrja13";
+ sha256 = "1cn64xj2bm69vnn9db2xxh6kq148v83w5nx3183mrqb59ym3v9kf";
};
meta = with stdenv.lib; {
@@ -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; {
@@ -403,16 +403,16 @@ rec {
testng = buildEclipsePlugin rec {
name = "testng-${version}";
- version = "6.9.12.201607091356";
+ version = "6.9.13.201609291640";
srcFeature = fetchurl {
url = "http://beust.com/eclipse-old/eclipse_${version}/features/org.testng.eclipse_${version}.jar";
- sha256 = "06c6885d3ggg1i085zhfwayj06jn4v1jip9zz40921vpq0iand54";
+ sha256 = "02wzcysl7ga3wnvnwp6asl8d77wgc547c5qqawixw94lw6fn1a15";
};
srcPlugin = fetchurl {
url = "http://beust.com/eclipse-old/eclipse_${version}/plugins/org.testng.eclipse_${version}.jar";
- sha256 = "0bpyb9bnh8kglajmdzb7pr21i1sly73kwdjbygg75ad7z37l58br";
+ sha256 = "1j4zw6392q3q6z3pcy803k3g0p220gk1x19fs99p0rmmdz83lc8d";
};
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 ef006439a55..6b51f117ad8 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/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 2e050d730fc..9118344f024 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -175,10 +175,10 @@
}) {};
auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "auctex";
- version = "11.89.6";
+ version = "11.89.7";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/auctex-11.89.6.tar";
- sha256 = "1lfaki8s9ri6ds88mhpxwqb2jrjf7hbs1w3nxhg307344lac07gy";
+ url = "https://elpa.gnu.org/packages/auctex-11.89.7.tar";
+ sha256 = "03sxdh6dv4m98yq09hxcph2lgidai8ky22i9acjcp6vfjlsb9mlf";
};
packageRequires = [];
meta = {
@@ -335,10 +335,10 @@
company = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "company";
- version = "0.9.0";
+ version = "0.9.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/company-0.9.0.tar";
- sha256 = "1d090j1xv97nbxzz0iq4gmzjijggm8wsd0y1zfsa8syrq8qa0ajs";
+ url = "https://elpa.gnu.org/packages/company-0.9.2.tar";
+ sha256 = "10divixs06gq9nm8s8x0q12ir07y27d06l52ix2dn84zvj853z4z";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -619,10 +619,10 @@
el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }:
elpaBuild {
pname = "el-search";
- version = "1.0.1";
+ version = "1.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/el-search-1.0.1.tar";
- sha256 = "14l7zq4bm5ihybpj8qvqpzzmgjsyhr8yq2d4jmadk35q5hlx1cbb";
+ url = "https://elpa.gnu.org/packages/el-search-1.2.tar";
+ sha256 = "0sz78kn9nx390aq5wqz174p8ppw987rzsh892ly166qz4ikwys5a";
};
packageRequires = [ emacs stream ];
meta = {
@@ -712,10 +712,10 @@
}) {};
exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild {
pname = "exwm";
- version = "0.11";
+ version = "0.12";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/exwm-0.11.tar";
- sha256 = "108n09b6512y05rskq754hzwc5nzqmkq1lfrarl34my41wsc1qnf";
+ url = "https://elpa.gnu.org/packages/exwm-0.12.tar";
+ sha256 = "1h964w9ir8plam45c194af74g5q1wdvgwrldlmlcplcswlsn3n4z";
};
packageRequires = [ xelb ];
meta = {
@@ -967,6 +967,19 @@
license = lib.licenses.free;
};
}) {};
+ json-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+ pname = "json-mode";
+ version = "0.1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/json-mode-0.1.el";
+ sha256 = "025bwpx7nc1qhdyf2yaqjdr6x1qr6q45776yvy427xdh4nbk054l";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/json-mode.html";
+ license = lib.licenses.free;
+ };
+ }) {};
jumpc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "jumpc";
version = "3.0";
@@ -1351,10 +1364,10 @@
}) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
- version = "20161102";
+ version = "20161214";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/org-20161102.tar";
- sha256 = "12v9jhakdxcmlw9zrcrh1fwi3kh6z0qva90hpnr0zjqyj72i0wir";
+ url = "https://elpa.gnu.org/packages/org-20161214.tar";
+ sha256 = "0pa9d0l6axif5wlzi7lvxl0fpjwwvc79cy9d37z7md4hxyjdvwzm";
};
packageRequires = [];
meta = {
@@ -1703,10 +1716,10 @@
}) {};
spinner = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "spinner";
- version = "1.7.1";
+ version = "1.7.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/spinner-1.7.1.el";
- sha256 = "1fmwzdih0kbyvs8bn38mpm4sbs2mikqy2vdykfy9g20wpa8vb681";
+ url = "https://elpa.gnu.org/packages/spinner-1.7.3.el";
+ sha256 = "19kp1mmndbmw11sgvv2ggfjl4pyf5zrsbh3871f0965pw9z8vahd";
};
packageRequires = [];
meta = {
@@ -1901,15 +1914,15 @@
license = lib.licenses.free;
};
}) {};
- validate = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+ validate = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }:
elpaBuild {
pname = "validate";
- version = "1.0.0";
+ version = "1.0.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/validate-1.0.0.el";
- sha256 = "10js4qds5xi5a89s4v4fz6f71b25g3x8jm1lcpf9s75i1q1xiysk";
+ url = "https://elpa.gnu.org/packages/validate-1.0.2.el";
+ sha256 = "19xhd9mxkdcisspz5q3bnvf6jjsvmhjjrpw3pq5lgyqbcz8k8dsr";
};
- packageRequires = [ cl-lib emacs ];
+ packageRequires = [ cl-lib emacs seq ];
meta = {
homepage = "https://elpa.gnu.org/packages/validate.html";
license = lib.licenses.free;
@@ -2049,10 +2062,10 @@
xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "xelb";
- version = "0.11";
+ version = "0.12";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/xelb-0.11.tar";
- sha256 = "12qgbv30dizp7kadq9kg7nfyg5qfbfy14s833zg95fqqa87qg90j";
+ url = "https://elpa.gnu.org/packages/xelb-0.12.tar";
+ sha256 = "0i9n0f3ibj4a5pwcsvwrah9m0fz32m0x6a9wsmjn3li20v8pcb81";
};
packageRequires = [ cl-generic emacs ];
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 3130ded9f62..b61f26446a9 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -316,12 +316,12 @@
ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }:
melpaBuild {
pname = "ac-clang";
- version = "20150906.1008";
+ version = "20161202.725";
src = fetchFromGitHub {
owner = "yaruopooner";
repo = "ac-clang";
- rev = "6b3365063ddfb88d5527618217bb56166349ad4e";
- sha256 = "0n9zagwh3rz7b76irj4ya8wskffns9v1c1pivsdqgpd76spvl7n5";
+ rev = "ad75d193bb8962136e1ecac04d33352dd70fb72e";
+ sha256 = "0pchbhcs3bjf8r6f24lcf29in011502ncr2gi72faww6iz0pb285";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang";
@@ -380,8 +380,8 @@
src = fetchFromGitHub {
owner = "emacs-eclim";
repo = "emacs-eclim";
- rev = "f2247f2515ee2eb0ff866bcbbf69d9f62b7b7780";
- sha256 = "1d3zyaqgng0q41nnifmwwwwd9bm0w7yhkpj6lwir3m0pg5lrcw48";
+ rev = "7d3beb299399bc9d8190190fa59943b2a70a7f63";
+ sha256 = "14q0qg9a1kxgf89iy48g63nkj7m9hydipmqq670591v09awk877l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim";
@@ -464,8 +464,8 @@
src = fetchFromGitHub {
owner = "xiaohanyu";
repo = "ac-geiser";
- rev = "cecfcf1a5c4be580b9337d9f4f9337c6ae1e0d91";
- sha256 = "0zaia963kpnqmlxafp0m0jibzz6fvvjj7f1v4lcwb9cvs2b7vq1m";
+ rev = "502d18a8a0bd4b5fdd495a99299ba2a632c5cd9a";
+ sha256 = "0h2kakb4f5hgzf5l2kpqngalcmc4402lkg1pvs88c8z4rqp2vfvz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/586ef409e3ae758b459b625d4bf0108f0525a085/recipes/ac-geiser";
@@ -737,8 +737,8 @@
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "7f82b4f1dbe0992a1b939e9ce359f12f1eb6482a";
- sha256 = "0gfhg7rji735j31xibvimx7v7w337zvrlxzj18qxzymnimhx1843";
+ rev = "fa4a79892e1097db28dce7ba4058e68998228ddd";
+ sha256 = "055hf8shm4b15gvr7cq72laqd87alhmi5pkadbia9ccb8y3m2508";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -754,12 +754,12 @@
ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
melpaBuild {
pname = "ac-php-core";
- version = "20160819.2147";
+ version = "20161213.2320";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "7f82b4f1dbe0992a1b939e9ce359f12f1eb6482a";
- sha256 = "0gfhg7rji735j31xibvimx7v7w337zvrlxzj18qxzymnimhx1843";
+ rev = "fa4a79892e1097db28dce7ba4058e68998228ddd";
+ sha256 = "055hf8shm4b15gvr7cq72laqd87alhmi5pkadbia9ccb8y3m2508";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -880,12 +880,12 @@
ace-isearch = callPackage ({ ace-jump-mode, avy, emacs, fetchFromGitHub, fetchurl, helm-swoop, lib, melpaBuild }:
melpaBuild {
pname = "ace-isearch";
- version = "20160927.330";
+ version = "20161107.1730";
src = fetchFromGitHub {
owner = "tam17aki";
repo = "ace-isearch";
- rev = "b8c59511d7ff13ed050a80be372121d9cba9e160";
- sha256 = "1flfskn0bsz0mxfys0ipn20355v20d48l8mgf41wb49kvnnd1bmz";
+ rev = "33b98ecdb3d5a966cbfc0ec7b104be5afca14f25";
+ sha256 = "05a5jf9lx1g5cms5p1js7qxria5dfm310m83zmvwcdr96mfbz9ii";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/344f0cf784a027cde196b7d766024fb415fa1968/recipes/ace-isearch";
@@ -985,12 +985,12 @@
ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-link";
- version = "20160925.1210";
+ version = "20161203.1059";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "ace-link";
- rev = "822628e39345b77f9444fdfc17bd660b7831e536";
- sha256 = "002wi64awig3kdyihqdisxsfaiailyjw90ah9j1i6qqasgvm9acn";
+ rev = "3691a0ca4d897d1b5f51795a14dc33b4ee48dd4a";
+ sha256 = "0yhy6cq19zllc8cycpq5assdgdmhl77ybs7xr3q99m0jqx20g5xx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link";
@@ -1173,12 +1173,12 @@
addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "addressbook-bookmark";
- version = "20160925.22";
+ version = "20161130.150";
src = fetchFromGitHub {
owner = "thierryvolpiatto";
repo = "addressbook-bookmark";
- rev = "53732af6e225976f8d51c971041eed4320987c36";
- sha256 = "0qnh9bk5xgggh80wylzq06alxkj22y9p8lixncjanwhygh80vv3s";
+ rev = "ad3c73369b804a48803fdfdf2ab613e6220260de";
+ sha256 = "012kfqkmpagn8jrp09acpx631qmjim7b33j0pahv1fcqhin89pn6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a497aec6e27efa627068542cae5a16c01c3c6d3c/recipes/addressbook-bookmark";
@@ -1261,8 +1261,8 @@
src = fetchFromGitHub {
owner = "Wilfred";
repo = "ag.el";
- rev = "2427786228f13f5893a8513d4837d14d1a1b375f";
- sha256 = "0jwdgpinz4as7npg7fhqycy6892p6i5g0gp5dd0n2n5r40gh620n";
+ rev = "7b7c2d03e10968c6726f8a59ab25fcac0c147fba";
+ sha256 = "06nglpfz4xvjgkfxx1g1vhcm846kfb56pqxv3a8l0rd0fqyaziyi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag";
@@ -1299,12 +1299,12 @@
aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aggressive-indent";
- version = "20161016.1016";
+ version = "20161201.1001";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "aggressive-indent-mode";
- rev = "a8c462fbc03ef74e65f4d4a323ae3581f99e9683";
- sha256 = "00j7mvzn1qsbk5xcw4h2wzwp1wzjvdn9qa3s0laa9x33k6kpxbha";
+ rev = "dfdf3b23d147a3b4d5e8ed80ee9ea098f65ca48c";
+ sha256 = "01rb57qamwyaip3ar81vdxyri0s4vpbvpyphhcijin0a8ny33qwa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent";
@@ -1319,11 +1319,11 @@
}) {};
ahg = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "ahg";
- version = "20161010.9";
+ version = "20161110.455";
src = fetchhg {
url = "https://bitbucket.com/agriggio/ahg";
- rev = "5d878053fcbd";
- sha256 = "1jisl6nh3c75fyzmr3azpf5sp8cdcfw8hd4aczbrgpjbii6127np";
+ rev = "0e1d1b4142e7";
+ sha256 = "09606q8b9qhz1szshv8aapc7450j085rjf2fv769vbivr3kshqvh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ahg";
@@ -1423,12 +1423,12 @@
alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "alchemist";
- version = "20161002.2144";
+ version = "20161122.2304";
src = fetchFromGitHub {
owner = "tonini";
repo = "alchemist.el";
- rev = "5693e5a7b1d75faee0dd424cd89fd20b3b9d77f6";
- sha256 = "1cim833y3xh2s0vz3zawxbybb1yri8qmfhhk3iqbiw2w9gg2y4qs";
+ rev = "26762b767419b13211e331251def9159ee3f8c6b";
+ sha256 = "1bss5rgdp37zy4rlyx7j6rngrp9q2ijyr54n5z0r8asmd913r73q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist";
@@ -1444,12 +1444,12 @@
alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "alda-mode";
- version = "20160322.0";
+ version = "20161213.1359";
src = fetchFromGitHub {
owner = "jgkamat";
repo = "alda-mode";
- rev = "f75173f4cb86259503ff4950e450e3fa7a37a808";
- sha256 = "00s6z6f9nlqw528ppbwsglh9wshw8cpg2g102ywdsl28bwy3wvgj";
+ rev = "d8fcdc769d6b6b0729943b7dee2c85cf8ca3551b";
+ sha256 = "0660kfhaf7q82a5zp48938z7ddl47mhdwa3rfk1xzbh84xbd9hc2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -1528,12 +1528,12 @@
all-ext = callPackage ({ all, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "all-ext";
- version = "20160604.1501";
+ version = "20161214.2250";
src = fetchFromGitHub {
owner = "rubikitch";
repo = "all-ext";
- rev = "2639955833132451679feae8a54ca157c1d864ce";
- sha256 = "0g5g0nhq76v8jbhs38si6abwn4zv9qh7jl87qhhy3in8s1inswzf";
+ rev = "a441c10ef99df2a639dfd9e8892cb6080db40730";
+ sha256 = "1fvha7gkr0ll6dnpp7rb5v6w11i03rbd74g18fd8x0vdi6lw7j10";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/all-ext";
@@ -1553,8 +1553,8 @@
src = fetchFromGitHub {
owner = "domtronn";
repo = "all-the-icons.el";
- rev = "a7ef8e703c17c978a82f442c88d250371c5e06f7";
- sha256 = "0gfa1a17wwp66jl0v6pbp9fcn45kp3jsvpd7ha4j590ijikz2yv4";
+ rev = "b2d923e51d23e84198e21b025c656bf862eaced6";
+ sha256 = "0j5230nas9h6rn4wfsaf5pgd3yxxk615j68y2j01pjrrkxvrwqig";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -1567,15 +1567,36 @@
license = lib.licenses.free;
};
}) {};
+ all-the-icons-dired = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "all-the-icons-dired";
+ version = "20161203.605";
+ src = fetchFromGitHub {
+ owner = "jtbm37";
+ repo = "all-the-icons-dired";
+ rev = "3ccab8ae4113e03ff2c7b103d388fa6ec1447d9c";
+ sha256 = "0rbcbhsw5js9wx29pp65s7q6mxhbz1jskhvzl0k4gqlk4m6gqcxq";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/cf8e432e3cd316ffeb7e0b68b855e23bcc3b9491/recipes/all-the-icons-dired";
+ sha256 = "0fbl3i3wi2ka43xri0i30x561115hmv3j75vpkyzz3g1m9w006br";
+ name = "all-the-icons-dired";
+ };
+ packageRequires = [ all-the-icons emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/all-the-icons-dired";
+ license = lib.licenses.free;
+ };
+ }) {};
amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }:
melpaBuild {
pname = "amd-mode";
- version = "20161103.139";
+ version = "20161124.550";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "amd-mode.el";
- rev = "01c487419f2785a4573bdd7e49800414a6f83fe7";
- sha256 = "0fxca3mg3335n4frl332ng1zndw1j3dski7gwa4j4pixc2ihi02m";
+ rev = "977b53e28b3141408fff4814be8b67ee23650cac";
+ sha256 = "0m80bwar80qsga735cqrn6rbvfz4w9a036zh8inhsigylv3vwqjv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode";
@@ -1621,12 +1642,12 @@
ample-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ample-theme";
- version = "20161002.1640";
+ version = "20161213.912";
src = fetchFromGitHub {
owner = "jordonbiondo";
repo = "ample-theme";
- rev = "7546ab41c4c106be7b781a8c351abfb59fe95078";
- sha256 = "124kxhp7q4ddlj4nhjn8y2w3s08ln8am49cwjvwsvrfliz87n9kq";
+ rev = "8fbae3a9965f933c487f4cfdf2d881753d9feeb1";
+ sha256 = "0knzfxdncb1x41zqknv70p62zwr4k5nxf8l108x9w043drxc10lw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d448c03202137a461ed814ce87acfac23faf676e/recipes/ample-theme";
@@ -1663,12 +1684,12 @@
anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild {
pname = "anaconda-mode";
- version = "20161028.29";
+ version = "20161121.1137";
src = fetchFromGitHub {
owner = "proofit404";
repo = "anaconda-mode";
- rev = "ae336344e61c1d38480ec230d85efbe2cb17980f";
- sha256 = "1776s0gf9283amskmaqnpcpflqgvzk87n5qcishiczxijdymry7y";
+ rev = "4f84759cab7746cf705f75719e701551d47de1e3";
+ sha256 = "1sra3blrdkw4yd3ivsyg64vgd8207clfpqhjchja0x2n3z8792v5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -1934,12 +1955,12 @@
ansible-vault = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ansible-vault";
- version = "20161008.1435";
+ version = "20161115.1128";
src = fetchFromGitHub {
owner = "zellio";
repo = "ansible-vault-mode";
- rev = "57fd8017ab93cc6a1f9bbc795d494a069557a1cb";
- sha256 = "04sdgg98z9gydgx8sf4nfmkwazm799gyvywssfa0mkcvza2z7s21";
+ rev = "f4d9b3a77490071b8c59caa473bb54df86e90362";
+ sha256 = "0f6dmj3b57sy6xl6d50982lnsin0lzyjwk0q1blpz0h2imadr8qm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault";
@@ -2060,11 +2081,11 @@
anything = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "anything";
- version = "20160822.1852";
+ version = "20161207.238";
src = fetchgit {
url = "http://repo.or.cz/r/anything-config.git";
- rev = "86560874b1c77932502efd42727b783ebc2d173b";
- sha256 = "1ng89ajvhrzbp7cfpb6vhq7507ybi18gicn0j89m3yrl7vfiwx4n";
+ rev = "43e88980a29618dc03f96ce38b67b2a7caadd9d9";
+ sha256 = "0dcaqss1b3myn8b4xfpyhnp9h2xniainayflhhgdk88y7vbfx0j7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e1700e86cb35617178f5d7c61c88718ac7849f9b/recipes/anything";
@@ -2344,6 +2365,27 @@
license = lib.licenses.free;
};
}) {};
+ apib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
+ melpaBuild {
+ pname = "apib-mode";
+ version = "20161201.817";
+ src = fetchFromGitHub {
+ owner = "w-vi";
+ repo = "apib-mode";
+ rev = "940fb1faecb4b0a460ed36de5551a59ebd1edf58";
+ sha256 = "0sny3jv4amfc3lx45j1di2snp42xfl907q3l7frqhhsal57lkvd1";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ebb04f975d8226a76260895399c937d6a1940/recipes/apib-mode";
+ sha256 = "0y3n0xmyc4gkypq07v4sp0i6291qaj2m13zkg6mxp61zm669v2fb";
+ name = "apib-mode";
+ };
+ packageRequires = [ emacs markdown-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/apib-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
apples-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "apples-mode";
@@ -2429,12 +2471,12 @@
apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "apropospriate-theme";
- version = "20160724.1010";
+ version = "20161207.1248";
src = fetchFromGitHub {
owner = "waymondo";
repo = "apropospriate-theme";
- rev = "cddb2a40688b1dac8e0c62595bdffc0c6b5d40a3";
- sha256 = "0h8rrh34mqms27c2nq5f7k93kjvcv9qj0z9f1jjibvxrcw9lpp4y";
+ rev = "5a5bbbb1f6a82efb19b0a75deea4c6b1d52347a1";
+ sha256 = "0nfpvb20jy9h8g1i7agz153cdvw45sxifsryngfxnnmxd6s6pdmn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
@@ -2449,10 +2491,10 @@
}) {};
apu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "apu";
- version = "20151231.1208";
+ version = "20161210.842";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/apu.el";
- sha256 = "1xbvky0mspmbi8ghqhqhgbjn70acipwf0qwn6s5zdarwch10nljj";
+ sha256 = "0knmp8kryndpag0hy3mjbhmw9spvi6kzmx0s215m0lbiqzzibgwz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ad04078221946c9d6b758809ec03ff88efce7322/recipes/apu";
@@ -2675,12 +2717,12 @@
assess = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
melpaBuild {
pname = "assess";
- version = "20161012.753";
+ version = "20161203.327";
src = fetchFromGitHub {
owner = "phillord";
repo = "assess";
- rev = "e2e5f1cbbdeb4bdeb7a474f0ec1b038c3786b1ef";
- sha256 = "1pv8q88f5aj6qxqv0n8knfb3gk079wgk6l0nkch8518pq00vwnif";
+ rev = "47ce039423f660174d097698615aaad6c77e87fb";
+ sha256 = "16b0fdz1nj25bkzb3hyarwa2zgk23dn9598a4ljbr9smdl2pdv6b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f917a34506193f2674b195569dfd3c13ba62c1d/recipes/assess";
@@ -2700,8 +2742,8 @@
src = fetchFromGitHub {
owner = "jwiegley";
repo = "emacs-async";
- rev = "82428780ec96e18ae801783f8d7388749fafd5fa";
- sha256 = "17kznp00gs162b205q8mzy6abcf3jrmnqfb1vdv86rk1gzsr483q";
+ rev = "54977d6c596a295f7519a0da36407c3a3e055b36";
+ sha256 = "1kzah2714nppaai8cckvbryq6b10fwp025fv3kzjspf3sjf5ijva";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6a0fe448e82f42cad0fdaa40c964032892fedd83/recipes/async";
@@ -2780,12 +2822,12 @@
atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }:
melpaBuild {
pname = "atomic-chrome";
- version = "20161106.1438";
+ version = "20161213.730";
src = fetchFromGitHub {
owner = "alpha22jp";
repo = "atomic-chrome";
- rev = "439b669b10b671f5795fd5557abfbc30e0d6fbb4";
- sha256 = "1bwng9qdys5wx0x9rn4nak92qpspfsb04xrl0p3szl5izz427cb6";
+ rev = "1b96d563c5d435baf8dfa9cdae5ef38ce34629b9";
+ sha256 = "0caiv0snjxj0f1p0rx18r1w4nbsk8shrin2dr2ddg54mpxzf8r98";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome";
@@ -2864,12 +2906,12 @@
aurel = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aurel";
- version = "20161023.122";
+ version = "20161214.825";
src = fetchFromGitHub {
owner = "alezost";
repo = "aurel";
- rev = "a77e8afd1cc34a1f042be7b1c34a17eb699d826a";
- sha256 = "0r4z97n99gh62yn21b2zzs4bc85hwbnyi4x1gllyrrmmb6qjg1lr";
+ rev = "122c10cf6359b6d353d7ac4e1cb9776f285853ee";
+ sha256 = "0i9ganx0n0dmy9p8xgd6mk0qxzw99y893f3nl61dah4yrcmlhcg7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d1612acd2cf1fea739739608113923ec51d307e9/recipes/aurel";
@@ -3323,12 +3365,12 @@
auto-indent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "auto-indent-mode";
- version = "20160426.2022";
+ version = "20161118.1458";
src = fetchFromGitHub {
owner = "mattfidler";
repo = "auto-indent-mode.el";
- rev = "9a0f13d93ad25b6e6b97fd566ec74ef5b6c60254";
- sha256 = "1ya7lnlgrxwrbaxlkl0bbz2m8pic6yjln0dm1mcmr9mjglp8kh6y";
+ rev = "7e939f3a7b092c6c32c97d63fd88aef6cc355cdb";
+ sha256 = "18c9469b53kwydhrpd8kivwvs0w0ndfbwkyxixjz9wijp0wmpri1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/49af78177278e7072c70fde0eaa5bb82490ebe9d/recipes/auto-indent-mode";
@@ -3425,12 +3467,12 @@
auto-save-buffers-enhanced = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "auto-save-buffers-enhanced";
- version = "20130607.1949";
+ version = "20161108.2310";
src = fetchFromGitHub {
owner = "kentaro";
repo = "auto-save-buffers-enhanced";
- rev = "caf594120781a323ac37eab82bcf87f1ed4c9c42";
- sha256 = "10aw3bpvawkqj1l8brvzq057wx3mkzpxs4zc3yhppkhq2cpvx7i2";
+ rev = "461e8c816c1b7c650be5f209078b381fe55da8c6";
+ sha256 = "0ckjijjpqpbv9yrqfnl3x9hcdwwdgvm5r2vyx1a9nk4d3i0hd9i5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d221a217e9f6a686fa2a8b120a1f0b43c4482ce6/recipes/auto-save-buffers-enhanced";
@@ -3467,12 +3509,12 @@
auto-virtualenv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pyvenv, s }:
melpaBuild {
pname = "auto-virtualenv";
- version = "20160220.636";
+ version = "20161107.1001";
src = fetchFromGitHub {
owner = "marcwebbie";
repo = "auto-virtualenv";
- rev = "e55bf927da4e29b0f4d9198f3358a87f9970c3b6";
- sha256 = "1ya5rn55sclh2w5bjy4b2b75gd6bgavfqmhdisz6afp8w4l4a2bv";
+ rev = "d352bc4c9d76cb2e1680846f13bae940931d8380";
+ sha256 = "1yb1g8xmh5mgkszcch2z7rzmrywl8zyyy7j8ff1agvz0ic4b9893";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ccb91515d9a8195061429ed8df3471867d211f9a/recipes/auto-virtualenv";
@@ -3799,12 +3841,12 @@
avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
melpaBuild {
pname = "avy-migemo";
- version = "20161005.720";
+ version = "20161129.621";
src = fetchFromGitHub {
owner = "momomo5717";
repo = "avy-migemo";
- rev = "591102f3826b1ab0731866a4926e708e6fc014cc";
- sha256 = "0cwrk8iaibd280w4c5yr0swfglsx9fwjqqshky2m1fc5kf332vpv";
+ rev = "f7861aa9607c0f05b3336443df5380a6daba0485";
+ sha256 = "0vxam51g7r4wixw7w8frk1af6m5n7bswjbjya77dnwxcizgwiq6m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo";
@@ -3880,11 +3922,11 @@
axiom-environment = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "axiom-environment";
- version = "20161106.509";
+ version = "20161120.1200";
src = fetchhg {
url = "https://bitbucket.com/pdo/axiom-environment";
- rev = "4d70a7ec2429";
- sha256 = "1dmixpwsl2qsiy6c0vspi1fwvgwisw84vhijhmbkfpzrqrp1lkwc";
+ rev = "110e20a7a86c";
+ sha256 = "0s18bbfw4kcv9iij1016pamq394rg8xr7016qp6cxyklp9hivcdm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/axiom-environment";
@@ -3900,12 +3942,12 @@
babel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "babel";
- version = "20160629.1151";
+ version = "20161122.2340";
src = fetchFromGitHub {
owner = "juergenhoetzel";
repo = "babel";
- rev = "bf860f4594f06729b3ff5da2102ec9e3ab8a5ccb";
- sha256 = "1d5v21ig92w30dllhp2cqbjqma2l0l87cjqqlx721qx15zfhxxxb";
+ rev = "d4212e25fcbd22b8e38be13936f937a2963d34a9";
+ sha256 = "0lxiavjs2fbwlqbmkl2hssjzv8a8baa8vvqqfnprhnipngkkgdaf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b0d748fa06b3cbe336cb01a7e3ed7b0421d885cc/recipes/babel";
@@ -4135,12 +4177,12 @@
basic-c-compile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "basic-c-compile";
- version = "20160803.527";
+ version = "20161114.2134";
src = fetchFromGitHub {
owner = "nick96";
repo = "basic-c-compile";
- rev = "69e1ce9078a1a54beddc6c9f786cdd521a3717bf";
- sha256 = "0r1ygnkvl3b61qw5lsji3434f2dkbsfkc1fk6rl355am9ssn3vr6";
+ rev = "ccdbb2fcb605e285ca39c1781ab1e583e90f7558";
+ sha256 = "03hsg0n2hvsqiziblpjal9saiyhcizldn9bkpk3cqh2bipg1fjys";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bdf8a23771774f630baa41b24375cb57f90fbb2e/recipes/basic-c-compile";
@@ -4820,12 +4862,12 @@
bind-map = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bind-map";
- version = "20160606.1343";
+ version = "20161207.711";
src = fetchFromGitHub {
owner = "justbur";
repo = "emacs-bind-map";
- rev = "6e1ba6edbd5a29991698806e775288fb3de2b186";
- sha256 = "1d3nknz6ibxlcm1989lv2b4d4r0d67kpgm03aamcisnxq9d1g9r2";
+ rev = "bf4181e3a41463684adfffc6c5c305b30480e30f";
+ sha256 = "0vrk17yg3jbww92p433p64ijmjf7cjg2wmzi9w418235w1xdfzz8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f58800af5965a6e7c9314aa00e971196ea0d036e/recipes/bind-map";
@@ -4943,27 +4985,6 @@
license = lib.licenses.free;
};
}) {};
- bitly = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "bitly";
- version = "20151125.848";
- src = fetchFromGitHub {
- owner = "jorgenschaefer";
- repo = "bitly-el";
- rev = "fca9d8da070402fa62d9289e56f7f1c5ce40f664";
- sha256 = "09blh9cbcbqr3pdaiwm9fmh5kzqm1v9mffy623z3jn87g5wadrmb";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e6b1161d39ba66577ad57d76e4f4ea84e604002f/recipes/bitly";
- sha256 = "032s7ax8qp3qzcj1njbyyxiyadjirphswqdlr45zj6hzajfsr247";
- name = "bitly";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/bitly";
- license = lib.licenses.free;
- };
- }) {};
blackboard-bold-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "blackboard-bold-mode";
@@ -5045,6 +5066,27 @@
license = lib.licenses.free;
};
}) {};
+ bln-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "bln-mode";
+ version = "20161210.610";
+ src = fetchFromGitHub {
+ owner = "mgrachten";
+ repo = "bln-mode";
+ rev = "74563279cb98e42d8649bff53229d5f89a5fb5e0";
+ sha256 = "0mjlbih1dnfmqy41jgs37b8yi39mqwppw7yn5pgdyh8lzr1qh9vw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ee12ef97df241b7405feee69c1e66b3c1a67204b/recipes/bln-mode";
+ sha256 = "0w4abaqx9gz04ls1hn1qz8qg9jpvi80b9jb597ddjcbnwqq9z83r";
+ name = "bln-mode";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/bln-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
blockdiag-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "blockdiag-mode";
@@ -5132,12 +5174,12 @@
bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bog";
- version = "20161024.1828";
+ version = "20161109.1647";
src = fetchFromGitHub {
owner = "kyleam";
repo = "bog";
- rev = "a6b566a4eca0dcc89a7d2af42e057b4e2561189d";
- sha256 = "1y3i9wcvxj1s7hyxb3ni0p7hmdlln1h3a1h2ddgkjw5yv2vq768q";
+ rev = "cf7817de3f37ce2404ee637a655f1a511b829585";
+ sha256 = "0h166w8bg864ppwg64m0vhg649mmkclld85zcd0lmbqa9wfml5j5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog";
@@ -5215,10 +5257,10 @@
}) {};
bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "bookmark-plus";
- version = "20161027.926";
+ version = "20161211.1601";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
- sha256 = "06621js3bvslfmzmkphzzcrd8hbixin2nx30ammcqaa6572y14ad";
+ sha256 = "05jf7rbaxfxrlmk2vq09p10mj80p529raqfy3ajsk8adgqsxw1lr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/bookmark+";
@@ -5255,12 +5297,12 @@
boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
melpaBuild {
pname = "boon";
- version = "20161106.723";
+ version = "20161125.448";
src = fetchFromGitHub {
owner = "jyp";
repo = "boon";
- rev = "dea1f7e830b38e6b70db5a318eaa269f417444d4";
- sha256 = "0f6yrls2l37rpq932n7h5fr6688vsk32my300z66mszcqfvmr566";
+ rev = "981d5becae30a31b6ef4f87680386148d0535455";
+ sha256 = "0755qhf0h7m18hwv6lkpgi0jcrcm58w4l3815m3kl86q1yz2mpda";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -5444,12 +5486,12 @@
browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "browse-at-remote";
- version = "20161018.858";
+ version = "20161207.2252";
src = fetchFromGitHub {
owner = "rmuslimov";
repo = "browse-at-remote";
- rev = "f55bb2abdc139b8da0cb5c9764388bb5ad24e9d8";
- sha256 = "04sv02mfjn3gvqpln0x7z5wa8w0dd2khv277jb84ifvy8bmchd2g";
+ rev = "396f6ca23e3a6d12cd3af4651d8130a5baf10e2b";
+ sha256 = "0d4lhaqwralv790ry6g84q0nk243dkaybf1nynr8kp0njhdif6k1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/203e177f09eac4ebb8c7e3532bd82f749f8e2607/recipes/browse-at-remote";
@@ -5793,12 +5835,12 @@
bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bui";
- version = "20161023.113";
+ version = "20161213.735";
src = fetchFromGitHub {
owner = "alezost";
repo = "bui.el";
- rev = "c1bc2a1cd7e43d51915dd736af299632061515b2";
- sha256 = "0yncgymgcdp2g094f5f6n46326gv647997i5kafii8snc0y2nxyl";
+ rev = "b8f2fcfcdf4eff7fb502e75f25a2e6d974c3ca01";
+ sha256 = "1s7iigrdbdgavigssi2j82dky6cjahnrsnq9m9i5nvczj5xjdnpq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui";
@@ -5961,12 +6003,12 @@
buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buttercup";
- version = "20160514.34";
+ version = "20161209.154";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "emacs-buttercup";
- rev = "5db07c940e3acbd20111391c72edfa847e7a5409";
- sha256 = "1928m4368rrcsg242nk3i06fdd6r03aiwh8iz589j00w4761y4kq";
+ rev = "07c525eaf9c1a9f1b48928b64e1802b1f1b25be3";
+ sha256 = "1l4hjb21283mrb9v67k2xl83plq18ri7pqcp2kgs2ygbfnbwwqcs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -6320,7 +6362,7 @@
version = "20151009.845";
src = fetchsvn {
url = "http://caml.inria.fr/svn/ocaml/trunk/emacs/";
- rev = "16552";
+ rev = "16555";
sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw";
};
recipeFile = fetchurl {
@@ -6358,12 +6400,12 @@
cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
melpaBuild {
pname = "cargo";
- version = "20161107.426";
+ version = "20161116.35";
src = fetchFromGitHub {
owner = "kwrooijen";
repo = "cargo.el";
- rev = "059b1ca83e58a4ced0a0f1cd1b4e06525fdc257a";
- sha256 = "15bgxdz65wywkckwm9rxf595hc8gabqb2015hwp1n9pa8k511jkg";
+ rev = "fb19a7e66f8478578edf7be71dadc1d75876248d";
+ sha256 = "0ksliwv8f2dhrgr423qn4zjmwm37v3hh5wpbfbz6ij6c2lrhx6j4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
@@ -6425,8 +6467,8 @@
src = fetchFromGitHub {
owner = "cask";
repo = "cask";
- rev = "58f641960bcb152b33fcd27d41111291702e2da6";
- sha256 = "1sl094adnchjvf189c3l1njawrj5ww1sv5vvjr9hb1ng2rw20z7b";
+ rev = "0a2e8436e02af6ca688b25ba90a19505a6113296";
+ sha256 = "1fjsss678dj6vikm0ig5jqksjlwgnwhpaqfy3dk56gnjc49nl29v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask";
@@ -6530,8 +6572,8 @@
src = fetchFromGitHub {
owner = "skk-dev";
repo = "ddskk";
- rev = "d0d80ff47a2d39969c7091aa594fd51f21953b07";
- sha256 = "0mwfbd99kv4cb6ba50swll944vcrdsbs4hy2kkcsff8n84pbap17";
+ rev = "4b69fa39539eec2c1cea5ba11ddf9cf20363a500";
+ sha256 = "0lh2dqmdy76ibp78pjsxvlm7j0649v7bqfifw9a5mfvwzlkihs85";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc";
@@ -6572,8 +6614,8 @@
src = fetchFromGitHub {
owner = "skk-dev";
repo = "ddskk";
- rev = "d0d80ff47a2d39969c7091aa594fd51f21953b07";
- sha256 = "0mwfbd99kv4cb6ba50swll944vcrdsbs4hy2kkcsff8n84pbap17";
+ rev = "4b69fa39539eec2c1cea5ba11ddf9cf20363a500";
+ sha256 = "0lh2dqmdy76ibp78pjsxvlm7j0649v7bqfifw9a5mfvwzlkihs85";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb";
@@ -6759,8 +6801,8 @@
src = fetchFromGitHub {
owner = "cfengine";
repo = "core";
- rev = "3726a19cb9b33abf3ae7b760902637ed40051836";
- sha256 = "05mfldh44j07wslbz3hq874amfld42vwkg70f0966rmlh1nz3rwm";
+ rev = "334d1fc9b5638725ac7454dee5e95ea4f6ba8793";
+ sha256 = "1n8bz9j5qwkbyfp4jf5wr1injwybwnm66hp2rlfqnlrf9w54pyi2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -6799,7 +6841,7 @@
version = "20160801.615";
src = fetchsvn {
url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
- rev = "11867";
+ rev = "11922";
sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl";
};
recipeFile = fetchurl {
@@ -6919,12 +6961,12 @@
chatwork = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "chatwork";
- version = "20150807.1948";
+ version = "20161121.555";
src = fetchFromGitHub {
owner = "ataka";
repo = "chatwork";
- rev = "7a1def04735423d47e058a8137e859391a6aaf7e";
- sha256 = "1r2s3fszblk5wa6v3hnbzsri550gi5qsmp2w1spvmf1726n900cb";
+ rev = "70b41451e2d2751e634e84e0452b34c558463fe4";
+ sha256 = "11h76qc2n2p8yz941drmi0rp13xmmlacikfygdv1n7s730ja0hgy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/77ae72e62b8771e890525c063522e7091ca8f674/recipes/chatwork";
@@ -6982,12 +7024,12 @@
chee = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "chee";
- version = "20161105.1306";
+ version = "20161212.1525";
src = fetchFromGitHub {
owner = "eikek";
repo = "chee";
- rev = "04d2104286ca6b92dcc28e448eeadfcc8fb7b548";
- sha256 = "0lwp2hh8rxg1f98hzpdrz91snwryp9fqin9sch1vnyxywfp3g9kc";
+ rev = "979279d9b15a1885b0e0c3143a9e422f98c11b9c";
+ sha256 = "0jp4ivzbdpk4wzhj4qy4fr7zn45plnfmirl0ylrb4hiwqd7kwbd8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9f4a3775720924e5a292819511a8ea42efe1a7dc/recipes/chee";
@@ -7150,12 +7192,12 @@
chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
melpaBuild {
pname = "chinese-pyim";
- version = "20161106.1712";
+ version = "20161123.1614";
src = fetchFromGitHub {
owner = "tumashu";
repo = "chinese-pyim";
- rev = "b210c0d5275e1e8c0b78bed186cc18fc27061dd4";
- sha256 = "1jixkb7jw07lykbfv022ccnys4xypcbv03f9bxl2r16wizzymvvd";
+ rev = "68d73adfe17a51c3e2ce8e5e3a0efd5ae800d32f";
+ sha256 = "02j722h445ibdy1g6fxpsk8hb3d1f41cncibygqppp4nr0rqkfc3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim";
@@ -7378,12 +7420,12 @@
cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
melpaBuild {
pname = "cider";
- version = "20161016.424";
+ version = "20161201.757";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "cider";
- rev = "3be082ae4a3d0b40d360648b20fb7caa14c0a9fc";
- sha256 = "00c0674gxwwn8ijg2g61mq546bzwh142cj16lm960zq2rnbc0ia0";
+ rev = "d19cf7d9d36c93eda56e1de63705a9c6c92e92ef";
+ sha256 = "1hn6kzbz3n1jxfsv23m49b0rjjzh7inf4klm31avhyndgas3bvgn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -7504,12 +7546,12 @@
ciel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ciel";
- version = "20160809.310";
+ version = "20161213.2141";
src = fetchFromGitHub {
owner = "cs14095";
repo = "ciel.el";
- rev = "ebe6dc68aeed627b88dafd170b023121f7def0d4";
- sha256 = "1z2hsbfkml5psj47b4i83grn96q85mpqll95nqb3n98hyc6da90a";
+ rev = "bf0c83ff06e229a15aabfa132237b7d4a05abcbe";
+ sha256 = "1967vgfmi0asa7zwhzwpp63hhckp4wcmdxwbpi7rixhqp521cp7k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9c70c007a557ea9fb9eb4d3f8b7adbe4dac39c8a/recipes/ciel";
@@ -7567,12 +7609,12 @@
circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circe";
- version = "20161104.1348";
+ version = "20161118.414";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "8a42bf93e38b6437f1da5bf4d0f6de8ad9a85fef";
- sha256 = "1rrc440hqxl7fi8f437clz169n6vacqfs5pmc7ni5m65k9kqm1fa";
+ rev = "e549f0a7f8c6a39cc3129581b85682e3977d2bdd";
+ sha256 = "16c45hb216b3r214p8v7zzlpz26s39lc9fmjl6ll3jwvqpq19kb1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -7654,8 +7696,8 @@
version = "20161004.253";
src = fetchsvn {
url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
- rev = "286103";
- sha256 = "09109zh6dx1af4jqdrc448wb5rmjgm6k6630l4z931aqwfw004kx";
+ rev = "289815";
+ sha256 = "1vbngm8xf7i8f3140y0dk704vagcws6is9waj9qsy6yg0vxmqp0y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format";
@@ -7860,12 +7902,12 @@
clj-refactor = callPackage ({ cider, clojure-mode, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }:
melpaBuild {
pname = "clj-refactor";
- version = "20161005.344";
+ version = "20161211.1451";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clj-refactor.el";
- rev = "8bacd65fb89a530f8e72b5ee78593e7dfcef57e3";
- sha256 = "1pj72q9mqjj22h5cplxgplp1wcljcyg46ni8j6xh3ys3j8bs3jyp";
+ rev = "1b49cddfff0420aa5f1ca7b6d1753b4e1d35cb7d";
+ sha256 = "0ywvww3r3lb90hi41ngkxgxxw2y7kigr2a31nbbg2b6h508r44qr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
@@ -7998,12 +8040,12 @@
clojars = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }:
melpaBuild {
pname = "clojars";
- version = "20160518.2135";
+ version = "20161109.1448";
src = fetchFromGitHub {
owner = "joshuamiller";
repo = "clojars.el";
- rev = "7243d901afa5c8d209df7c4e6a62fb2828703aaf";
- sha256 = "15hnjxc7xczidn3fl88zkb8868r0v1892pvhgzpwkh3biailfq5h";
+ rev = "8f4ca8a283d4e9acaab912bb7217ffb5800b01a7";
+ sha256 = "1j7ib7iyv4l8f3cgzyqz7jpwwa1bml343imqj5ynr7jzasv7pz52";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7f766319c3e18a41017684ea503b0382e96ab31b/recipes/clojars";
@@ -8040,12 +8082,12 @@
clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clojure-mode";
- version = "20161105.2359";
+ version = "20161215.49";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
- rev = "3f67fdaeade3a99dc4f481596dfb396d4fee06a9";
- sha256 = "1v170j8c3z1431zdrd3cygr4j72jlgihgzbgij6dkci8rmsldb6h";
+ rev = "fe76682dba2b8b231c664d2e0903a791996d89a1";
+ sha256 = "01qvw35wsjlydfdcymy81vcv07j5rmh4zrsy17v6q09n7sz4kg8a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8065,8 +8107,8 @@
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
- rev = "3f67fdaeade3a99dc4f481596dfb396d4fee06a9";
- sha256 = "1v170j8c3z1431zdrd3cygr4j72jlgihgzbgij6dkci8rmsldb6h";
+ rev = "fe76682dba2b8b231c664d2e0903a791996d89a1";
+ sha256 = "01qvw35wsjlydfdcymy81vcv07j5rmh4zrsy17v6q09n7sz4kg8a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8121,27 +8163,48 @@
license = lib.licenses.free;
};
}) {};
- clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ clomacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clomacs";
- version = "20160920.42";
+ version = "20161124.552";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clomacs";
- rev = "b4e2379b1360d777514fbacf20002aeb7c34adf6";
- sha256 = "0829phiki2fh95q9s2hqz12hhn1wprbl2vnczr02j3vqhdv992vz";
+ rev = "0938671fef3311c5d7c1e46e06d5264e98254c96";
+ sha256 = "08qaw7g5mldi886hr0i46wihmij2sip81bdj9p8r4zmvm1gxly00";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs";
sha256 = "1vfjzrzp58ap75i0dh5bwnlkb8qbpfmrd3fg9n6aaibvvd2m3hyh";
name = "clomacs";
};
- packageRequires = [ cider emacs ];
+ packageRequires = [];
meta = {
homepage = "https://melpa.org/#/clomacs";
license = lib.licenses.free;
};
}) {};
+ closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "closql";
+ version = "20161130.925";
+ src = fetchFromGitHub {
+ owner = "emacscollective";
+ repo = "closql";
+ rev = "8b063e70808049210b749164b8f22f56924b9949";
+ sha256 = "1qhm8zmidinr35lk0pff6nla3d05cqf81hjb55yrwvdvyr5gyl1k";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql";
+ sha256 = "13ybna20w2d1b3n0y5p1ybhkw0j0zh5nd43p1yvf8h1haj983l87";
+ name = "closql";
+ };
+ packageRequires = [ emacs emacsql-sqlite ];
+ meta = {
+ homepage = "https://melpa.org/#/closql";
+ license = lib.licenses.free;
+ };
+ }) {};
closure-lint-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "closure-lint-mode";
@@ -8187,12 +8250,12 @@
clues-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clues-theme";
- version = "20140922.2056";
+ version = "20161213.327";
src = fetchFromGitHub {
owner = "jasonm23";
repo = "emacs-clues-theme";
- rev = "69d873c90fbf24590c765309b7fb55cd14bb6bda";
- sha256 = "0fnl3b62clg9llcs2l511sxp4yishan4pqk45sqp8ih4rdzvy7ar";
+ rev = "abd61f2b7f3e98de58ca26e6d1230e70c6406cc7";
+ sha256 = "118k5bnlk9sc2n04saaxjncmc1a4m1wlf2y7xyklpffkazbd0m72";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bf43125306df445ac829c2edb98dd608bc1407de/recipes/clues-theme";
@@ -8250,12 +8313,12 @@
cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }:
melpaBuild {
pname = "cmake-ide";
- version = "20161023.1225";
+ version = "20161203.804";
src = fetchFromGitHub {
owner = "atilaneves";
repo = "cmake-ide";
- rev = "16449deab6d160c7f0d3d0e50013b6606e958138";
- sha256 = "0fhahc1c8a7qdndgj4gp1lkxw6k80m8ajab8z9w4r8793gbvdrd8";
+ rev = "379f8a45e6a210da53b7ee76f081420f371a2c2f";
+ sha256 = "189pvk3kgay05s671dq4xsqvvylz7rl38djr3hw5finjkrb26rkf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -8275,8 +8338,8 @@
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
- rev = "9df1cb0fa68869f8125025f20fa8c64467aab2e8";
- sha256 = "0p3xi5jhz0k6hf1nx6srfaidckwlw2bcsvb63q9bbchaap17lpia";
+ rev = "517c7cca8c856546a93454cf0cf98fe6bad3f856";
+ sha256 = "0hami0cq0sqakh98qw39iyv93jdpwxi0j2frc37az9y2zimbbcwr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8310,22 +8373,22 @@
license = lib.licenses.free;
};
}) {};
- cmd-to-echo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ cmd-to-echo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shell-split-string }:
melpaBuild {
pname = "cmd-to-echo";
- version = "20161105.505";
+ version = "20161203.1333";
src = fetchFromGitHub {
owner = "mallt";
repo = "cmd-to-echo";
- rev = "b8915d5f0a79767c29f38ccb7b4416390436e932";
- sha256 = "1z79pd169ml8cx6rzyv8gbivdcg49g4s0w4cabw85rv45fd7rpfa";
+ rev = "e0e874fc0e1ad6d291e39ed76023445297ad438a";
+ sha256 = "0wi097yk9p1xcfmps1g58xvvlv60akwky4y0pxdz6pa31w9jd1q8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d559cee8b263d3615f48924d62341f1ce1ab2630/recipes/cmd-to-echo";
sha256 = "0bz0zbzagrz26cvqpwl1pfwayyc49bjawk641yc6kl8gnsnv3z73";
name = "cmd-to-echo";
};
- packageRequires = [ emacs s ];
+ packageRequires = [ emacs s shell-split-string ];
meta = {
homepage = "https://melpa.org/#/cmd-to-echo";
license = lib.licenses.free;
@@ -8538,22 +8601,22 @@
license = lib.licenses.free;
};
}) {};
- coffee-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ coffee-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "coffee-mode";
- version = "20160808.1712";
+ version = "20161124.832";
src = fetchFromGitHub {
owner = "defunkt";
repo = "coffee-mode";
- rev = "026222983aee3842f6ddac9024364dcaacd9a73e";
- sha256 = "13icfx0h89hb2180srqnvrm415cijn2v5l8i8hdv820wkd2v9lx8";
+ rev = "d7d554cbf435aa875fbf56e67c4374375a164a93";
+ sha256 = "1glif3jxh31cmy2rgz39bc2bbrlgh87v5wd5c93f7slb45gkinqi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/coffee-mode";
sha256 = "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1";
name = "coffee-mode";
};
- packageRequires = [ cl-lib emacs ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/coffee-mode";
license = lib.licenses.free;
@@ -9015,22 +9078,22 @@
license = lib.licenses.free;
};
}) {};
- company = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company";
- version = "20160829.1206";
+ version = "20161211.1850";
src = fetchFromGitHub {
owner = "company-mode";
repo = "company-mode";
- rev = "f2327bc7f303fcf83c3d8f9c76f61deaa110ebb5";
- sha256 = "0d0if7nksd5adybc6w9v8bg2j11gz975b869k4kd9fi3fbsv5cw3";
+ rev = "21357f6d6274420d0f4fda07841daf0853b4749c";
+ sha256 = "0nywpm89vw2qsplwndijxzl8bga7i69j3aspf9qbypnhlbmkvm0z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4";
name = "company";
};
- packageRequires = [ cl-lib emacs ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/company";
license = lib.licenses.free;
@@ -9060,12 +9123,12 @@
company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-ansible";
- version = "20160920.1241";
+ version = "20161119.1155";
src = fetchFromGitHub {
owner = "krzysztof-magosa";
repo = "company-ansible";
- rev = "9f22c09009734bd281fcbb89d8903a04b8a72b74";
- sha256 = "0z6ix3sihzzkk4jgi1qg5ma9wczzdl55kc0y93jnfn69yk3l0ikn";
+ rev = "5e8b51b21d32d3d8929fc2e82dec8f584a863399";
+ sha256 = "0appxl6njgxmgpf9np5cpjym3ifgdwh0mzvsnxvx08pidrrnmm33";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible";
@@ -9131,12 +9194,12 @@
company-bibtex = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, regexp-opt }:
melpaBuild {
pname = "company-bibtex";
- version = "20161023.1605";
+ version = "20161210.1223";
src = fetchFromGitHub {
owner = "gbgar";
repo = "company-bibtex";
- rev = "223002a6ff83ff3851d07155b470d5941ba09455";
- sha256 = "17y4i37a1j9crdl8bpbbs71l1mnkif8s42a3p7rgvp3mn6z8qsdi";
+ rev = "9b236cb9527ec69d73101193e6b53ad6080ea333";
+ sha256 = "19f6npkd4im9dp48h2kp2kw6d6pvw4i4qn404ca949z77v87ibjj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7c366ac2949eae48766fce70a7b01bbada6fcc27/recipes/company-bibtex";
@@ -9194,12 +9257,12 @@
company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "company-coq";
- version = "20160715.344";
+ version = "20161201.631";
src = fetchFromGitHub {
owner = "cpitclaudel";
repo = "company-coq";
- rev = "1929d2172875a27133d06196cd3427b7c475b7c5";
- sha256 = "16zy87nzc0aa7zc9wmbx6x0dxkhcs7q787gwf50s1hkxlw80djgr";
+ rev = "20f3ede0ca3a90a68b700704bff830ca18598f73";
+ sha256 = "0fdpxd2lh3y5iyhwphpcdv29bm5v8pcwhbj4xhbky7dn28kbl9c4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq";
@@ -9310,8 +9373,8 @@
src = fetchFromGitHub {
owner = "emacs-eclim";
repo = "emacs-eclim";
- rev = "f2247f2515ee2eb0ff866bcbbf69d9f62b7b7780";
- sha256 = "1d3zyaqgng0q41nnifmwwwwd9bm0w7yhkpj6lwir3m0pg5lrcw48";
+ rev = "7d3beb299399bc9d8190190fa59943b2a70a7f63";
+ sha256 = "14q0qg9a1kxgf89iy48g63nkj7m9hydipmqq670591v09awk877l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
@@ -9327,12 +9390,12 @@
company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-emoji";
- version = "20161105.2138";
+ version = "20161108.1800";
src = fetchFromGitHub {
owner = "dunn";
repo = "company-emoji";
- rev = "af70f5d12a38919d5728a32784674e70566cbce6";
- sha256 = "0a1ak43js2ag157mvzyjvjh3z1x4r3r2541rbh5ihwlix6c5v637";
+ rev = "b971ab0a66126f0d1410254ba1e21f17c2270101";
+ sha256 = "1c9r1j7xpq6c27y6akfarrcg87idww3c10rkhm26m1vprqk73vr3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5733dccdffe97911a30352fbcda2900c33d79810/recipes/company-emoji";
@@ -9348,12 +9411,12 @@
company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-flow";
- version = "20160915.2229";
+ version = "20161111.2147";
src = fetchFromGitHub {
owner = "aaronjensen";
repo = "company-flow";
- rev = "a5bb9014de6ef1393cb12ff808dd4469da7ea648";
- sha256 = "15yyg0qapmkc9m53fpxzpiq2rh6cxwanh1k79v0d0qqk97dxdr3y";
+ rev = "1f10d38135679f705494f23cd866ded0130e2993";
+ sha256 = "0alkxdd171dwk6rnq2yc6gpljdazz7yz7q3mzs3q4rcmrvlr8h84";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow";
@@ -9436,8 +9499,8 @@
src = fetchFromGitHub {
owner = "nsf";
repo = "gocode";
- rev = "82514c86ff1b37eb29aa979fe51238846857935d";
- sha256 = "04fcz539haxvxlsnlmvw9inwmgssh8msn37iwlfax7z1a81bqq54";
+ rev = "5070dacabf2a80deeaf4ddb0be3761d06fce7be5";
+ sha256 = "0w54cwjcyq7cr3g50kg4zy1xrkaqakb18qbdam11qvz6kix3syg1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -9583,8 +9646,8 @@
src = fetchFromGitHub {
owner = "CestDiego";
repo = "nand2tetris.el";
- rev = "9c5161c840f30f01647c188699dacba5e51b3b44";
- sha256 = "05ngqw29gzjs0zzs8nyldfcqkbnh9n7jkaxrsc40dfqikjhaj5xc";
+ rev = "e1be652b7d46e653a85c564ed917b5b75ab4bc50";
+ sha256 = "1xnb5y1ddy4s7kia6zfzd8s5q9m2zfd72344qizywla86rqk7lpb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/company-nand2tetris";
@@ -9646,8 +9709,8 @@
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "7f82b4f1dbe0992a1b939e9ce359f12f1eb6482a";
- sha256 = "0gfhg7rji735j31xibvimx7v7w337zvrlxzj18qxzymnimhx1843";
+ rev = "fa4a79892e1097db28dce7ba4058e68998228ddd";
+ sha256 = "055hf8shm4b15gvr7cq72laqd87alhmi5pkadbia9ccb8y3m2508";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -9705,12 +9768,12 @@
company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }:
melpaBuild {
pname = "company-quickhelp";
- version = "20160826.806";
+ version = "20161113.1226";
src = fetchFromGitHub {
owner = "expez";
repo = "company-quickhelp";
- rev = "d8fd045715ca64bc8cb3e714c05fe70d7eb33f09";
- sha256 = "1fdiz1jqxnrl940vqbq14idrs4ird9dkzgckmyawzznv5yi29fw4";
+ rev = "41014e9018cc6f42741ce85383852930e6411f2e";
+ sha256 = "00svfw08g44byzx23zb0kla6y6z05m6qlxzl0q32kkgkqvdhzb17";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp";
@@ -9751,8 +9814,8 @@
src = fetchFromGitHub {
owner = "iquiw";
repo = "company-restclient";
- rev = "3955ad1792e17e7af9c886aae5e4bce0c160808f";
- sha256 = "11siamfl62q2fv608p4slc72zdincp68klcm1fkvr50g808hwd7h";
+ rev = "7b41cd58ffdf965480f1cf52d58d718009ba6fe7";
+ sha256 = "0j6b9jqs4i05rxx6fs7rvim1snf33fi1l6dkm9lskchbykzz4adq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dd063bc3789772fdcc6a8555817588962e60825/recipes/company-restclient";
@@ -9813,6 +9876,27 @@
license = lib.licenses.free;
};
}) {};
+ company-statistics = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "company-statistics";
+ version = "20161213.159";
+ src = fetchFromGitHub {
+ owner = "company-mode";
+ repo = "company-statistics";
+ rev = "36d9692da9172c3ad1e1a46d66ffa9346a44b212";
+ sha256 = "05br3ikxad7gm7h6327yfwdfap6bbg68fbybsx967a31yv4rxhvm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/89d05b43f31ec157ce8e7bfba4b7c9119bda6dd2/recipes/company-statistics";
+ sha256 = "1fl4ldj17m3xhi6xbw3bp9c2jir34xv3jh9daiw8g912fv2l5dcj";
+ name = "company-statistics";
+ };
+ packageRequires = [ company emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/company-statistics";
+ license = lib.licenses.free;
+ };
+ }) {};
company-tern = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tern }:
melpaBuild {
pname = "company-tern";
@@ -9904,8 +9988,8 @@
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "d116b167bf776dbeba6a822c0b3c19a2c97f68d4";
- sha256 = "192qiwpkc5a0bxsiqj6zyvlblvixq24m845dgpcsqzwpjcm7qq9l";
+ rev = "5bff8525adbe01a9af905c92f0834902ac3c1c73";
+ sha256 = "15sg07dvvmmfhcp83b388zy43wgyq2qcns4qqcm2jaqq9hpvqxf9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd";
@@ -9939,22 +10023,22 @@
license = lib.licenses.free;
};
}) {};
- composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
+ composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, seq }:
melpaBuild {
pname = "composer";
- version = "20161029.1317";
+ version = "20161115.1102";
src = fetchFromGitHub {
owner = "zonuexe";
repo = "composer.el";
- rev = "47d840e03412da5db13ae2b962576f0166517581";
- sha256 = "1vw1im39c4jvsaw3ghvwvya9l5h7jiysfhry3p22gdng0l2n4008";
+ rev = "2ea50be23557ce50de2c5a517fcd4abc980969b1";
+ sha256 = "0ir0a3i7bvnf80als7bwjvr604jvhpk0gwln88kqgksvy1bh1nky";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer";
sha256 = "1gwgfbb0fqn87s7jscr9xy47h239wy74n3hgpk4i16p2g6qinpza";
name = "composer";
};
- packageRequires = [ emacs f request s ];
+ packageRequires = [ emacs f request s seq ];
meta = {
homepage = "https://melpa.org/#/composer";
license = lib.licenses.free;
@@ -10148,22 +10232,43 @@
license = lib.licenses.free;
};
}) {};
- copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "copy-as-format";
+ version = "20161208.2152";
+ src = fetchFromGitHub {
+ owner = "sshaw";
+ repo = "copy-as-format";
+ rev = "a7f468f8d809ae1d2d9a3c74e8ab0b4fb6728380";
+ sha256 = "1ndksvs1f2xg5gkxzpf06a4wzkx49kjl7lmzf118fijd2cxx92d6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
+ sha256 = "1yij5mqm0dg6326yms0a2w8gs42kdxq0ih8dhkpdar54r0bk3m8k";
+ name = "copy-as-format";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/copy-as-format";
+ license = lib.licenses.free;
+ };
+ }) {};
+ copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "copyit";
- version = "20160607.1005";
+ version = "20161126.429";
src = fetchFromGitHub {
owner = "zonuexe";
repo = "emacs-copyit";
- rev = "c973d3650208a033aaf845989d023f9c6e572ddd";
- sha256 = "1fwndjbzwhl4dzrw5jxbq66yggxkl81ga3cnnl7rm3s63pkb6l3w";
+ rev = "f50d033b129d467fb517a351adf3f16cabd82a62";
+ sha256 = "1s1ddwxgvig7skibicm9j8jii651n1v5ivfj4j6d1kkc79lpq69n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69bd50fd1f3865d48cec9fe2680d260d746248e5/recipes/copyit";
sha256 = "1m28irqixzl44c683dxvc5x6l3qcqlpy6jzk6629paqkdi5mx1c0";
name = "copyit";
};
- packageRequires = [ cl-lib emacs ];
+ packageRequires = [ cl-lib emacs s ];
meta = {
homepage = "https://melpa.org/#/copyit";
license = lib.licenses.free;
@@ -10176,8 +10281,8 @@
src = fetchFromGitHub {
owner = "zonuexe";
repo = "emacs-copyit";
- rev = "c973d3650208a033aaf845989d023f9c6e572ddd";
- sha256 = "1fwndjbzwhl4dzrw5jxbq66yggxkl81ga3cnnl7rm3s63pkb6l3w";
+ rev = "f50d033b129d467fb517a351adf3f16cabd82a62";
+ sha256 = "1s1ddwxgvig7skibicm9j8jii651n1v5ivfj4j6d1kkc79lpq69n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69bd50fd1f3865d48cec9fe2680d260d746248e5/recipes/copyit-pandoc";
@@ -10235,12 +10340,12 @@
counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
melpaBuild {
pname = "counsel";
- version = "20161104.828";
+ version = "20161213.439";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "c8be3973a4841a3ee7d05e59666724965ecc8dd8";
- sha256 = "010hrxabaf9pj9dyj6x12sx6m9y8bk8nzdz1xsha2jq3fcglw2mc";
+ rev = "c2c0e2d7bd79a0c7cb8a6df98d2a87a0891730d8";
+ sha256 = "19v6l6xfhyxnmq7ajc0f4qac1ns5wjl9l78sfpa39jn6cm9wbyy5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10253,6 +10358,27 @@
license = lib.licenses.free;
};
}) {};
+ counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+ melpaBuild {
+ pname = "counsel-bbdb";
+ version = "20161105.350";
+ src = fetchFromGitHub {
+ owner = "redguardtoo";
+ repo = "counsel-bbdb";
+ rev = "297d0c7e6e1eaafcd5e188724fea8e8f26b95555";
+ sha256 = "14gw4d855v2nvqh06vs9rzs816pn1hp4rhfikb0wzg1ay6gdrwi7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb";
+ sha256 = "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp";
+ name = "counsel-bbdb";
+ };
+ packageRequires = [ emacs ivy ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-bbdb";
+ license = lib.licenses.free;
+ };
+ }) {};
counsel-dash = callPackage ({ counsel, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, helm-dash, lib, melpaBuild }:
melpaBuild {
pname = "counsel-dash";
@@ -10274,6 +10400,27 @@
license = lib.licenses.free;
};
}) {};
+ counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "counsel-gtags";
+ version = "20161024.633";
+ src = fetchFromGitHub {
+ owner = "syohex";
+ repo = "emacs-counsel-gtags";
+ rev = "59e7abc97715507e3c524a3e7132d38ed7ab0a12";
+ sha256 = "01i1ilp87hg9s5bh4n7msf8ljx9h7ml3cxlawqh7y8c04m83yamp";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags";
+ sha256 = "12qyb1lnzyd2rr4ankpqi30h0bj66ap5qw87y4605k0j44vhnsax";
+ name = "counsel-gtags";
+ };
+ packageRequires = [ counsel emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-gtags";
+ license = lib.licenses.free;
+ };
+ }) {};
counsel-osx-app = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "counsel-osx-app";
@@ -10298,12 +10445,12 @@
counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "counsel-projectile";
- version = "20161022.1525";
+ version = "20161212.146";
src = fetchFromGitHub {
owner = "ericdanan";
repo = "counsel-projectile";
- rev = "675d17d2dc8c5016e6aecff76af3bd39ec4c5536";
- sha256 = "0x9lfavgm7pgnxqsn530mjdv2qdl0vcp20irg2g26cy16y555w7k";
+ rev = "5728486a2852cda5b6b12890de917326ce3bd75c";
+ sha256 = "1kbzsk2c2lhz78fynrghwd94j3da92jz59ypcysgyrpqv9cvhzb5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
@@ -10403,12 +10550,12 @@
cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cpputils-cmake";
- version = "20160928.549";
+ version = "20161201.1441";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "cpputils-cmake";
- rev = "6ea0b6abb1274f61e47c2a0cc09451d6824f7a60";
- sha256 = "1691dk3iqswljhjap6g5n3lfskkwz3k0dg3yk6ga84ys586mm804";
+ rev = "2c48c1bacee286d927038bf0c893678931f0f956";
+ sha256 = "03a0y508znl91c6893wf5l9d98nc4dbfgg9c594c542mdbrk54z0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9b84a159e97f7161d0705da5dd5e8c34ae5cb848/recipes/cpputils-cmake";
@@ -10491,8 +10638,8 @@
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-theme-creamsody";
- rev = "a0071bf037a7f2d87097918fe5338e23f4736edd";
- sha256 = "0ch5xm2mnkd7inh7m5ir12w2b6zprzsqsl9asayhd0kpnk7r0yz4";
+ rev = "06a1142d7601dd2e9f31bbcd6b33458636c6a2bd";
+ sha256 = "1dmnlsdhcsvlzpfcshlk7p0yjry5626i07yl08rgjhxcgbhillf8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme";
@@ -10568,22 +10715,22 @@
license = lib.licenses.free;
};
}) {};
- cricbuzz = callPackage ({ enlive, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "cricbuzz";
- version = "20160703.158";
+ version = "20161130.2036";
src = fetchFromGitHub {
owner = "lepisma";
repo = "cricbuzz.el";
- rev = "7c0c495312c18bc6c8db9ddad94efbd4b6328a9b";
- sha256 = "0jvr6ya40qq9q064k2gzkrqw00xffjmslfjxa2xz2vi25m6jyv92";
+ rev = "5fe51347f5d6e7636ece5e904e4bdec0be21db45";
+ sha256 = "1x29garhp1x5h1mwbamwjnfw52w45b39aqxsvcdxmcf730w9pq63";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/906b144e01aed96d62efbc34a8af2973135f6194/recipes/cricbuzz";
sha256 = "1ad2afyn3xny3rgb8yy6w87f33idlrmis1vx0b6s8ppafv9z74j0";
name = "cricbuzz";
};
- packageRequires = [ enlive ];
+ packageRequires = [ dash enlive s ];
meta = {
homepage = "https://melpa.org/#/cricbuzz";
license = lib.licenses.free;
@@ -10713,6 +10860,27 @@
license = lib.licenses.free;
};
}) {};
+ csgo-conf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "csgo-conf-mode";
+ version = "20161209.819";
+ src = fetchFromGitHub {
+ owner = "wynro";
+ repo = "emacs-csgo-conf-mode";
+ rev = "57e7224f87a3ccc76b5564cc95fa0ff43bb6807c";
+ sha256 = "14wzh3rlq7xb8djncbjkfiq9hl5frp7gp42sz2ic7aky4qajbcdv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2298e3f840da549707ec3270c8303f4f63a674dc/recipes/csgo-conf-mode";
+ sha256 = "0djx6jraqlh9da2jqagj72vjnc8n3px2jp23jdy9rk40z10m5sbr";
+ name = "csgo-conf-mode";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/csgo-conf-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "csharp-mode";
@@ -10797,6 +10965,27 @@
license = lib.licenses.free;
};
}) {};
+ csv = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "csv";
+ version = "20161113.710";
+ src = fetchFromGitLab {
+ owner = "u11";
+ repo = "csv.el";
+ rev = "aa1dfa1263565d5fac3879c21d8ddf5f8915e411";
+ sha256 = "1vmazjrfcsa9aa9aw8bq5sazdhqvhxyj837dyw5lmh8gk7z0xdaa";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/233f9de5f65fd8374f2c1912503c30905aa6691d/recipes/csv";
+ sha256 = "1rvi5p27lsb284zqgv4cdqkbqc9r92axmvg7sv52rm7qcj8njwqd";
+ name = "csv";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/csv";
+ license = lib.licenses.free;
+ };
+ }) {};
csv-nav = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "csv-nav";
version = "20130407.1120";
@@ -10925,8 +11114,8 @@
src = fetchFromGitHub {
owner = "mortberg";
repo = "cubicaltt";
- rev = "3257eadf70826fb3ef060c46f85b7a4d60464b1d";
- sha256 = "1c5nfzsj4bi2rk3d3r2iw03kkpc5dg9p3q3xzj7cxfg2wmg1xaxk";
+ rev = "f66ed8d4cf4cd9caa26351e27185329ca74c4cc5";
+ sha256 = "0yh4hynpq7wxwnl10nrhfbxa160p8d211637x665rqqcgsc40sp3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -10999,27 +11188,6 @@
license = lib.licenses.free;
};
}) {};
- cursor-in-brackets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "cursor-in-brackets";
- version = "20160603.416";
- src = fetchFromGitHub {
- owner = "yascentur";
- repo = "cursor-in-brackets-el";
- rev = "3c085913eff08eddcc8fa4ed6438d60da59d7bc2";
- sha256 = "06q46hmspgq1g3dkpim3fnz1gnzpqywwqcg5yism2lc6qj4zmanm";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/5862f7a24b3c213505277ad44a64d8dd402119eb/recipes/cursor-in-brackets";
- sha256 = "1p4p0v7x4i4i2z56dw4xf1phckanrwjciifi0zqba36xd4zxgx8f";
- name = "cursor-in-brackets";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/cursor-in-brackets";
- license = lib.licenses.free;
- };
- }) {};
cursor-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cursor-test";
@@ -11210,8 +11378,8 @@
src = fetchFromGitHub {
owner = "cython";
repo = "cython";
- rev = "ccfebe9171fe65484d459aa3f0f3c1c97397c103";
- sha256 = "1ji1hra4iahy12067qzda0kbw5ry9khp6z0gbfrihzjq5rmn4h3j";
+ rev = "c9bcf1bed3acf367d6deb0c273cf22db0f18dab2";
+ sha256 = "16yd296n0nh96pnkjpdbdz4i7ga4j961pkzm3cbnika26xwndx03";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11248,12 +11416,12 @@
d-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "d-mode";
- version = "20161011.1257";
+ version = "20161022.717";
src = fetchFromGitHub {
owner = "Emacs-D-Mode-Maintainers";
repo = "Emacs-D-Mode";
- rev = "98af62e67026fee1dda9155e1a463917fc83802e";
- sha256 = "0fzplvi1sm8k2sabfdvrd7j2xypwqh0g9v1mxa75dajdmcd85zpj";
+ rev = "a97c92ced57224287a84e7fc48ba9aac6b2afc08";
+ sha256 = "0ln38lkl8qcnpcpjqck3i6hd5zjv43g7vka3kapz2bnz4s33jn3p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3c13e9ccc358743de660b1f0e89d6bb709c42bff/recipes/d-mode";
@@ -11311,12 +11479,12 @@
danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "danneskjold-theme";
- version = "20161026.201";
+ version = "20161214.703";
src = fetchFromGitHub {
owner = "rails-to-cosmos";
repo = "danneskjold-theme";
- rev = "a667ef6967008ae6176838efd26b3631ba63a3df";
- sha256 = "1qrvss2qw88xqv040bp143h7aab78j1kp9x5j4s6pz0ihj593ywn";
+ rev = "a984cded7522b2cdad7f33542d3b5cb9ad095860";
+ sha256 = "0dhnm3f7dd9wdbpsvnwc0hh1sa6cd48r8sw49f70pf76z58iss53";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -11329,6 +11497,27 @@
license = lib.licenses.free;
};
}) {};
+ dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "dante";
+ version = "20161125.455";
+ src = fetchFromGitHub {
+ owner = "jyp";
+ repo = "dante";
+ rev = "6280169aec81fe9deb3a78d722ae0ab15866e78e";
+ sha256 = "0vdvs76bhrq07ak25vasg6pq1hfdjhksl325g5idsjjnhvb0mp83";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
+ sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs";
+ name = "dante";
+ };
+ packageRequires = [ dash emacs flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/dante";
+ license = lib.licenses.free;
+ };
+ }) {};
darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darcula-theme";
@@ -11413,6 +11602,27 @@
license = lib.licenses.free;
};
}) {};
+ darkane-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "darkane-theme";
+ version = "20161111.1304";
+ src = fetchFromGitHub {
+ owner = "FelixFortis";
+ repo = "emacs-darkane-theme";
+ rev = "afa346c793b74645392677b276c56b87c354b8ef";
+ sha256 = "1mi2k7llbk4n05mcy80lswv5vqlfca2izslds7z0sihik8fys4m6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/826bd40f9da54e263dbad4bd861bd8227ea76656/recipes/darkane-theme";
+ sha256 = "1lnjjhy70bizqlpih9aqvv6hsx8lj4qa5klbd7mrldqywab8cpib";
+ name = "darkane-theme";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/darkane-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
darkburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darkburn-theme";
@@ -11479,12 +11689,12 @@
darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darktooth-theme";
- version = "20161022.713";
+ version = "20161210.2038";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-theme-darktooth";
- rev = "1a5d0dc5ae9c57bcb07085ded6fa82c3512ff80f";
- sha256 = "0hz3hhkyg6m2wvffanpclc2wq7y8n63sgz726kg87iqgq2lfa096";
+ rev = "9b349813bee4e0b0f1c89e6e9796f43de3930fc5";
+ sha256 = "1iivrz48h8f7rqbihxk2m2ffxlqfikd4bmf57d4z428d6yp31sr5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -11521,12 +11731,12 @@
dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dash";
- version = "20161106.410";
+ version = "20161121.55";
src = fetchFromGitHub {
owner = "magnars";
repo = "dash.el";
- rev = "1422b70b562a9d4e198eb73e03d89f446fcf5295";
- sha256 = "080d3im10wgn5qccydiavidik8rjmp432i4mhkb2x5fpqaikv62x";
+ rev = "958e3fb62fd326d3743c0603b80d24ab85712c03";
+ sha256 = "1a1zca0lh01wayd4qdjihimhd1bn00qpwfiybgdcb7yn5xfwv9a1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -11567,8 +11777,8 @@
src = fetchFromGitHub {
owner = "magnars";
repo = "dash.el";
- rev = "1422b70b562a9d4e198eb73e03d89f446fcf5295";
- sha256 = "080d3im10wgn5qccydiavidik8rjmp432i4mhkb2x5fpqaikv62x";
+ rev = "958e3fb62fd326d3743c0603b80d24ab85712c03";
+ sha256 = "1a1zca0lh01wayd4qdjihimhd1bn00qpwfiybgdcb7yn5xfwv9a1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional";
@@ -11581,15 +11791,36 @@
license = lib.licenses.free;
};
}) {};
+ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }:
+ melpaBuild {
+ pname = "dashboard";
+ version = "20161204.1138";
+ src = fetchFromGitHub {
+ owner = "rakanalh";
+ repo = "emacs-dashboard";
+ rev = "cd9899342bc94e59aa42275554810e50d045aaa4";
+ sha256 = "1klmjdym4w3cbarabzvkxddjdcisfk62wkpys3z4nclp4g91p8as";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b047625aebdbf7b5d644b55afbdccfc6c4ac14a8/recipes/dashboard";
+ sha256 = "04lp8ylfnbdj65s8z0m5kyj4rwxcsdwinlkpj00j1my0m74y5i0p";
+ name = "dashboard";
+ };
+ packageRequires = [ emacs page-break-lines ];
+ meta = {
+ homepage = "https://melpa.org/#/dashboard";
+ license = lib.licenses.free;
+ };
+ }) {};
date-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "date-at-point";
- version = "20150108.418";
+ version = "20150308.543";
src = fetchFromGitHub {
owner = "alezost";
repo = "date-at-point.el";
- rev = "65733210479812a70a6dd5978ba0e2a4a6fcd08b";
- sha256 = "0l4z9rjla4xvm2hmp07xil69q1cg0v8iff0ya41svaqr944qf7hf";
+ rev = "38df823d05df08ec0748a4185113fae5f99090e9";
+ sha256 = "024jx6q0dik4w2wb8nrk1q73asvjgrsl5mslns0ci3zsya343rch";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a6dbeddd236f312fac1d5542dfd2edf81df8fad2/recipes/date-at-point";
@@ -11752,12 +11983,12 @@
ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ddskk";
- version = "20161005.453";
+ version = "20161127.118";
src = fetchFromGitHub {
owner = "skk-dev";
repo = "ddskk";
- rev = "d0d80ff47a2d39969c7091aa594fd51f21953b07";
- sha256 = "0mwfbd99kv4cb6ba50swll944vcrdsbs4hy2kkcsff8n84pbap17";
+ rev = "4b69fa39539eec2c1cea5ba11ddf9cf20363a500";
+ sha256 = "0lh2dqmdy76ibp78pjsxvlm7j0649v7bqfifw9a5mfvwzlkihs85";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk";
@@ -11777,8 +12008,8 @@
src = fetchFromGitHub {
owner = "alezost";
repo = "debpaste.el";
- rev = "038f0ff7824f4e3dd455e2232eeca70fa8abcec5";
- sha256 = "1darxggvyv100cfb7imyzvgif8a09pnky62pf3bl2612hhvaijfb";
+ rev = "6f2a400665062468ebd03a2ce1de2a73d9084958";
+ sha256 = "1wi70r56pd5z0x4dp4m58p9asq03j74kdm4fi9vai83vsl2z9amq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13098bae76a3386689a9bf9c12f25b9a9b15145c/recipes/debpaste";
@@ -12667,12 +12898,12 @@
dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-icon";
- version = "20161030.1510";
+ version = "20161206.130";
src = fetchFromGitLab {
owner = "xuhdev";
repo = "dired-icon";
- rev = "6869d1aee10317f2d4fc49d343d642d422b7117b";
- sha256 = "1cn8nfai0xsyds3824f0kw5237lyggw0zgk1d60alznm5xyzwlhb";
+ rev = "4397e7858d5e63c251acc2741d78fe8e178cb206";
+ sha256 = "0g97lii8n9pal46kipw59nj78qv3l0gpy6rwbd702gxccj94glgv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d0947148441ed48f92f4cfaaf39c2a9aadda48/recipes/dired-icon";
@@ -12706,22 +12937,22 @@
license = lib.licenses.free;
};
}) {};
- dired-k = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ dired-k = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-k";
- version = "20160918.2130";
+ version = "20161116.116";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-dired-k";
- rev = "26aa877bed6246feeb448c659a5b676d7796197e";
- sha256 = "062zylfm18200d987m0vphaqph6syzah28ll8zz79fhqajgv6ndz";
+ rev = "3f0b9315f87b0f930d51089e311d41282d5f8b15";
+ sha256 = "09xh097v3fd0mjxqlmbfwjlr1v4a99mj4rvwdb6kqgajmlhgi9hx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7/recipes/dired-k";
sha256 = "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8";
name = "dired-k";
};
- packageRequires = [ cl-lib emacs ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/dired-k";
license = lib.licenses.free;
@@ -12792,10 +13023,10 @@
}) {};
dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "dired-plus";
- version = "20161022.916";
+ version = "20161120.1849";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/dired+.el";
- sha256 = "1j3w3gfk0lnyj576wg1mzdn2k1l0s777j8z36cvrs82z6pln6qb4";
+ sha256 = "1pidj3658rrj4sn9kmjay9bb90a8p67n6gfw8gk90pqb1nxfx1v2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+";
@@ -12811,12 +13042,12 @@
dired-quick-sort = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild }:
melpaBuild {
pname = "dired-quick-sort";
- version = "20161025.1322";
+ version = "20161208.1312";
src = fetchFromGitLab {
owner = "xuhdev";
repo = "dired-quick-sort";
- rev = "192a2535025d4644729b65f38474eaf54c999f18";
- sha256 = "01n2ldsgfxnrdqdcfw1r0vrp1x1q5f6ikjzxx56qqp9f4kmfvs50";
+ rev = "1845f978d313f750a5b70b832457ed803c4ffbdb";
+ sha256 = "014frvpszixn8cx7rdx704glmjbslv3py3kw0pb0xqf50k4scynf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4d278178128deb03a7b1d2e586dc38da2c7af857/recipes/dired-quick-sort";
@@ -13406,12 +13637,12 @@
dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dix";
- version = "20161004.450";
+ version = "20161114.142";
src = fetchFromGitHub {
owner = "unhammer";
repo = "dix";
- rev = "9e6facb25e1137ef4e1329151a7902dc2d168507";
- sha256 = "1raz281dyq3dgxbmwrcpdy1g8i5kwlv0i42ixpsdhhj1dcmzhqza";
+ rev = "5df503b66d8b726e19812ff0fa82bcbcc6bf5cd6";
+ sha256 = "164w42rqjyn8xrbb6w6z9wi1r8fs5sv6fdvfk5arv4g8ab2wnish";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix";
@@ -13431,8 +13662,8 @@
src = fetchFromGitHub {
owner = "unhammer";
repo = "dix";
- rev = "9e6facb25e1137ef4e1329151a7902dc2d168507";
- sha256 = "1raz281dyq3dgxbmwrcpdy1g8i5kwlv0i42ixpsdhhj1dcmzhqza";
+ rev = "5df503b66d8b726e19812ff0fa82bcbcc6bf5cd6";
+ sha256 = "164w42rqjyn8xrbb6w6z9wi1r8fs5sv6fdvfk5arv4g8ab2wnish";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil";
@@ -13487,22 +13718,22 @@
license = lib.licenses.free;
};
}) {};
- django-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, s }:
+ django-mode = callPackage ({ fetchFromGitHub, fetchurl, helm-make, lib, melpaBuild, projectile, s }:
melpaBuild {
pname = "django-mode";
- version = "20160926.1151";
+ version = "20161109.749";
src = fetchFromGitHub {
owner = "myfreeweb";
repo = "django-mode";
- rev = "a3fdf9156a65a03e6f50c41d32b0f5a6960bba54";
- sha256 = "0z7yskxz34wncmg516qkaisbr7w3fcp9jrx80w2h68lyy8slcbmv";
+ rev = "561a3a7359a1526b67688239cdee67e0425b6a01";
+ sha256 = "0xyi5j0cf1d8dv7lpfcgzkfargkpga3dp93pxi8x9pshafmlnrw8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bdc46811612ff96cb1e09552b9f095d68528dcb3/recipes/django-mode";
sha256 = "1rdkzqvicjpfh9k66m31ky6jshx9fqw7pza7add36bk6xg8lbara";
name = "django-mode";
};
- packageRequires = [ projectile s ];
+ packageRequires = [ helm-make projectile s ];
meta = {
homepage = "https://melpa.org/#/django-mode";
license = lib.licenses.free;
@@ -13515,8 +13746,8 @@
src = fetchFromGitHub {
owner = "myfreeweb";
repo = "django-mode";
- rev = "a3fdf9156a65a03e6f50c41d32b0f5a6960bba54";
- sha256 = "0z7yskxz34wncmg516qkaisbr7w3fcp9jrx80w2h68lyy8slcbmv";
+ rev = "561a3a7359a1526b67688239cdee67e0425b6a01";
+ sha256 = "0xyi5j0cf1d8dv7lpfcgzkfargkpga3dp93pxi8x9pshafmlnrw8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bdc46811612ff96cb1e09552b9f095d68528dcb3/recipes/django-snippets";
@@ -13721,12 +13952,12 @@
docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }:
melpaBuild {
pname = "docker";
- version = "20161031.249";
+ version = "20161214.532";
src = fetchFromGitHub {
owner = "Silex";
repo = "docker.el";
- rev = "2e9438cf132da1bbb25b93769754c29bd7e48a6c";
- sha256 = "1dqmnija2s1dmf0kq3d4nf212jyyqa5rjnrg4l2rlxkkfgxjdqaz";
+ rev = "9ecfa0b16d86998c380f08f82743c4dce9accf5e";
+ sha256 = "0783v9qf06gy7miw80x1lf1z59yhcmiilprpcjdlf3fyvvym56a7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -13792,12 +14023,12 @@
dockerfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dockerfile-mode";
- version = "20160128.951";
+ version = "20161209.631";
src = fetchFromGitHub {
owner = "spotify";
repo = "dockerfile-mode";
- rev = "53434afa3b56eb9284d5e2c21956e43046cae1fa";
- sha256 = "0vx7lv54v4bznn4mik4i6idb9dl7fpp3gw7nyhymbkr6hx884haw";
+ rev = "bebfa1b73e7e006d574a0e4fbae225dc1db214ff";
+ sha256 = "129kang099mw6lfi4616d47axm3q81hr8jhqwymc3ar9ramggyg3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode";
@@ -13876,12 +14107,12 @@
doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "doom-themes";
- version = "20161103.1722";
+ version = "20161206.2238";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-doom-theme";
- rev = "6a33ec057419e14ef0494e5ed1291cff4c8723e2";
- sha256 = "0c5v0ry6bk47hb90ghry96arvdzdhfidy0d9ffslxdf0j7zfw4i1";
+ rev = "d27dc431972d4b645cc41412e6fe052bf8d9f061";
+ sha256 = "1pqmbq4lbcyxhkzqxany8il9crh8sqgaamn45fbjrm70g6g80yak";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
@@ -14115,12 +14346,12 @@
dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dracula-theme";
- version = "20160826.627";
+ version = "20161119.1345";
src = fetchFromGitHub {
owner = "dracula";
repo = "emacs";
- rev = "83e60b91c526405506c3f6167af207371e2420c8";
- sha256 = "00wlspaya7g48fh34rbn27ixixxnm2qrc6gl135d97hawv86rmrb";
+ rev = "c9f8a97eba74a82a65554c9b282e86125a22ecb2";
+ sha256 = "12918nidcmqnhkqhhrnhhd2sihqld5dy1v06q4j9fkrcbp4j4l4l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme";
@@ -14157,12 +14388,12 @@
drag-stuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "drag-stuff";
- version = "20160520.1159";
+ version = "20161107.2349";
src = fetchFromGitHub {
owner = "rejeep";
repo = "drag-stuff.el";
- rev = "324239532b4a8b45dce778ef62e843d3ee0161aa";
- sha256 = "0vcc1pfxsjbrslh4k6d14xv4k8pvkg09kikwf7ipis12l62df6i4";
+ rev = "d49fe376d24f0f8ac5ade67b6d7fccc2487c81db";
+ sha256 = "1jrr59iazih3imkl9ja1lbni9v3xv6b8gmqs015g2mxhlql35jka";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/drag-stuff";
@@ -14280,12 +14511,12 @@
drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }:
melpaBuild {
pname = "drupal-mode";
- version = "20160915.245";
+ version = "20161215.414";
src = fetchFromGitHub {
owner = "arnested";
repo = "drupal-mode";
- rev = "eec2e557d769f3379e6c208334650f3041d28d54";
- sha256 = "0c3s5l5msc1npjxdix6lr0467vgxil29ha39q3cwq60kbvrcdbgq";
+ rev = "dea5a8da789e5c707fa6c63cd400282ea7205a14";
+ sha256 = "1zxsa6fapbxa5yfpawivjmav9i80j9752bc6gmpq7ilzsnd67h0v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode";
@@ -14324,7 +14555,7 @@
version = "20130120.1257";
src = fetchsvn {
url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
- rev = "1768508";
+ rev = "1774435";
sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
};
recipeFile = fetchurl {
@@ -14404,12 +14635,12 @@
ducpel = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ducpel";
- version = "20140418.2216";
+ version = "20140702.454";
src = fetchFromGitHub {
owner = "alezost";
repo = "ducpel";
- rev = "4a1671fc45ab92d44dee85a1a223122d5a43cb32";
- sha256 = "1ixb78dv66lmqlbv4zl5ysvv1xqafvqh1h5cfdv03jdkqlfk34jz";
+ rev = "b53b935ab95c02b82ccf38f63c89e39e99477a55";
+ sha256 = "07cgwkfi69xjjxx9hs5rdblsil1h3bpbx9k7hwyv1dg3ivihm04s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d64adac965e1dac0f29dab9a587cd6ce9c3bb3a/recipes/ducpel";
@@ -14425,12 +14656,12 @@
dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
melpaBuild {
pname = "dumb-jump";
- version = "20161015.1230";
+ version = "20161126.2045";
src = fetchFromGitHub {
owner = "jacktasia";
repo = "dumb-jump";
- rev = "a6d6e78eb346542d0ef88ade9ade2f583caceab2";
- sha256 = "1wkzizs50k2ahdqhcr9qgnhwgy0mkxmyysfd61k5iinwjz1z1xxd";
+ rev = "14a6751d3858a21a8d4bdeff18f7f7b07daf056d";
+ sha256 = "1khnzv5kzw2654yjalnvabdxrp3ahjl9sfl1x28l4valm8b5ndj4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump";
@@ -14443,27 +14674,6 @@
license = lib.licenses.free;
};
}) {};
- dummy-h-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "dummy-h-mode";
- version = "20160603.417";
- src = fetchFromGitHub {
- owner = "yascentur";
- repo = "dummy-h-mode-el";
- rev = "2bc896f0e3bd3c976c4bb4cdf8056065bf39f50e";
- sha256 = "1xkfwg1awb3ikb9i71xdbnbb94y3p2qd1fhnbx6kzfs0kmsiv5k9";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/dummy-h-mode";
- sha256 = "10lzfzq7md6s28w2zzlhswn3d6765g4vqzyjn2q5ms8pd2i4b4in";
- name = "dummy-h-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/dummy-h-mode";
- license = lib.licenses.free;
- };
- }) {};
dummyparens = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dummyparens";
@@ -14509,11 +14719,11 @@
dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dyalog-mode";
- version = "20161103.628";
+ version = "20161213.651";
src = fetchhg {
url = "https://bitbucket.com/harsman/dyalog-mode";
- rev = "18cd7ba257ca";
- sha256 = "0lf6na6yvdk5n9viy08cdwbgphlcxksynbkvi2f02saxdzdy368v";
+ rev = "20a2166c8210";
+ sha256 = "0gz0aiks3f53lqvnrnb33a1clq52ipd3i3miymvkkgspnz3vl12p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -14802,12 +15012,12 @@
easy-escape = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-escape";
- version = "20150718.1933";
+ version = "20161209.744";
src = fetchFromGitHub {
owner = "cpitclaudel";
repo = "easy-escape";
- rev = "c87d76e5001f36fbbf975e9ce7e776acd2dd7776";
- sha256 = "1qn0givyh07w41sv5xayfzlwbpbq7p39wbhmwsgffgfqzzz5r2ys";
+ rev = "63fa5fcf9a53b7d3c1e872081e65afad5a722ba8";
+ sha256 = "11v5pzpyrzada07laa3jh6c1hafwrpx1pxvp7r1azqy9fpi3slnz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c39e3b867fa3143e9dc7c2fefa57b5755f70b433/recipes/easy-escape";
@@ -14946,22 +15156,22 @@
license = lib.licenses.free;
};
}) {};
- ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }:
+ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
melpaBuild {
pname = "ebib";
- version = "20161106.2351";
+ version = "20161209.1546";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "ebib";
- rev = "4617ea9cc952ab63dddf8a38ce21ae32442f51f0";
- sha256 = "01f71sxbif5hmgfd9696cwp541a93138d00y58szl1my0wxk0j4g";
+ rev = "87abf50dcb8cc1a68620691dbf78ccae4707ec7c";
+ sha256 = "07ndy86ld8cz627iwh76spj296z7f8ivcimcv3dhna788q6v46xd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
sha256 = "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid";
name = "ebib";
};
- packageRequires = [ dash emacs parsebib ];
+ packageRequires = [ dash emacs parsebib seq ];
meta = {
homepage = "https://melpa.org/#/ebib";
license = lib.licenses.free;
@@ -14970,12 +15180,12 @@
ebib-handy = callPackage ({ chinese-pyim, ebib, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ebib-handy";
- version = "20160509.1556";
+ version = "20161126.140";
src = fetchFromGitHub {
owner = "tumashu";
repo = "ebib-handy";
- rev = "62215c400934a5d5c98bcb906d122b1e6f71b7c2";
- sha256 = "0z89gggdgy2icnc6vwwbqbpnzbixxm6njgkz37zrrpwk23jsx1pb";
+ rev = "e4815b2d127300361b8528681d2d36ad5465e574";
+ sha256 = "03pnapalpdyfcy4irmxwljpwxmbcgz3dzbxd8b0058gkhzan9vrz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8843caa0d80000c70d3b264854f50daac94e6962/recipes/ebib-handy";
@@ -15030,12 +15240,12 @@
eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }:
melpaBuild {
pname = "eclim";
- version = "20161019.838";
+ version = "20161206.908";
src = fetchFromGitHub {
owner = "emacs-eclim";
repo = "emacs-eclim";
- rev = "f2247f2515ee2eb0ff866bcbbf69d9f62b7b7780";
- sha256 = "1d3zyaqgng0q41nnifmwwwwd9bm0w7yhkpj6lwir3m0pg5lrcw48";
+ rev = "7d3beb299399bc9d8190190fa59943b2a70a7f63";
+ sha256 = "14q0qg9a1kxgf89iy48g63nkj7m9hydipmqq670591v09awk877l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
@@ -15219,12 +15429,12 @@
ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ede-php-autoload";
- version = "20161018.436";
+ version = "20161119.419";
src = fetchFromGitHub {
owner = "stevenremot";
repo = "ede-php-autoload";
- rev = "7cf21be8b6d39a9ce1d6d354a47f60d460cbaa1c";
- sha256 = "0rqpw5fl0fi1n0669gsmdjsnhrfhwys9lfgfymzjbv62q3dda6qy";
+ rev = "c6896c648fbc90f4d083f511353d6b165836d0e8";
+ sha256 = "0dfx0qiyd23jhxi0y1n4s1pk9906b91qnp25xbyiqdacs54l6d8a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload";
@@ -15321,6 +15531,27 @@
license = lib.licenses.free;
};
}) {};
+ edit-indirect-region-latex = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild }:
+ melpaBuild {
+ pname = "edit-indirect-region-latex";
+ version = "20161128.2245";
+ src = fetchFromGitHub {
+ owner = "niitsuma";
+ repo = "edit-indirect-region-latex";
+ rev = "05043f2c0c9838947d3ca4b51b695deb7c47612e";
+ sha256 = "0dgac0nk9x4sz4lisxb5badrzpcjqjwgi79hhl1y6mafzm0ncqs2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/688f0b6802d04d133afc3de7371f65b8d5d2bad4/recipes/edit-indirect-region-latex";
+ sha256 = "0lsqz09c4p2gl1xd673783hmmh7y5iq4kw521q7hiza4xbaiwpr3";
+ name = "edit-indirect-region-latex";
+ };
+ packageRequires = [ edit-indirect emacs ht ];
+ meta = {
+ homepage = "https://melpa.org/#/edit-indirect-region-latex";
+ license = lib.licenses.free;
+ };
+ }) {};
edit-list = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "edit-list";
@@ -15387,12 +15618,12 @@
editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "editorconfig";
- version = "20161105.2212";
+ version = "20161212.1946";
src = fetchFromGitHub {
owner = "editorconfig";
repo = "editorconfig-emacs";
- rev = "0946f6672d95a943f1071e678aa91af6e614a143";
- sha256 = "1v5gf3jlb7pi08yjcglghsrwzvdms3r2cpgg2hzd2panwm623wz7";
+ rev = "0e89a891eeffe942d71b93f7792958b38ea1ecf3";
+ sha256 = "09k3rqlwwssmqgynaww3ddfvgvarbsaspgr2c2xzbp9l5gg3rr4h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -15547,8 +15778,8 @@
src = fetchFromGitHub {
owner = "egisatoshi";
repo = "egison3";
- rev = "80aaf63ffa357df2106a192ee04eef54a8dae2fd";
- sha256 = "0wnyyl70jssdwgcd9im5jwxnpn7l07d0v6dx9y8546d254xdwpwx";
+ rev = "636c5bca8faf9e116e8447cf73646257a85f1bfc";
+ sha256 = "1a7vlqwyh2c2qfdir52l2f62g53jcign6q65z66rkdqcdizmjqw7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -15568,8 +15799,8 @@
src = fetchFromGitHub {
owner = "emacs-china";
repo = "EGO";
- rev = "4b97a2e213a960cf6902ad00879262c1b274e122";
- sha256 = "04y0c385w7m60wsknaxc00wb07hkdnlvncr7qgsh5hwh61ggfh6n";
+ rev = "17364e05fc69cd3c9b554f9675d95bf0a3cf4104";
+ sha256 = "1ikbw771j0a8y4wgx5whmgsfimw6a6bv3bc5qkl8r8ch5lph85z4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0090a628a5d566a887cac0d24b080ee6bafe4612/recipes/ego";
@@ -15625,12 +15856,12 @@
ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
melpaBuild {
pname = "ein";
- version = "20161030.1637";
+ version = "20161214.1102";
src = fetchFromGitHub {
owner = "millejoh";
repo = "emacs-ipython-notebook";
- rev = "8e3764044c9bd44fbdab4e870c2fc9a36ce02449";
- sha256 = "0f5k9bx632xjwj3l03vs0k48xvxq4nbi71039fcjqs0bchg814nj";
+ rev = "d85717bd24ec32c41cceaee2defc0957f2f0b4d3";
+ sha256 = "0z3mw1i5iwmnjd2qqsyw0ka159dalrfsviv1lbi0ff4x0sqxsd5q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -15667,12 +15898,12 @@
eink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eink-theme";
- version = "20161021.452";
+ version = "20161207.410";
src = fetchFromGitHub {
owner = "maio";
repo = "eink-emacs";
- rev = "b884e49afb7a89a3766bf8d9efb96bad239375f6";
- sha256 = "0mgdaw57av3wx9wr615p1abrd1mlbx4rn3a4xn5v77gv2g9xyfcr";
+ rev = "40e7a7d31ee160175aa89583609d3f953fb066c6";
+ sha256 = "0701c7x8wwr99d5l50k8n2a6zx7dh067d702v032g5axh7lqsn2j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a1349c3f93ab60983f77c28f97048fa258b612a6/recipes/eink-theme";
@@ -15688,12 +15919,12 @@
ejc-sql = callPackage ({ auto-complete, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
melpaBuild {
pname = "ejc-sql";
- version = "20161019.20";
+ version = "20161117.543";
src = fetchFromGitHub {
owner = "kostafey";
repo = "ejc-sql";
- rev = "bef894ead140c69f82b7eb706c60f7731c3b9b8a";
- sha256 = "0kj117fs9sl2w3bjnmqknhb7zjxiydaqqdackjzv7ypifjbk8plv";
+ rev = "646f72944d9fb792cd21346d0234650eb5dc9c87";
+ sha256 = "1jm9fsbyrx7l7bmv50zalxjwrazcmjpdrrqm0y3c56ckix9fpqfv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
@@ -15734,8 +15965,8 @@
src = fetchFromGitHub {
owner = "dimitri";
repo = "el-get";
- rev = "4b767b8565c5090538b1d73500dd50f2102150cb";
- sha256 = "1ddfz4b0bphixg3maa4mrbjc82q94s08pz0990b4pgqgh4als7sc";
+ rev = "ce9dc5ec48dae139338c69a53f9779876038bb54";
+ sha256 = "0wknmkv38zf8q4qd2iasng08mia1x7l813qzvysw8lv1x45gspsy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -15976,27 +16207,6 @@
license = lib.licenses.free;
};
}) {};
- elang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
- melpaBuild {
- pname = "elang";
- version = "20160104.656";
- src = fetchFromGitHub {
- owner = "vkazanov";
- repo = "elang";
- rev = "30dc30c2c55e902fb213865aa79e2cbbc0dbc88e";
- sha256 = "1wikmzl9gi72h6fxawj0h20828n4vypw9rrv35kqnl4gfrdmxzkk";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1cb66c2a6272a804d7a81fc506643e80f11da306/recipes/elang";
- sha256 = "0frhn3hm8351qzljicpzars28af1fghgv45717ml79rwb4vi6yiy";
- name = "elang";
- };
- packageRequires = [ names ];
- meta = {
- homepage = "https://melpa.org/#/elang";
- license = lib.licenses.free;
- };
- }) {};
eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eldoc-eval";
@@ -16060,12 +16270,12 @@
electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
melpaBuild {
pname = "electric-operator";
- version = "20161023.241";
+ version = "20161211.1122";
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "electric-operator";
- rev = "cbb27a753bb3ff69c2fbe31e5d9df77f764f5472";
- sha256 = "1wb00qms1rpz729zkdnk1j2mh2lnx6cfh5g9i7la4pnfdvsgpy4j";
+ rev = "86d5ae04c35642cbccfa75a12008f7b65d63312b";
+ sha256 = "189vxvhp018bs42qb6z9nfw51nsmjfb5q66w3hr5zgkapxwgjpsv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator";
@@ -16081,12 +16291,12 @@
electric-spacing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "electric-spacing";
- version = "20151209.736";
+ version = "20161209.1157";
src = fetchFromGitHub {
owner = "xwl";
repo = "electric-spacing";
- rev = "78e4ccbb0a924a3062fa16c9b24823bb79bb1f3e";
- sha256 = "0q1pb01h48wdbjgi04a6ck2jn7yfh92wpq1vka5pg54wv2k9b5fn";
+ rev = "9d0f8a213133f2619a4e9dfbba3b00d4348c07b0";
+ sha256 = "1wzf8q2k2iwnm9b5kj16bwif7g0qc7ll3cjs20gbmcnq5xmhwx9f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a78c0044f8b7a0df1af1aba407be4d7865c98c59/recipes/electric-spacing";
@@ -16144,12 +16354,12 @@
elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elfeed";
- version = "20161030.1731";
+ version = "20161211.1108";
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef";
- sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i";
+ rev = "4f7699913ee1e9c815276760ced3393e88e506f4";
+ sha256 = "11fsfki4cz2q3xnrm1mrb94sf2achl3g2bwmi21d1xn68z4zg79x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -16218,8 +16428,8 @@
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef";
- sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i";
+ rev = "4f7699913ee1e9c815276760ced3393e88e506f4";
+ sha256 = "11fsfki4cz2q3xnrm1mrb94sf2achl3g2bwmi21d1xn68z4zg79x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -16319,12 +16529,12 @@
elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
melpaBuild {
pname = "elisp-refs";
- version = "20161027.2208";
+ version = "20161205.444";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "refs.el";
- rev = "f710313f4be05ff475c16ffda77f01026512ad34";
- sha256 = "0vdlcc4mfpda5pxwwfdqwnq3jhgv9mgj6739gnb00i192jg4605g";
+ rev = "412dafa219ab4eac6eddcc793588d26d2df6fe21";
+ sha256 = "0nl39ikk8nlc0xar8r8s2g9dp2n52qi1gmksnck7klbphmw6xx3n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
@@ -16424,12 +16634,12 @@
elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
melpaBuild {
pname = "elm-mode";
- version = "20161031.51";
+ version = "20161210.49";
src = fetchFromGitHub {
owner = "jcollard";
repo = "elm-mode";
- rev = "a842d54348846746ef249a87ac7961a9a787947f";
- sha256 = "1ycbc2dz8qmdxpac6yz4dxp531r50nhzdxaknm5iwz6d94pcfgni";
+ rev = "29f50a940113d793a21998f3bb414fdd9b0c5daa";
+ sha256 = "02c7xl9w81140l7p9kywr5qwsdyv92nxdhzqcxjk0r09x7s0cvsk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -16652,19 +16862,19 @@
license = lib.licenses.free;
};
}) {};
- elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }:
+ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
melpaBuild {
pname = "elpy";
- version = "20161028.215";
+ version = "20161211.1045";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "elpy";
- rev = "5c900ff6b5524e216247f52ed4085734d815dacb";
- sha256 = "1h0k3nvxy84wjsiiwpxd8xnwnvbiqld26ndv6wmxqpwsjav186ik";
+ rev = "6b139ed3f28cfe255288aa07f14c49f1f15132bf";
+ sha256 = "0hmk1pi9mv74ry3mff854qz07rpiirn275wkd6s4vqpy7m8za4rv";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a36daf2b034653cd73ee2db2bc30df2a5be6f3d1/recipes/elpy";
- sha256 = "0n802bh7jj9zgz84xjrxvy33jl6s3hj5dqxafyfr87fank97hb6d";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
+ sha256 = "1ri3dwnkw005plj1g5grmmq9np41sqk4s2v18pwsvr18ysnq6nnr";
name = "elpy";
};
packageRequires = [
@@ -16672,6 +16882,7 @@
find-file-in-project
highlight-indentation
pyvenv
+ s
yasnippet
];
meta = {
@@ -17057,22 +17268,22 @@
license = lib.licenses.free;
};
}) {};
- emamux = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ emamux = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emamux";
- version = "20160602.653";
+ version = "20161123.414";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-emamux";
- rev = "4e75121767001a587d01a71e61688d147a7c50c1";
- sha256 = "0jpyrh2qmhgp6wdf5jp3lr9shpj0mvsnfric8hqp0b5qda9hi2v8";
+ rev = "e4611a4049d3180e35da6419cf01f15c8fe2575f";
+ sha256 = "1gskns6fqgp575hvk3jxl8wjlrh3i6wq1s4lwbgx0m5qybgqa62q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6de1ed3dfccb9f7e7b8586e8334af472a4988840/recipes/emamux";
sha256 = "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz";
name = "emamux";
};
- packageRequires = [ cl-lib emacs ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/emamux";
license = lib.licenses.free;
@@ -17183,15 +17394,36 @@
license = lib.licenses.free;
};
}) {};
+ emlib = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "emlib";
+ version = "20161126.723";
+ src = fetchFromGitHub {
+ owner = "narendraj9";
+ repo = "emlib";
+ rev = "dea2af00f551ea580c641d86dd69219f7d4f3685";
+ sha256 = "0p52pkq3wvnhg0l7cribhc39zl1cjjxgw9qzpmwd0jw1g1lslwbm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/46b3738975c8082d9eb6da9fe733edb353aa7069/recipes/emlib";
+ sha256 = "02l135v3pqpf6ngfq11h4rc843iwh3dgi4rr3gcc63pjl4ws2w2c";
+ name = "emlib";
+ };
+ packageRequires = [ cl-lib dash ];
+ meta = {
+ homepage = "https://melpa.org/#/emlib";
+ license = lib.licenses.free;
+ };
+ }) {};
emmet-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emmet-mode";
- version = "20160906.1919";
+ version = "20161113.2158";
src = fetchFromGitHub {
owner = "smihica";
repo = "emmet-mode";
- rev = "607a23d208405838325ca5203a1900682dad00ac";
- sha256 = "04b0663hxq7hyha6ccdxwdal803p91ipwhrk385qlc5i2mnx81fq";
+ rev = "5af39aaef59125fd80901f275c23c89493f9d133";
+ sha256 = "1csfd8ixz9gk0hkakcs5qv4f3qxg605blav3a463ipw2a8alyava";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/emmet-mode";
@@ -17206,11 +17438,11 @@
}) {};
emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "emms";
- version = "20160801.1349";
+ version = "20161108.644";
src = fetchgit {
url = "git://git.sv.gnu.org/emms.git";
- rev = "02c5183a484b12d529b0901a81604eb658bec8d3";
- sha256 = "02sl9nipa96bzn1adqsgp1nrb20iawscr8kajyhv0613r7igi177";
+ rev = "cf6903c22b49b2e3efe338a9ccbd0df36b6d0cbf";
+ sha256 = "05hqz1rlcl54fgnh40qy60ji60lycpgiqv6nnkzp29c7gc4sa40d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/205eeed002b0848809a4c5f8ad99d925b48799ec/recipes/emms";
@@ -17289,12 +17521,12 @@
emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emms-player-mpv";
- version = "20160724.729";
+ version = "20161204.633";
src = fetchFromGitHub {
owner = "dochang";
repo = "emms-player-mpv";
- rev = "d3e3bace6b648f5b60d833a72a50603545102934";
- sha256 = "1kmkza1x1xajdswdmvxasglpr8fl9vr1pi3yhi7a9cqqa5s1y2ah";
+ rev = "ce142304d1fe6b096b9b984e40e55c8cc54217c1";
+ sha256 = "1s8jmkcr11fp93hmyxq7c781lx7krc5xsk99ar0h50v2hpnmzgbb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv";
@@ -17478,12 +17710,12 @@
emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }:
melpaBuild {
pname = "emojify";
- version = "20160928.550";
+ version = "20161124.940";
src = fetchFromGitHub {
owner = "iqbalansari";
repo = "emacs-emojify";
- rev = "4eccfc7ce43d4dfd3cf65ea86b2975abb4b4e9ad";
- sha256 = "1n5pmcd6d71pcgjwkqnmh6midcyp7ahc5yry3r38my3shrwirqc2";
+ rev = "62609316f269bed9e6775f9614783789a79268e7";
+ sha256 = "04wwi7f6cma1s0nhw2k756k3x3sjsc5s7iq1q6zlq4wmz08czg6v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify";
@@ -17520,12 +17752,12 @@
emr = callPackage ({ cl-lib ? null, clang-format, dash, emacs, fetchFromGitHub, fetchurl, iedit, lib, list-utils, melpaBuild, paredit, popup, projectile, redshank, s }:
melpaBuild {
pname = "emr";
- version = "20160613.1430";
+ version = "20161207.1229";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "emacs-refactor";
- rev = "27f324c5da2f7c5a13f1f5e970606cf45f24199f";
- sha256 = "10pbs3wk40ahskz63gfjkqrsj86fy363w50bzlm5ipa82plwgic0";
+ rev = "483877f912944ff0e4a51362548c3528c4df068c";
+ sha256 = "0i426ri2fk2wijk4k95yiqbky4as9w4gpw264rrh14y43fx0ncyj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd2ebec5bd6465bffed284130e1d534f52169a9/recipes/emr";
@@ -17700,12 +17932,12 @@
ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
melpaBuild {
pname = "ensime";
- version = "20161031.246";
+ version = "20161203.1059";
src = fetchFromGitHub {
owner = "ensime";
repo = "ensime-emacs";
- rev = "0dedd95b8e9ad09be9521160a7893eb58514c992";
- sha256 = "1xsbw32fysl3pdxbnczdgczbrhl3qqghgk5mcbb1j4a7rnp4js3m";
+ rev = "5156f9b1b748c3e2246730d3234121b36e6d7553";
+ sha256 = "08m5ps972fbjwz97s6bs92icf7x32kh2invjdypy59zj2q0pdixv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -17810,6 +18042,27 @@
license = lib.licenses.free;
};
}) {};
+ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "epkg";
+ version = "20161201.1358";
+ src = fetchFromGitHub {
+ owner = "emacscollective";
+ repo = "epkg";
+ rev = "846c5ee182e6572af3034c5b43d439a6c915d243";
+ sha256 = "17i68vsl1grffs7j5n7lzkwi870fci7y84q5i7qwvip3vhpxlczr";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
+ sha256 = "0vvkjjaffvwvsvld3c6hwd18icmp2lc7f9yqvclifpadi98dhpww";
+ name = "epkg";
+ };
+ packageRequires = [ closql dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/epkg";
+ license = lib.licenses.free;
+ };
+ }) {};
epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "epl";
@@ -18211,12 +18464,12 @@
ereader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, xml-plus }:
melpaBuild {
pname = "ereader";
- version = "20161103.1834";
+ version = "20161119.652";
src = fetchFromGitHub {
owner = "bddean";
repo = "emacs-ereader";
- rev = "af00d57441e6fe92d8f03d2557f4dec0a410e5e5";
- sha256 = "1rgh2p8sz4hcqavalm48dzp1gsnccmc8zd27rv1a4xhaaihw23cl";
+ rev = "57fc9c3f1ab9cfb2d6b5f20731ff7f63ee3daaa4";
+ sha256 = "0hd949g9al3lifbpy36z4v9ia61zbjvj05kpb3min642m1a5361i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5a3feaacdfcddb862cd3101b33777d9c19dfd125/recipes/ereader";
@@ -18274,12 +18527,12 @@
ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
melpaBuild {
pname = "ergoemacs-mode";
- version = "20161025.1222";
+ version = "20161206.1258";
src = fetchFromGitHub {
owner = "ergoemacs";
repo = "ergoemacs-mode";
- rev = "f12edbb42f512ebeabcfb0a56e89924c21ddc529";
- sha256 = "12zmq9bsfjiigp3fdnqa349dmc8n5mb2j1szlpmzj2f4i6vm9rk3";
+ rev = "d5d7e5b6a5537cdcfcc79efd43bbde138fc7863c";
+ sha256 = "1jj7pgcbspallki9in4dn2d0wzis873r89y5kniycnydqfzadpjs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode";
@@ -18316,12 +18569,12 @@
erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erlang";
- version = "20161024.359";
+ version = "20161129.304";
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
- rev = "3e06b82f0f29d90bff0783e7f3d1dabb435782f5";
- sha256 = "1i6zjj4pl5cdvqxv2ghcm0dml3jdm82hk3yp4l20zs49i1j3f43p";
+ rev = "37933d48e1569bdf538686d8a1f82e7be4125ed5";
+ sha256 = "0h7jm42xj22jb512lsbjjd7gddgx4dh0711kblz3qazkm0ngw0ds";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -18645,22 +18898,22 @@
license = lib.licenses.free;
};
}) {};
- eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eshell-git-prompt";
- version = "20160509.138";
+ version = "20161126.758";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "eshell-git-prompt";
- rev = "826d2ebdec0808493955a4544dc91b575f6c4ecf";
- sha256 = "00gaq8vz8vnhh0j2i66mp763hm3dfxkxz3j782nsfml81sngkww0";
+ rev = "fb56e851c1baac68249c34043bd5db9c9420141e";
+ sha256 = "08mhjps17w3kfmmbdws1lqzphr2ayl160i0ckd4552jdyzd28vvs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5272280b19579c302ba41b53c77e42bc5e8ccbda/recipes/eshell-git-prompt";
sha256 = "0a8pyppqvnavvb8rwsjxagb76hra9zhs5gwa0ylyznmql83f8w8s";
name = "eshell-git-prompt";
};
- packageRequires = [ cl-lib dash emacs s ];
+ packageRequires = [ cl-lib dash emacs ];
meta = {
homepage = "https://melpa.org/#/eshell-git-prompt";
license = lib.licenses.free;
@@ -18690,12 +18943,12 @@
eshell-up = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eshell-up";
- version = "20161019.1214";
+ version = "20161120.1117";
src = fetchFromGitHub {
owner = "peterwvj";
repo = "eshell-up";
- rev = "1e6313bb62c573c0f07d3fc6dc910b7a48bc1b18";
- sha256 = "0ffs6iw0v2y2gggpr7hpzcclcdvfim98d3ln38bf1bnajfjg0fz7";
+ rev = "e763b4c0bcd70252396d7825cb53bf00e60a547e";
+ sha256 = "00ckk2x9k8ksjlw54sajcg13m6c9hp3m6n71awqbm9z17prnkzl1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4d033b20d047db8ddd42bdfa2fcf190de559f706/recipes/eshell-up";
@@ -18711,12 +18964,12 @@
eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eshell-z";
- version = "20151110.2046";
+ version = "20161206.2249";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "eshell-z";
- rev = "5a1317a58d9761c200d0ad49dc4793dec9f9490f";
- sha256 = "0znk2wmvk7b5mi727cawbddvzx74dlm1lwsxgkiylx2qp299ark0";
+ rev = "033924f138f19f22a30c1845e728691e5615fa38";
+ sha256 = "0kp9yw56l8bl4zqganclnpf6x5g2rmcf23265n8cp24j6d7c7r4h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8079cecaa59ad2ef22812960838123effc46a9b3/recipes/eshell-z";
@@ -19313,12 +19566,12 @@
evil-colemak-basics = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-colemak-basics";
- version = "20160625.959";
+ version = "20161117.1319";
src = fetchFromGitHub {
owner = "wbolster";
repo = "evil-colemak-basics";
- rev = "69fd9db21bb2a281d5232d45555714b195825043";
- sha256 = "16g7322ib53cd8f12mqw25j77g0q8vivnc6q483i5kvaivnbqvd4";
+ rev = "5e56117af85e89659e9565abefef24fab7b567e8";
+ sha256 = "0r62rpgklsc24yj57w72jq9i1c54fr4ksy99siyvkginmcink7kz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics";
@@ -19359,8 +19612,8 @@
src = fetchFromGitHub {
owner = "linktohack";
repo = "evil-commentary";
- rev = "5fe309effae89fa60a3b9dc47383fa54fce2bc7e";
- sha256 = "0nsragb714xycmq35kl29ngmchwapvm2hdk0fc29iv75mrmflnr1";
+ rev = "a5f2543cb2b90d73b86776f02b25ef16c505832e";
+ sha256 = "1nslk5j55yqaczpbz7w8jirl6gbccb32w8g6bm7higvv8cjv7qsg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fe5b05152c919d49ddd920b1bd5ffc351141fa0d/recipes/evil-commentary";
@@ -19485,8 +19738,8 @@
src = fetchFromGitHub {
owner = "Dewdrops";
repo = "evil-exchange";
- rev = "6e80e2509bcc14d84ca04e3c463c04e4c999efa4";
- sha256 = "1ffhkl7ssfbngvgdjaxqdihi246lgcsgwqc5m8lil7s00xrj3gw2";
+ rev = "8902966aec2709b7e680d13c362d74b7f89b909b";
+ sha256 = "1jfjgh75ycm6i01zpnz8y1hp205w61rqbvargk3rp65c34j48dcd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9b06397c032d24a8da4074ad97cdb30d0c468e20/recipes/evil-exchange";
@@ -19502,12 +19755,12 @@
evil-extra-operator = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-extra-operator";
- version = "20160406.2322";
+ version = "20161212.2003";
src = fetchFromGitHub {
owner = "Dewdrops";
repo = "evil-extra-operator";
- rev = "96d611b557876caefbc64731ad2d0385edbb0c23";
- sha256 = "10vwyrg833imja3ak9fx0zackdjwlcncl7wm9dym3kjs6qf2rvv0";
+ rev = "e16a9b36f9901254da9af8a73871061616410fc3";
+ sha256 = "116srvfck3b244shxm9cmw3yvpprjgr840fvcv6jwwpfaphafxw4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0b157c3adf8a2899c4dd2ce98e8a81e4f403a3/recipes/evil-extra-operator";
@@ -19691,12 +19944,12 @@
evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "evil-magit";
- version = "20160728.751";
+ version = "20161130.847";
src = fetchFromGitHub {
owner = "justbur";
repo = "evil-magit";
- rev = "077354f8ebd5da76937bf8f5df5d484f8a0ccc62";
- sha256 = "05llzcdbg84x04a98b6r7d0m8631hk83hjq33hwd4n8ixp85dg20";
+ rev = "9251065b73c5023fc21d56f5b94c505cb7bee52d";
+ sha256 = "17jnqd73i680fpmghghadc4d4xlg39xfjx3ra8sll0h1xf4xkspi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cfc6cc3581323c81d5f347895aaddfdc71001f22/recipes/evil-magit";
@@ -19730,22 +19983,22 @@
license = lib.licenses.free;
};
}) {};
- evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-matchit";
- version = "20161023.1639";
+ version = "20161130.454";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "evil-matchit";
- rev = "51d46747e39dc247ea4b72839421b85f53d487be";
- sha256 = "15fr19gv2rf8pvns7r0jmy1z2f08bjprqxz3hj1fzn9wgc42iwg7";
+ rev = "e9f77f7d6a14434a8ca3280d721b96c0984fa7eb";
+ sha256 = "11mhgw0xa8kn73svgvzpmvvnkj2ja4mxs030vlzkh4scvlfa98dl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq";
name = "evil-matchit";
};
- packageRequires = [];
+ packageRequires = [ evil ];
meta = {
homepage = "https://melpa.org/#/evil-matchit";
license = lib.licenses.free;
@@ -19754,12 +20007,12 @@
evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-mc";
- version = "20161104.859";
+ version = "20161213.2138";
src = fetchFromGitHub {
owner = "gabesoft";
repo = "evil-mc";
- rev = "494cbf6fc0eba4cbe7b6dbd3c75add14e2aca63c";
- sha256 = "06ywfq7vwqhqf9a715wfbpvl5va7sj6dfavizi4xjzaysmg8sn29";
+ rev = "c8796e3c611cd8ca55e80a0487b93c4b0551d45c";
+ sha256 = "16xs6aj3ws6skhvqfda2i7y1gj0gg20yra99hpnkz05f4gcpjfmh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc";
@@ -19880,12 +20133,12 @@
evil-opener = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, opener }:
melpaBuild {
pname = "evil-opener";
- version = "20161017.235";
+ version = "20161207.1010";
src = fetchFromGitHub {
owner = "0robustus1";
repo = "opener.el";
- rev = "ad3c65a5a748230bf07c18f56b1998ac03e3807a";
- sha256 = "178h7sbpgsn0xl93j7375f2ahmqcszmbl3f7mfb6vgjmm791q03p";
+ rev = "c384f67278046fdcd220275fdd212ab85672cbeb";
+ sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/da8d4e5bf23985632f993336b9183fe9f480addc/recipes/evil-opener";
@@ -19982,6 +20235,27 @@
license = lib.licenses.free;
};
}) {};
+ evil-replace-with-register = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "evil-replace-with-register";
+ version = "20161127.2159";
+ src = fetchFromGitHub {
+ owner = "Dewdrops";
+ repo = "evil-ReplaceWithRegister";
+ rev = "c979aa2f4d730d2a741358e357d18544edd46cd2";
+ sha256 = "168qqbsjwblhrq92mw0v1f86d3q1m2f5rh37xikj1bk589c2izp9";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bd98aebefc13da5a129d1d3f1c8878e4a70654/recipes/evil-replace-with-register";
+ sha256 = "0qyym6vwjs0aqf2p28rh96v30pgxg060pxyij0vrfj469wzmlrj9";
+ name = "evil-replace-with-register";
+ };
+ packageRequires = [ evil ];
+ meta = {
+ homepage = "https://melpa.org/#/evil-replace-with-register";
+ license = lib.licenses.free;
+ };
+ }) {};
evil-rsi = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-rsi";
@@ -20321,12 +20595,12 @@
evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-visual-replace";
- version = "20160923.2243";
+ version = "20161122.1641";
src = fetchFromGitHub {
owner = "troyp";
repo = "evil-visual-replace";
- rev = "65293924a42c94bd6ea788caf5a33330eb78d7a5";
- sha256 = "1rhsrfd6mb3bm80yqzaangq8i2snlv2m8ia7mawnn7d4hvjk8z8z";
+ rev = "f88c8aa9e3a0d7e415bec50dcdf4bc5bb8feee45";
+ sha256 = "1rmdjlbh3ah1pcdsd6yzb15g15b10x0py1alfywvyc1p227lv4v8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/165aea6697a6041bb83303f3ec8068a537accd4a/recipes/evil-visual-replace";
@@ -20468,12 +20742,12 @@
expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "expand-region";
- version = "20161020.1412";
+ version = "20161122.50";
src = fetchFromGitHub {
owner = "magnars";
repo = "expand-region.el";
- rev = "0bc14fc7fbbcca5da4fdd9695cfd7cbd36eb3b96";
- sha256 = "0h40dhc3kn8fq86xnwi5lz7ql8my8737y7wkqr897p15y90swr35";
+ rev = "6dd45d90a59178191e71c10c438f89b495a6c4aa";
+ sha256 = "1ac62z6a7xpj0ayc9v1is7avil6r5s8rlwx39ys922qw5y281q2w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region";
@@ -20573,12 +20847,12 @@
eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eyebrowse";
- version = "20161027.1213";
+ version = "20161119.442";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "eyebrowse";
- rev = "41344e2aa2a919eae62ecedf80dcd41456084bcc";
- sha256 = "1b9341qqzr43sq0mjb2rkc5r9a2fyzwh1dm2qh27rcsb3vg219h2";
+ rev = "a009536514409fdf0a1745504a7d7e0e376cc2c9";
+ sha256 = "0kw13w3q1q4gb3ql728bk9m0rymkp21rrjmy4hyx8im84xh093ls";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse";
@@ -20940,12 +21214,12 @@
fasd = callPackage ({ fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }:
melpaBuild {
pname = "fasd";
- version = "20151207.2316";
+ version = "20161203.2208";
src = fetchFromGitHub {
owner = "steckerhalter";
repo = "emacs-fasd";
- rev = "8726a367048054add81ecea7543de00688056735";
- sha256 = "0m2qn3rd16s7ahyw6f9a4jb73sdc8bqp6d03p450yzcn36lw78z5";
+ rev = "9883cf23f632357fa42ffde3e4942bf9022a4fac";
+ sha256 = "12i5n7aw9nhlh1ghj98jsigbj55qx85v0i8j154sqv7spx8anf2c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8f0fefb25f03677080c9adeeb48046d6ea163053/recipes/fasd";
@@ -21024,12 +21298,12 @@
fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fcitx";
- version = "20161013.1040";
+ version = "20161118.1128";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "fcitx.el";
- rev = "433176166c561a2de8d511a1cf6fec751bcb0c57";
- sha256 = "1nvr4jh3f0qs4lpsb1sw3ih4mi5pcgn8ryxlbnax11rdcdkm625r";
+ rev = "830fa2e665d7bcba8f7e7de754937c1ae6e9b60b";
+ sha256 = "0qds4sqj9hppi5dfsfbpvba86fwigjprr75900rb50bb06ql4dqh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx";
@@ -21066,12 +21340,12 @@
feature-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "feature-mode";
- version = "20160805.2015";
+ version = "20161123.532";
src = fetchFromGitHub {
owner = "michaelklishin";
repo = "cucumber.el";
- rev = "f0aaa806b52eec7ee8fe97883274ed49c28e8eb8";
- sha256 = "0ms1hmwc78vix91396ia317prw54vqjx8qv2qrcccwa8bphc0py5";
+ rev = "aa06b88ad96bc556992f011b6aef9b78e99ae48b";
+ sha256 = "1iybvdkszrqwz9knmfffmcknsdhnpc71961y0xb4xgad8i043n2y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0a70991695f9ff305f12cfa45e0a597f4a782ba3/recipes/feature-mode";
@@ -21230,8 +21504,8 @@
src = fetchFromGitHub {
owner = "snarfed";
repo = "fillcode";
- rev = "ae5f6c6de81a7681c8f883e7fce36fd0f2b3c1e8";
- sha256 = "1x9wmxbcmd6qgdyzrl978nczfqrgyk6xz3rnh5hffbapy1v1rw47";
+ rev = "1f64f0303a3157eabec355fd155571bb0c042489";
+ sha256 = "0cgrswhbmzyfpkrp8iznsn1lxnb61dz2f0181pqd9gdf55qrk67m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/85eb403503aa83799a6072bfe21bf66c8177ca73/recipes/fillcode";
@@ -21288,10 +21562,10 @@
}) {};
find-dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "find-dired-plus";
- version = "20160515.950";
+ version = "20161128.1426";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/find-dired+.el";
- sha256 = "0a2wgdrj6yxvpmzqiqpgzj3gbf04fvbhrfa3213hiah1k9l066m5";
+ sha256 = "1h4q2v88wvfmzdmaqnp9fywna7n9a94kziz6hjdf1xhc5a7lxqsc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8f884334b7eb83647146e7e8be028935ba12ce/recipes/find-dired+";
@@ -21307,12 +21581,12 @@
find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "find-file-in-project";
- version = "20161026.145";
+ version = "20161202.2205";
src = fetchFromGitHub {
owner = "technomancy";
repo = "find-file-in-project";
- rev = "4f7d96fde81c41b023515d33d635a76f8ba647cc";
- sha256 = "01fcqs3jckrqfg4i3axgzdp53mxfxa4lbc9xsfssi0fxq4b7clh6";
+ rev = "1c50ca72acd816c5d5b3fbdb605bbd85a0172b11";
+ sha256 = "0nzn5bccxr8nsxqbc2gx17hrydbx511h4ba6bz3gaf78qfppn2ff";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -21850,12 +22124,12 @@
flim = callPackage ({ apel, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flim";
- version = "20161029.1930";
+ version = "20161210.1728";
src = fetchFromGitHub {
owner = "wanderlust";
repo = "flim";
- rev = "62c5fee3a0b9a0a8b122940ea5cd536adfac0ef0";
- sha256 = "0iwamgidr4i7jpqfd1mrja4id0app87w6llmpbpj7sxy1pbjv1qk";
+ rev = "3510d32e5820b2c22b4e9c9f29177beea42c5bfb";
+ sha256 = "0ggr8fkzwa6k0i7gl41qxkvkvnzpqzbhnd6klbk6j6j0rw1pmgn8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/94faf56ff9bf94f51ef5253e4c4244faec5eecfd/recipes/flim";
@@ -21928,6 +22202,27 @@
license = lib.licenses.free;
};
}) {};
+ fluxus-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, osc }:
+ melpaBuild {
+ pname = "fluxus-mode";
+ version = "20161124.1145";
+ src = fetchFromGitHub {
+ owner = "defaultxr";
+ repo = "fluxus-mode";
+ rev = "6670eeda008e2f0180e549624da708d5aa3599f6";
+ sha256 = "1r2i88qv7zxcgccvyxpgq36ilsv3rdplx52pvd6kvfcw7whym205";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a3396e0da67153ad051b8551bf34630d32f974f4/recipes/fluxus-mode";
+ sha256 = "1xn2aw9gxwkmr1miam63lrdx6n0qxsgph3rlaqy9cbs0vkb254an";
+ name = "fluxus-mode";
+ };
+ packageRequires = [ emacs osc ];
+ meta = {
+ homepage = "https://melpa.org/#/fluxus-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
flx = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flx";
@@ -21994,12 +22289,12 @@
flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
melpaBuild {
pname = "flycheck";
- version = "20161106.149";
+ version = "20161117.144";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck";
- rev = "f44a5f7d6f0da7f656b6167f566b72cdd7c62dbb";
- sha256 = "0nyp7aw0144klm5mkq21lalma25g0pqs1y2f7j7rv6phg4mmnk1x";
+ rev = "a4dfb0eb5e5d59ab41646dfda06d551b15bfdf21";
+ sha256 = "049r2ycy4gxzmxhfjyq9g00y2jm8byfzh2j214jig3pssx12amwr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -22183,12 +22478,12 @@
flycheck-credo = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-credo";
- version = "20160902.800";
+ version = "20161121.2201";
src = fetchFromGitHub {
owner = "aaronjensen";
repo = "flycheck-credo";
- rev = "cdf73c72b637ee585a90b1ff8100c81186472f3b";
- sha256 = "0a5j3zd9jn1s4as53mx4438pajzbm743xhn7aqjx9wdrdfy7gsp4";
+ rev = "f773422c356c1c3b39fcece3cb7cc1257c7df517";
+ sha256 = "0cq6lap4gndm801lj1q1wajpb03vz40hsdimr1n02p2k2dkrz8p3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/88dfffe034135cc46d661f8173e8b14e0fb7f240/recipes/flycheck-credo";
@@ -22306,6 +22601,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-demjsonlint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-demjsonlint";
+ version = "20161114.2318";
+ src = fetchFromGitHub {
+ owner = "z4139jq";
+ repo = "flycheck-demjsonlint";
+ rev = "1c433150fdf628dda4c9fad938bf7c79610b4460";
+ sha256 = "0kmvwmaxw64xjgchq8szk9mhbi6xp2jhv7qpgqndf4svia4pqws6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b66df1afde83607408fb1b30e1260f22015bf448/recipes/flycheck-demjsonlint";
+ sha256 = "0prwgi6v48ng89vvizb901iq4ysmrlh0g2b3797p1a6z2mps0k57";
+ name = "flycheck-demjsonlint";
+ };
+ packageRequires = [ flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-demjsonlint";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-dialyzer = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-dialyzer";
@@ -22393,12 +22709,12 @@
flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-flow";
- version = "20160905.50";
+ version = "20161123.136";
src = fetchFromGitHub {
owner = "lbolla";
repo = "emacs-flycheck-flow";
- rev = "53c7ba2caed744408bbe01c24753dddc080361a7";
- sha256 = "1fp3xzq1i1z62i6qv2345la3qvniir5qvjvwhrfm7b9mx0n77alp";
+ rev = "0748aa26a03437d36bf7083e6fc1af8f382dd1a3";
+ sha256 = "1mmgahrq0v77i9w95jcg2n3aqqrvzd2s4w3b2mr70i23wq5y5wqy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow";
@@ -22502,8 +22818,8 @@
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck-hdevtools";
- rev = "53829f0c57800615718cfce27ffa16d8ba286cee";
- sha256 = "1isx9v5xx35pglmhyhpmpg7axw0krmnl0n2qiikf499z7dd35wyn";
+ rev = "eab1fc184854341a56154623a131cab6ff0ce18c";
+ sha256 = "0prmrix9a95zr39ybajp7fha03wknxyhrf1kfxsms1brxsc8bqim";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9e210eb2405cc85dd1d03e9119d2249178950398/recipes/flycheck-hdevtools";
@@ -22663,6 +22979,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-objc-clang";
+ version = "20161214.509";
+ src = fetchFromGitHub {
+ owner = "GyazSquare";
+ repo = "flycheck-objc-clang";
+ rev = "3140e4c74dbaa10e6f8edd794144d07399a8fda8";
+ sha256 = "0zzb03qxfs5wky40hzmldkzq5gn4c7qknkd5ra2lghzj0az6n9ld";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
+ sha256 = "07mzwd04a69d7xpkjmhfmf95j69h6accnf9bb9br7jb1hi9vdalp";
+ name = "flycheck-objc-clang";
+ };
+ packageRequires = [ emacs flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-objc-clang";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, merlin }:
melpaBuild {
pname = "flycheck-ocaml";
@@ -22687,12 +23024,12 @@
flycheck-package = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, package-lint }:
melpaBuild {
pname = "flycheck-package";
- version = "20161015.1803";
+ version = "20161111.1451";
src = fetchFromGitHub {
owner = "purcell";
repo = "flycheck-package";
- rev = "cf561bf9896d3e7b6bdcdb7801de6cb9f548b573";
- sha256 = "124ahlxpkcb5mcndmg8k8rdxx0piis6372zllxk6ywmgxz9mlgy1";
+ rev = "afe8a49343d90d08ee72ac6f993d424dcc39cc38";
+ sha256 = "19pz8h01yacfqsyh5940pam6vigvavsqg6qd84994d7mmzl534qa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package";
@@ -22747,6 +23084,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-plantuml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, plantuml-mode }:
+ melpaBuild {
+ pname = "flycheck-plantuml";
+ version = "20161122.219";
+ src = fetchFromGitHub {
+ owner = "alexmurray";
+ repo = "flycheck-plantuml";
+ rev = "f1628d589991c3d51965db0f14866b1202374eea";
+ sha256 = "1j66y4qps1wjdagr36kgqgz1w8zcmwnpwcvgwn4gkif34n96s78l";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/65f050860a0efda8cf472c2945b79a0a57651556/recipes/flycheck-plantuml";
+ sha256 = "01l22isiym635471628b951n025ls3lm6gfhfp6f8n8w7v1sb986";
+ name = "flycheck-plantuml";
+ };
+ packageRequires = [ emacs flycheck plantuml-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-plantuml";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-pony = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-pony";
@@ -22768,22 +23126,22 @@
license = lib.licenses.free;
};
}) {};
- flycheck-pos-tip = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }:
+ flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }:
melpaBuild {
pname = "flycheck-pos-tip";
- version = "20160323.129";
+ version = "20161112.912";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck-pos-tip";
- rev = "2a92f6e2f8cf6a1019358c69c14c7ca835d02955";
- sha256 = "017869kcd4cjyv0hx4pkpfln96cxp6ra4ps7rx6xwrxa24f0bhrz";
+ rev = "88b5a6d7ce0f313cbd22d554ea248aab95357d33";
+ sha256 = "0jfgq346b4nh9wry3mnf4sfbv3l78kgadklvbv0nxykvlpx9c1rv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/698843f75e17b9e6160487c0153f9d6b4af288f6/recipes/flycheck-pos-tip";
sha256 = "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9";
name = "flycheck-pos-tip";
};
- packageRequires = [ dash flycheck pos-tip ];
+ packageRequires = [ emacs flycheck pos-tip ];
meta = {
homepage = "https://melpa.org/#/flycheck-pos-tip";
license = lib.licenses.free;
@@ -22792,12 +23150,12 @@
flycheck-purescript = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }:
melpaBuild {
pname = "flycheck-purescript";
- version = "20160613.1315";
+ version = "20161121.907";
src = fetchFromGitHub {
owner = "emacs-pe";
repo = "flycheck-purescript";
- rev = "a7e911f6479c66832e52a619cd27cc26435887a4";
- sha256 = "0d56x6wmb61ldf30pgyvl0kyfvgkjibdyy9r2281qfavgr0qszls";
+ rev = "30f0435d5e2715053c8c6170b2bce2ae462ac819";
+ sha256 = "10is8l88827g7gs8qnmyif124agxj9smfav6l53hjv3i0q3m3h6f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a315aad238fa223058a495e1ca8c71da6447024c/recipes/flycheck-purescript";
@@ -22873,6 +23231,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-scala-sbt = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, sbt-mode }:
+ melpaBuild {
+ pname = "flycheck-scala-sbt";
+ version = "20161127.1321";
+ src = fetchFromGitHub {
+ owner = "rjmac";
+ repo = "flycheck-scala-sbt";
+ rev = "5b2c7a24b5b57573d0f9dbc759158bf90fa305da";
+ sha256 = "08p2acxa8irqb75d6ygk4rvh3i25faz06ilmqj3a3lf0xs0v5adc";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0afc1e5b31689a5ba52443e2878114d9ec0e7757/recipes/flycheck-scala-sbt";
+ sha256 = "09d6nj7rc1ba4psnb2csnmrs1mh5xnwh7gq7g6kq4y4f27wr8zcg";
+ name = "flycheck-scala-sbt";
+ };
+ packageRequires = [ emacs flycheck sbt-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-scala-sbt";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-stack = callPackage ({ fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-stack";
@@ -22936,6 +23315,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-swift3";
+ version = "20161214.501";
+ src = fetchFromGitHub {
+ owner = "GyazSquare";
+ repo = "flycheck-swift3";
+ rev = "846b3045d018a13cadb8a8bfde83587802d7e1a2";
+ sha256 = "06wzsi3lw938mc8sz06jxyclxpvrlyjgvs9998kpiyhz752sgfsw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
+ sha256 = "05yfrn42svcvdkr8mx16ii8llhzn33lxdawksjqiqg671s6fgdpa";
+ name = "flycheck-swift3";
+ };
+ packageRequires = [ emacs flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-swift3";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
melpaBuild {
pname = "flycheck-tip";
@@ -22957,6 +23357,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-title = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-title";
+ version = "20161112.1716";
+ src = fetchFromGitHub {
+ owner = "Wilfred";
+ repo = "flycheck-title";
+ rev = "524fe02e58ee2ff698c2a108306b2b79e23944a3";
+ sha256 = "1yccgsa9lcm2wklrrbs5vk89zfln70k4jnvzx0lvcjsy0swq147j";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2996b70645cd6fd093e3b31b9586ce5acb036cf6/recipes/flycheck-title";
+ sha256 = "1cxid9qmzy8pl8qkvr6kgvfqm05pjw8cxpz66x619hbkw2vr7sza";
+ name = "flycheck-title";
+ };
+ packageRequires = [ emacs flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-title";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }:
melpaBuild {
pname = "flycheck-ycmd";
@@ -22964,8 +23385,8 @@
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "d116b167bf776dbeba6a822c0b3c19a2c97f68d4";
- sha256 = "192qiwpkc5a0bxsiqj6zyvlblvixq24m845dgpcsqzwpjcm7qq9l";
+ rev = "5bff8525adbe01a9af905c92f0834902ac3c1c73";
+ sha256 = "15sg07dvvmmfhcp83b388zy43wgyq2qcns4qqcm2jaqq9hpvqxf9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd";
@@ -23800,12 +24221,12 @@
focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "focus";
- version = "20161106.702";
+ version = "20161113.1145";
src = fetchFromGitHub {
owner = "larstvei";
repo = "Focus";
- rev = "ffd97a5a3663103aa96945bb1d2f03481ab6229f";
- sha256 = "1f5q99mhhcb75v2c06sxbg7psqclnlqci7fjaa484a8hyback24r";
+ rev = "75202c9445f52eab6fb82f00006f37cd20dae6b2";
+ sha256 = "1v9y3dp7sd4rsm31myp3l1jxpwjw3madajb6yz9rw0yhdirfwgbg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus";
@@ -24154,16 +24575,16 @@
forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "forth-mode";
- version = "20161019.2157";
+ version = "20161214.1236";
src = fetchFromGitHub {
owner = "larsbrinkhoff";
repo = "forth-mode";
- rev = "2813a7bf3dbcdf7780834b53385993620c7a9fd5";
- sha256 = "0akbznzqibcnzq59mhnpsx9hgxddg1656ns7c5lrn7pvmajw8vwm";
+ rev = "ccb14b4a477e13353ced9658b8e7adfe90bbcd15";
+ sha256 = "1g0dmrlqlwp6zaaixcksns2gzw7nsk4lk138qmfw5l6mvazjy4sk";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d1c8b5b9fe8f17905de801f5d7dea28ca73daa4e/recipes/forth-mode";
- sha256 = "09arqyzsfiqblpxb6kv1nwcdr1ify96814jvxrqwkd20rxx1d79j";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e46832079ee34c655835f06bf565ad5a5ab48ebd/recipes/forth-mode";
+ sha256 = "0j60abi5qyy94f4as90zhmkb12jdirysdbq4ajs5h91vi6gb1g3i";
name = "forth-mode";
};
packageRequires = [];
@@ -24217,12 +24638,12 @@
fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fountain-mode";
- version = "20161011.2319";
+ version = "20161207.141";
src = fetchFromGitHub {
owner = "rnkn";
repo = "fountain-mode";
- rev = "bba892a595efa1e376637dab6b31473faffdf754";
- sha256 = "0c77dkc5rqzybym2n7mqi5jhkr1g0r77yrfmbpakbc2l0550bg8r";
+ rev = "cd164b75fdad957a8ac2548d0ddff84ae3359488";
+ sha256 = "01dlnkzm2rl6lli2r9rz8kd9w4xp236ag6i3gdr5raflylf2yxp4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@@ -24440,12 +24861,12 @@
fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }:
melpaBuild {
pname = "fsharp-mode";
- version = "20161103.300";
+ version = "20161130.653";
src = fetchFromGitHub {
owner = "rneatherway";
repo = "emacs-fsharp-mode-bin";
- rev = "cb70988aae85b03a26be9b3e2a70742658ff2502";
- sha256 = "111mz7fgacmfvrbv32yzmmxmx1pf7xb6rj7n7pwz51raid7a23p8";
+ rev = "22cf1815574c2d463c6a790afc7378db9d701fc2";
+ sha256 = "1jqh518kn5c7gk8dqbx28inq71a1i95qafixa5kbh8my6kka7yr1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode";
@@ -24469,12 +24890,12 @@
fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fstar-mode";
- version = "20161017.739";
+ version = "20161211.2200";
src = fetchFromGitHub {
owner = "FStarLang";
repo = "fstar-mode.el";
- rev = "52b4f97c0852fde10fd8de40c1ace626923f77fc";
- sha256 = "18b2sifxvwb8biq3d4vksad093mxmbvlzfbba22fi784fainvvvq";
+ rev = "b633674651d324a2aa09a53134e5a617d7ee5f87";
+ sha256 = "0vhd8wpshgcgpq836d7048vxrr7wzy0z473kz6xn7ql10sxiz4i2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode";
@@ -24490,11 +24911,11 @@
fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fuel";
- version = "20161007.2213";
+ version = "20161123.2000";
src = fetchgit {
url = "git://factorcode.org/git/factor.git";
- rev = "bbcd039c6cb4f73a2e0a262eb32a7d100f4aa40b";
- sha256 = "1rjfzw4l0cykfvj1hlzayzn63iyb818i7a591fcv4sbviqcg9c65";
+ rev = "20a98a38fb23d61bf92bb25b2062f0d07f7af91d";
+ sha256 = "0wai0z3zf2blmr9f6sfawq9977n2shf4m42771grn65mgmldlzha";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -24756,12 +25177,12 @@
gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gams-mode";
- version = "20160320.228";
+ version = "20161203.231";
src = fetchFromGitHub {
owner = "ShiroTakeda";
repo = "gams-mode";
- rev = "268ee8b4554446104d200de3ffbd2f067b20cb3f";
- sha256 = "16x3fz2ljrmqhjy7w96fhp3j9ja2gib042c363yfrzwa7q5rxzd2";
+ rev = "a803f9e4509b8f8fed17ef25737d941bbe846c96";
+ sha256 = "1avbdfw3hvwqnrlg3hv8p64m9gqgvwl9ggqzn6rhxh1zlr7i5cwy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode";
@@ -24838,12 +25259,12 @@
geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "geben";
- version = "20160817.1834";
+ version = "20161214.650";
src = fetchFromGitHub {
owner = "ahungry";
repo = "geben";
- rev = "7ed838f1c91f10a590a2236dddcd09aea2f5747f";
- sha256 = "0cpmywngrb0fp5bpfy54xfh3f96hgkv79w7chc6riadapm2yvxz7";
+ rev = "6b805aea456f7a899066f3caa7f17bfc3d199cee";
+ sha256 = "05gzdlz5nwz2vd7f7xk9abpv2ifn1w5djcz19v1qh7xyarickszq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben";
@@ -24901,12 +25322,12 @@
geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "geiser";
- version = "20161010.1358";
+ version = "20161202.1657";
src = fetchFromGitHub {
owner = "jaor";
repo = "geiser";
- rev = "16035b9fa475496f7f89a57fa81455057af749a0";
- sha256 = "1rrafizrhjkai0msryjiz4c5dcdyihf0i2wmgiy8br74rwbxpyl5";
+ rev = "6893f692259c0241049bf614147160c44dd4ba3e";
+ sha256 = "12gimg3qhnl2r2hx00q602k1rnjcj49hc1v7a23d58c0gmqr4yb6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
@@ -24922,12 +25343,12 @@
general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "general";
- version = "20161104.1437";
+ version = "20161203.1641";
src = fetchFromGitHub {
owner = "noctuid";
repo = "general.el";
- rev = "e628ab784703410e1451616953fcde9878d00301";
- sha256 = "1al3m9wgqbq3lkqw81gy0h15d4jis392nfdpybf5s0bvxbpfm29l";
+ rev = "11f21c9c53091bc538652f1448e75557ad526b9c";
+ sha256 = "0pyyvab0l5xbkm4w9sc34g68vz56qsy8fkhj5nh00rigwi9pcsla";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general";
@@ -24940,27 +25361,6 @@
license = lib.licenses.free;
};
}) {};
- general-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "general-close";
- version = "20161104.1235";
- src = fetchFromGitHub {
- owner = "emacs-berlin";
- repo = "general-close";
- rev = "3e19cca8452e3461d7797d63511ccb77cfb0e4a7";
- sha256 = "17lmg5qlakwm09j32fpkvwcxfzrkx4l16iiw38lbrlm505qnzlh2";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/641a48f5148df2a19476c9b3302934a604f5c283/recipes/general-close";
- sha256 = "17v0aprfvxbygx5517a8hrl88qm5lb9k7523yd0ps5p9l5x96964";
- name = "general-close";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/general-close";
- license = lib.licenses.free;
- };
- }) {};
genrnc = callPackage ({ concurrent, deferred, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
melpaBuild {
pname = "genrnc";
@@ -25069,12 +25469,12 @@
gh = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache, s }:
melpaBuild {
pname = "gh";
- version = "20161102.2016";
+ version = "20161119.2004";
src = fetchFromGitHub {
owner = "sigma";
repo = "gh.el";
- rev = "ed4c8a7b3c347c7c6680bd39c7f4ca632030eb74";
- sha256 = "0h5mkjipq9yw2djdq61kwp1g8bgkmqnkmgzzkg0vk1ix7crqbjif";
+ rev = "6a76836a2ed1ebc3380dcfbe2b46786abf905fab";
+ sha256 = "0anlavmfhm0ax6566sl9ih0j4v80s313n32d4yfp9lh4f1drp62k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh";
@@ -25115,8 +25515,8 @@
src = fetchFromGitHub {
owner = "DanielG";
repo = "ghc-mod";
- rev = "9ef3e67f219ab24246f0e73246f08533ff53b9cf";
- sha256 = "0v5bibr5mhllgsh2j3cjl8nh4x7sqjlyydvy3vl1zxhxwrx825iq";
+ rev = "8be4885d8638b52acb16f26ce03f4182902c0a7b";
+ sha256 = "1jpf76kmqhmhz6gizm9njiid9ahlk5254ag71fgqhij5a0cqijm7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -25279,12 +25679,12 @@
gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }:
melpaBuild {
pname = "gist";
- version = "20160118.1656";
+ version = "20161127.855";
src = fetchFromGitHub {
owner = "defunkt";
repo = "gist.el";
- rev = "9a5c382327eb9f1e11e04a1bdeeebd215ea5fd54";
- sha256 = "0gawx1fcfzvwql6awxy6vslvmmxlmggg3vlby8lqka9ywh7dbf4b";
+ rev = "62888de7f776c867a51cee4d5d55edc561e519cc";
+ sha256 = "0xvmrpx3gbdancxhggw7k7r2bzlwmni9vynsjf5ddpv5alw2bscx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gist";
@@ -25405,12 +25805,12 @@
git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
melpaBuild {
pname = "git-commit";
- version = "20161011.1738";
+ version = "20161214.519";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "c8517573287b9e533fb7465ba0c045655b0ec167";
- sha256 = "12dhqwk1hdx3aghwfdc8nhd0zxlzm7mfcvxxqz20vq1jjbraz5iw";
+ rev = "2fc26ea8f8a188a23dc1f819d8b512ddbf7307bb";
+ sha256 = "0mymbcm7i1y325n0p9q5qmx92j8j2ny61imv8w7m6xx30ylf1pdw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -25423,22 +25823,22 @@
license = lib.licenses.free;
};
}) {};
- git-commit-insert-issue = callPackage ({ fetchFromGitLab, fetchurl, github-issues, helm, lib, melpaBuild, projectile, s }:
+ git-commit-insert-issue = callPackage ({ fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }:
melpaBuild {
pname = "git-commit-insert-issue";
- version = "20160122.749";
+ version = "20161206.1051";
src = fetchFromGitLab {
owner = "emacs-stuff";
repo = "git-commit-insert-issue";
- rev = "df1c86ac1ec9f40b11fa5c7400966ef97f4c3c67";
- sha256 = "1vdyrqg2w5q4xmazqqh2ymjnrp9p1x5172nllwryz43jvvxaw05s";
+ rev = "fcfbb9cea98426c65edeb989f7470fbd5ce4b608";
+ sha256 = "12rzzysjq7c8jnhwlyppgcn8h9am95iw3la1h1y3bxpfisxkshy8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2356f63464e06c37514447c315c23735da22383a/recipes/git-commit-insert-issue";
sha256 = "0mhpszm2y178dxgjv3kh2n744hg2kd60h16zbgmjf4f8228xw8j3";
name = "git-commit-insert-issue";
};
- packageRequires = [ github-issues helm projectile s ];
+ packageRequires = [ github-issues gitlab helm projectile s ];
meta = {
homepage = "https://melpa.org/#/git-commit-insert-issue";
license = lib.licenses.free;
@@ -25573,12 +25973,12 @@
git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "git-link";
- version = "20161019.1718";
+ version = "20161203.1823";
src = fetchFromGitHub {
owner = "sshaw";
repo = "git-link";
- rev = "efd2a9a40b07e93cd5030d8b409d380c77fca88b";
- sha256 = "0yhk4r5fdlmiw7n0cpdbjqcsm2vkm37qwwvkb7xz9046mkdag6gy";
+ rev = "255f42e72f7565eeb7feb40e18507348dfccec0a";
+ sha256 = "1333vll16snfg135hbczl8d0l8smqz98kz89jv4fcyp9gs6g8sp7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link";
@@ -25636,12 +26036,12 @@
git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "git-timemachine";
- version = "20160607.1228";
+ version = "20161125.142";
src = fetchFromGitHub {
owner = "pidu";
repo = "git-timemachine";
- rev = "96a72dc0f86e420629760915db99533f4301e759";
- sha256 = "1718d20f87wypfsrxyihna7mqpy94fl44hhdw1l42v1iizk9157p";
+ rev = "d67901fd3f87f4836386d85a4a7df8a300d47147";
+ sha256 = "0rgcr26snphimiigs3krzb577zd6xpzzhw1mcvmq2cjbc6hi6sdn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine";
@@ -25930,12 +26330,12 @@
gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "gitter";
- version = "20160916.1128";
+ version = "20161203.9";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "gitter.el";
- rev = "18dcb779350367af49d34b4a1c6c3f576657c327";
- sha256 = "1rwxq13i0cpcf55lfmycdy1igyqg58w9g7cjrksfadp06w74k84p";
+ rev = "6e92491ddb7079f868ffcc07d69bc82ef35d7d2b";
+ sha256 = "16hnw8bcbbnwzw9mbb98icri7q7zl39b60r9gn5gr3bxaarbh9dl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b8076c3b4d60e4c505bb6f4e426ecc4f69d74684/recipes/gitter";
@@ -25948,27 +26348,6 @@
license = lib.licenses.free;
};
}) {};
- gitty = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "gitty";
- version = "20151120.2348";
- src = fetchFromGitHub {
- owner = "jorgenschaefer";
- repo = "gitty";
- rev = "c7c3d622d59531d023b9184d2479316c28045ca2";
- sha256 = "0y8msn22lzfwh7d417abay9by2zhs9zswhcj8a0l7ln2ksljl500";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/01d314eac1da048fe67eb907c42734f495462c20/recipes/gitty";
- sha256 = "1z6w4vbn0aaajyqanc7h1m5ali7dbrnh4ngw87a2x2pkxarx6x16";
- name = "gitty";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/gitty";
- license = lib.licenses.free;
- };
- }) {};
glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "glab";
@@ -26077,12 +26456,12 @@
gnome-calendar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gnome-calendar";
- version = "20140112.359";
+ version = "20161110.456";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "gnome-calendar.el";
- rev = "58c3a3c32aff9901c679bdf9091ed934897b84a0";
- sha256 = "160qm8xf0yghygb52p8cykhb5vpg9ww3gjprcdkcxplr4b230nnc";
+ rev = "489f9f15f7bb35696b1cc19db75b554ae8328df2";
+ sha256 = "1aca65g4rfpsm4yk5k2bj6kbb2wrf6s14m8jgv1p94mqmzkj7rlq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8e497668d65f0eabd15e39b7492adb395a5a8e75/recipes/gnome-calendar";
@@ -26140,12 +26519,12 @@
gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gnu-apl-mode";
- version = "20161003.332";
+ version = "20161129.303";
src = fetchFromGitHub {
owner = "lokedhs";
repo = "gnu-apl-mode";
- rev = "783dd54a2e44dd143a2b2e427b17fa431806af4e";
- sha256 = "08fh3h4ly7zjzcnsgmpbcd5kvpmsz1ihmhiil9c38cr8acysgpzd";
+ rev = "8a2bdfe945ff2d1a78f6159528f6ad3420701046";
+ sha256 = "0spn4lkvilmy48xvkpma4l30i7rzxknp56nr2kcvpdlb0mk3svzz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode";
@@ -26305,12 +26684,12 @@
go = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "go";
- version = "20160430.1739";
+ version = "20161110.1849";
src = fetchFromGitHub {
owner = "eschulte";
repo = "el-go";
- rev = "8d5e61b5e50bfb807bb45d4c979bd86a2ba67149";
- sha256 = "1i6x7larpqm5h4369pz07353lk0v6gyb5grk52xslmg8w14si52n";
+ rev = "ff45fb44d9cb6579d8511d8b6156ed0b34d5ac97";
+ sha256 = "14av8zcxp9r4ka0h9x73i6gzwbf231wqkin65va3agrzwaf8swz1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/50e8d089f4e163eb459fc602cb90440b110b489f/recipes/go";
@@ -26323,22 +26702,22 @@
license = lib.licenses.free;
};
}) {};
- go-add-tags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ go-add-tags = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "go-add-tags";
- version = "20161005.948";
+ version = "20161123.427";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-go-add-tags";
- rev = "c77bd5788347009d1dc14c0d5cbedd73d4544745";
- sha256 = "0ppps79749fprcbrwd1grlqaj36yi5a8vlvk040rqyhi9g3phr3c";
+ rev = "54879945e46a0884c5f93d7fd6c866a9cdf401ac";
+ sha256 = "1gr65skrd41pk46ilfsbxfdng4br6h9c6blf1q1wx6i9ylhs0ak5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/55d3b893bd68d3d2d86ecdbb4ed442edd256516a/recipes/go-add-tags";
sha256 = "0nvas44rsvqzk2ay5bhzkbrnzql13vnxq9pk4lp4mvp86dda9qim";
name = "go-add-tags";
};
- packageRequires = [ cl-lib emacs s ];
+ packageRequires = [ emacs s ];
meta = {
homepage = "https://melpa.org/#/go-add-tags";
license = lib.licenses.free;
@@ -26351,8 +26730,8 @@
src = fetchFromGitHub {
owner = "nsf";
repo = "gocode";
- rev = "82514c86ff1b37eb29aa979fe51238846857935d";
- sha256 = "04fcz539haxvxlsnlmvw9inwmgssh8msn37iwlfax7z1a81bqq54";
+ rev = "5070dacabf2a80deeaf4ddb0be3761d06fce7be5";
+ sha256 = "0w54cwjcyq7cr3g50kg4zy1xrkaqakb18qbdam11qvz6kix3syg1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -26498,8 +26877,8 @@
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-mode.el";
- rev = "adea2e5149bb976f956d994a0a9e510167481e72";
- sha256 = "0i725646ds3r6lh6l0zixsixn7acx9xsjxh4a0bcvbgkdyyadhaa";
+ rev = "259110bfd7acb62196b09487d0883429b444bf1b";
+ sha256 = "02ikkx044l5iqzz1hxyjjlxvk58liddmgapx39g7yj976rp6844f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru";
@@ -26515,12 +26894,12 @@
go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild {
pname = "go-impl";
- version = "20160626.156";
+ version = "20161123.512";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-go-impl";
- rev = "f1a8088bca73acf254b605cf421b4661b45ff2ba";
- sha256 = "0figyrv859i48s4pzm580hr0cgyzhyi26v0gzp6ws2686i20algf";
+ rev = "3544b590e9867f2697c2be62389a4c1edb39aed8";
+ sha256 = "0dsn8dpfsikchbcsr009sfhics87hzb3fch4wxxxlhgh5j77nxiv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl";
@@ -26536,12 +26915,12 @@
go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "go-mode";
- version = "20161022.1435";
+ version = "20161110.1750";
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-mode.el";
- rev = "adea2e5149bb976f956d994a0a9e510167481e72";
- sha256 = "0i725646ds3r6lh6l0zixsixn7acx9xsjxh4a0bcvbgkdyyadhaa";
+ rev = "259110bfd7acb62196b09487d0883429b444bf1b";
+ sha256 = "02ikkx044l5iqzz1hxyjjlxvk58liddmgapx39g7yj976rp6844f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode";
@@ -26557,12 +26936,12 @@
go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }:
melpaBuild {
pname = "go-playground";
- version = "20160426.1228";
+ version = "20161203.1747";
src = fetchFromGitHub {
owner = "grafov";
repo = "go-playground";
- rev = "08add53262501d9432767116125a5030d9609911";
- sha256 = "1i93im43ipdkm1p83d15kfi14h4gqxgqx31z6qn1fc121916rx66";
+ rev = "d0d772bb60c872d81572c5293d5d0a7517e4b839";
+ sha256 = "1gf8djbnm6x9d9s2qg33cfrn2fbxh5pq441rrfi7il13vgf83v70";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground";
@@ -26624,8 +27003,8 @@
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-mode.el";
- rev = "adea2e5149bb976f956d994a0a9e510167481e72";
- sha256 = "0i725646ds3r6lh6l0zixsixn7acx9xsjxh4a0bcvbgkdyyadhaa";
+ rev = "259110bfd7acb62196b09487d0883429b444bf1b";
+ sha256 = "02ikkx044l5iqzz1hxyjjlxvk58liddmgapx39g7yj976rp6844f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename";
@@ -26746,12 +27125,12 @@
godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "godoctor";
- version = "20161029.2346";
+ version = "20161205.143";
src = fetchFromGitHub {
owner = "microamp";
repo = "godoctor.el";
- rev = "b1cf6ea7e8fa23daa05e98b443ad9b5ee6badb9a";
- sha256 = "1shcxjhkk3l4vn1v16p86cxs00w5v02nmx2ariid5qrq2636gv8z";
+ rev = "f892a4dbabe61186540d6035c5185fd929a6a543";
+ sha256 = "1cg09mihvqchgvdxwlrg9vcdj1kvmmy8zmlkscxi6smaxbi0yvjm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0e23e1362ff7d477ad9ce6cfff694db989dfb87b/recipes/godoctor";
@@ -26834,8 +27213,8 @@
src = fetchFromGitHub {
owner = "golang";
repo = "lint";
- rev = "3390df4df2787994aea98de825b964ac7944b817";
- sha256 = "00kjfvbi29agwsilfapgccx4ynqrbj04whk6iflxky14zrmz044q";
+ rev = "206c0f020eba0f7fbcfbc467a5eb808037df2ed6";
+ sha256 = "11ygf8hswvc9rj6jp7zn8wyjlraw9qrl072grn2h4s1flblpxp53";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint";
@@ -26897,8 +27276,8 @@
src = fetchFromGitHub {
owner = "google";
repo = "styleguide";
- rev = "71ec7f1e524969c19ce33cfc72e8e023f2b98ee2";
- sha256 = "0y7pgd05wbaxlc946gmly5l4jyhvh6w6aznz5cxip4vpka8s8ab7";
+ rev = "db0a26320f3e930c6ea7225ed53539b4fb31310c";
+ sha256 = "0kwb4vszahr7iwl1znhklsjkmqckj011z6akj9pzz33iabcah6mf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -26932,22 +27311,22 @@
license = lib.licenses.free;
};
}) {};
- google-maps = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ google-maps = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "google-maps";
- version = "20130412.230";
+ version = "20161210.458";
src = fetchFromGitHub {
owner = "jd";
repo = "google-maps.el";
- rev = "90151ab59e693243ca8da660ce7b9ce361ea5126";
- sha256 = "183igr5lp20zcqi7rc01fk76sfxdhksd74i11v16gdsifdkjimd0";
+ rev = "956e6ad42bc3819bcaf4cc66a640f5079b385ed7";
+ sha256 = "0dqcs9dl3170zddh4npsqm1ql0n0a0378gyqxk0vi0ibzch537vk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-maps";
sha256 = "0a0wqs3cnlpar2dzdi6h14isw78vgqr2r6psmrzbdl00s4fcyxwx";
name = "google-maps";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/google-maps";
license = lib.licenses.free;
@@ -26977,12 +27356,12 @@
google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "google-translate";
- version = "20160909.1358";
+ version = "20161206.1408";
src = fetchFromGitHub {
owner = "atykhonov";
repo = "google-translate";
- rev = "a1e95d9f01550b5170db052887be3d45482dddc1";
- sha256 = "1w81wxv3yyhrzbj2f7s8nfcw3w5j5ijjfzqsm5z0bjvkvcp4nbm4";
+ rev = "52d34c96b400b1b933c727933279f79256951b19";
+ sha256 = "1acck34q5dqizx2wsm0q31lzwx0wwyzv6g53naf5m94bjw7xv088";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate";
@@ -27142,12 +27521,12 @@
govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
melpaBuild {
pname = "govc";
- version = "20161020.1626";
+ version = "20161213.1524";
src = fetchFromGitHub {
owner = "vmware";
repo = "govmomi";
- rev = "aac2f2f2927d6a95d507538f70f94a142cd83fd2";
- sha256 = "1vik0fh9hi81d8pai9sz9h3nrn7qkyhp289hd9p8cflkz7g9cd6h";
+ rev = "45a5351755f12668ca9a0b63f1d1c906431157f6";
+ sha256 = "07ympvkvhbbfk7nrzr801qnqyh92nqs050cy4b0y22c3c52i6k6l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -27181,27 +27560,6 @@
license = lib.licenses.free;
};
}) {};
- gplusify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "gplusify";
- version = "20150312.1244";
- src = fetchFromGitHub {
- owner = "jorgenschaefer";
- repo = "gplusify";
- rev = "bd6237ae671db2fbf406dcc6225839dcbd2475b2";
- sha256 = "1l43h008l7n6waclb2km32dy8aj7m5yavm1pkq38p9ppzayfxqq1";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2d7d6cf6cca5e6abd1e7b0835bd6aba4f156369d/recipes/gplusify";
- sha256 = "0fgkcvppkq6pba1giddkfxp9z4c8v2cid9nb8a190b3g85wcwycr";
- name = "gplusify";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/gplusify";
- license = lib.licenses.free;
- };
- }) {};
grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "grab-mac-link";
@@ -27223,6 +27581,27 @@
license = lib.licenses.free;
};
}) {};
+ grab-x-link = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "grab-x-link";
+ version = "20161130.2147";
+ src = fetchFromGitHub {
+ owner = "xuchunyang";
+ repo = "grab-x-link";
+ rev = "d2ef886097f59e1facc5cb5d8cd1c77bf340be76";
+ sha256 = "1iny8ga9xb7pfd59l4ljlj6zvvxzr7bv468sibkhlaqvjljn2xq1";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/64d4d4e6f9d6a3ea670757f248afd355baf1d933/recipes/grab-x-link";
+ sha256 = "1kni49n1v716w4hjfm49mk25jshfc6idpby0k58qvngbfqk3kzy5";
+ name = "grab-x-link";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/grab-x-link";
+ license = lib.licenses.free;
+ };
+ }) {};
gradle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "gradle-mode";
@@ -27331,12 +27710,12 @@
graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-ubiquitous, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
melpaBuild {
pname = "graphene";
- version = "20161009.38";
+ version = "20161120.938";
src = fetchFromGitHub {
owner = "rdallasgray";
repo = "graphene";
- rev = "47c5a194f81796eface2e2f062144c17ee3cfdb7";
- sha256 = "0xx3cnwbbil6d7y15d61wkp777w4j5rsdm7gwd5gpcr8910405n2";
+ rev = "b25707ae82e286aefa5a66087b12c9cb3b7bf2ed";
+ sha256 = "1h21fv8plxydydm509immp0kpkf24ba6j3wrbpvp5w4nkx49mlkl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene";
@@ -27364,12 +27743,12 @@
graphene-meta-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "graphene-meta-theme";
- version = "20160724.454";
+ version = "20161204.807";
src = fetchFromGitHub {
owner = "rdallasgray";
repo = "graphene-meta-theme";
- rev = "ba3c197b6331668c4fcee4053594ba1bd34929b6";
- sha256 = "0qbk53r97h234f2vj8ndf57kardaz2g2dgf35i08j9b416aw6ck5";
+ rev = "62cc73fee31f1bd9474027b83a249feee050271e";
+ sha256 = "1ydl6dlg5z4infq8j09izwgs6n97yza6nbq5rs1xfv00zd9gr63c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/44af719ede73c9fe7787272d7868587ce8966e3d/recipes/graphene-meta-theme";
@@ -27448,11 +27827,11 @@
grass-mode = callPackage ({ cl-lib ? null, dash, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "grass-mode";
- version = "20161102.621";
+ version = "20161130.732";
src = fetchhg {
url = "https://bitbucket.com/tws/grass-mode.el";
- rev = "fe70088c54b9";
- sha256 = "0prqgkbn0gm8g0fapkcd8192yyl2h3agn7qrlf5vrfx6780bsyw0";
+ rev = "c7e2817461c3";
+ sha256 = "095v1l46axada3vnhp1ypim6b789y39jlyy5466im02fjfjkcadg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode";
@@ -27862,12 +28241,12 @@
gxref = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gxref";
- version = "20161101.633";
+ version = "20161126.706";
src = fetchFromGitHub {
owner = "dedi";
repo = "gxref";
- rev = "24bc54ff2f8756609089f5f48f34d718db629381";
- sha256 = "184dnbg7sddck39qhnydzaa4sxxnz6mcicjb9n1632xlyg6q5wrl";
+ rev = "7cb746755a47e90aa286e32f49fd3417f632e98b";
+ sha256 = "07qbrk904iw3c4kj5ql5hy9znkpi8hcf5b9aag2x5m2c6jh066y1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/429b9150d4054fcadab8c5ca3b688921eeb19b78/recipes/gxref";
@@ -28240,12 +28619,12 @@
haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "haskell-mode";
- version = "20161101.751";
+ version = "20161212.116";
src = fetchFromGitHub {
owner = "haskell";
repo = "haskell-mode";
- rev = "cc432999b49bf9bb8844375436381b21f0344ebd";
- sha256 = "1dgkz5drnkdqm8lbf9d6qh35xlakzizm61yq6qkifhyisxlkg1rm";
+ rev = "319020de4a79a005eb0fe651222430ceedcd332d";
+ sha256 = "1slagi6f0mkzsjhy0cldlp5g1aqgiazkdb1mrzafw5cr12pdi9zw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -28508,12 +28887,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "20161106.2328";
+ version = "20161212.2159";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "c8d2db8b89a2a94e3409c358afccd00e9a15e6a9";
- sha256 = "1f8c8fi986js225g1yxf31hyn4l5ygya25yl8fprcxyp507xwmzp";
+ rev = "3d0e7df0b11bc19a81fb557856821e9fcd38ef85";
+ sha256 = "0a2ww6jw315r7v06s1s65mvsyzna9glsgilpywlhzcci44621jw4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -28592,12 +28971,12 @@
helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-ag";
- version = "20161105.744";
+ version = "20161203.523";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-helm-ag";
- rev = "34cddd7591e2b68bc91215da8f31036d83525909";
- sha256 = "0yr35rkfidly57fklacvh03yvpb50nyhj3cb0d1yg2xmm6civ5gn";
+ rev = "997107a53abd3bda06d52e7021c87527c5747389";
+ sha256 = "1fj2s5jfbaw948kww64k8ksxa6pxfpb30fx93x182bq6sl8fqlwg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag";
@@ -28694,15 +29073,36 @@
license = lib.licenses.free;
};
}) {};
+ helm-bbdb = callPackage ({ bbdb, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+ melpaBuild {
+ pname = "helm-bbdb";
+ version = "20161122.522";
+ src = fetchFromGitHub {
+ owner = "emacs-helm";
+ repo = "helm-bbdb";
+ rev = "20513422102fea4c08a0433d728a7783bb4968c8";
+ sha256 = "0ns537fimv774n1bq0r8k4qwdpapbw96linqyhx9mxp23zkhlg80";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7025c319fcabc64576c0c6554d0d572cef697693/recipes/helm-bbdb";
+ sha256 = "1wlacbfs23shvyaq616r1p84h8321zz1k5nzir5qg8nr6lssi8vp";
+ name = "helm-bbdb";
+ };
+ packageRequires = [ bbdb helm ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-bbdb";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
melpaBuild {
pname = "helm-bibtex";
- version = "20161101.2345";
+ version = "20161213.2242";
src = fetchFromGitHub {
owner = "tmalsburg";
repo = "helm-bibtex";
- rev = "4dde1da1963c5ccbe8c4d304000011fd85f2e462";
- sha256 = "1nnj197hchbgz77lskymb7mjwjljd9m2gzyx6vl4yrsqwl4y3h6h";
+ rev = "58dc08b8b8e6ea0c809052e082c867e05acef16a";
+ sha256 = "0cf3h0lkya6rsmg60qzbiz63vp8lm7nd4xlxym44hpp75nw06mgb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -28991,12 +29391,12 @@
helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-codesearch";
- version = "20160831.1742";
+ version = "20161214.548";
src = fetchFromGitHub {
owner = "youngker";
repo = "helm-codesearch.el";
- rev = "ff192dfcfbc737b7803cee1b87518c488aec0807";
- sha256 = "05xxnpqfppqyxncj4dddr0x02ji7yh4rj3q5przmm6v98kkdh6fa";
+ rev = "e80e76e492f626659b88dbe362b11aa0a3b0a116";
+ sha256 = "16njr3xcvpzg4x6qq2pwk80pca9pxhc6vjvfy3dzy4hi9nxryrs6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch";
@@ -29033,12 +29433,12 @@
helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-company";
- version = "20161010.59";
+ version = "20161121.2111";
src = fetchFromGitHub {
owner = "manuel-uberti";
repo = "helm-company";
- rev = "5202ddde359d8b3b8db242e998d0766d06db2be6";
- sha256 = "03hdnnqigg3q73mb9zbqav2d91iamkxgsbc5857jxxr04bq23ak9";
+ rev = "59e93396309fe3cb60913332d384d2f4706694c3";
+ sha256 = "0slp08dy9s40mqj6f64d8yw9si1a76mlhbmm3a7khf076b8ky02s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/78ff0a6cf493ff148406140f3e4902bfafd83e4a/recipes/helm-company";
@@ -29054,12 +29454,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "20161107.47";
+ version = "20161213.1754";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "c8d2db8b89a2a94e3409c358afccd00e9a15e6a9";
- sha256 = "1f8c8fi986js225g1yxf31hyn4l5ygya25yl8fprcxyp507xwmzp";
+ rev = "3d0e7df0b11bc19a81fb557856821e9fcd38ef85";
+ sha256 = "0a2ww6jw315r7v06s1s65mvsyzna9glsgilpywlhzcci44621jw4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -29138,12 +29538,12 @@
helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-dash";
- version = "20160802.1147";
+ version = "20161207.1232";
src = fetchFromGitHub {
owner = "areina";
repo = "helm-dash";
- rev = "bf80144f7cb810a0db89036b886d0e6f580ef7d7";
- sha256 = "1r3x72pd9wzqrkkwafmv64lcr9f1mrzbm1f3qv5fvv5xrs3qib2h";
+ rev = "b649ca44481e874146df8b88cc8750589dbdc232";
+ sha256 = "0wchzxfd16g7idlvfa1idqivv7m2nvnil94b2fx39q9zcs0qzw4f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/39c3ea21430473ef22d5ea9c8b2cf7ec9689883a/recipes/helm-dash";
@@ -29348,12 +29748,12 @@
helm-firefox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-firefox";
- version = "20160604.52";
+ version = "20161202.517";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-firefox";
- rev = "f196980c047800ef6650f880e26e0b7c29278a20";
- sha256 = "0xl2nakprgjf65haa0xn0jkh69skmbp3k6q1bamvqijgvra9waa0";
+ rev = "294850c4ce16ae25f2214f863cee0118add60974";
+ sha256 = "1kaa58xlnr82qsvdzn8sxk5kkd2lxqnvfciyw7kfi2fdrl6nr4pf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/257e452d37768d2f3a6e0a5ccd062d128b2bc867/recipes/helm-firefox";
@@ -29579,12 +29979,12 @@
helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
melpaBuild {
pname = "helm-git-grep";
- version = "20161105.813";
+ version = "20161111.2337";
src = fetchFromGitHub {
owner = "yasuyk";
repo = "helm-git-grep";
- rev = "b0bb524d6c69d1d43729d68dbd28b67a723a4b90";
- sha256 = "0n7xsrblnl9awvljczg4a6g00bczw47q69fnmqwk76ndigyhx8n0";
+ rev = "5ef4b5ff81707214c0c141d8bf219b1645fefe17";
+ sha256 = "1a0cs7yf6yb4pkgknb1515a24649d3v5i7jjcfvw831jwc51gnca";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep";
@@ -29667,8 +30067,8 @@
src = fetchFromGitHub {
owner = "yasuyk";
repo = "helm-go-package";
- rev = "e86914b0469d390f908b44401a31b1825af0b10d";
- sha256 = "1vxfc6dh1dahxvzz5vchx5gj33f8dyz7gqa5j1xcrxs49bqca7ad";
+ rev = "e42c563936c205ceedb930a687c11b4bb56447bc";
+ sha256 = "1169q25paz7x3hia5px4vmn06zzss179q9179x95vx8vfr43ny08";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/449d272b94c189176305ca17652d76adac087ce5/recipes/helm-go-package";
@@ -30041,12 +30441,12 @@
helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-ls-git";
- version = "20160901.822";
+ version = "20161122.241";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-ls-git";
- rev = "742eeb6c33253b2be581e30b5d70113cd87a581d";
- sha256 = "1dmmz6ghi21kmwprcv174pq5m198cmsphg297ll1bhqczk51j9h5";
+ rev = "98ce7dc709cf1468a50de18e96c028baa7f4357d";
+ sha256 = "1hlya6rc8iwmfjqk2grr80y3842x3763yl7siwp5jflpzryxhk97";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git";
@@ -30103,12 +30503,12 @@
helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
melpaBuild {
pname = "helm-make";
- version = "20160807.1756";
+ version = "20161109.1107";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "helm-make";
- rev = "f1bb61049c83b281f7d6fd0d13dfb262629ed5dc";
- sha256 = "1wrcjpd6lsf4sgqw61ql2y3dcb8v27ysnchyjwyppgmsqbkrz0a9";
+ rev = "11744341b10b35200ebb6789de52ce1a79336ef4";
+ sha256 = "1kzv11admqzdbswhahh28imkvjhwmp3pggpf5igpi019p8v3y91c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make";
@@ -30229,12 +30629,12 @@
helm-notmuch = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, notmuch }:
melpaBuild {
pname = "helm-notmuch";
- version = "20160412.1206";
+ version = "20161127.2308";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "helm-notmuch";
- rev = "e3c41e6b1458c6fb686bbcc8c8827dca98f306d0";
- sha256 = "04c6k1rxdi175kwn146sb2nxd13mvx3irr9fbqykcfv81609kqx3";
+ rev = "7d03cd9fed32b49a1f200c65ed38086c9f19cfaf";
+ sha256 = "10nx6wnd2vfqxv9zr8brml0l9mfx8rrid3lbqgs8wr9313ra3360";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/98667b3aa43d3e0f6174eeef82acaf71d7019aac/recipes/helm-notmuch";
@@ -30247,22 +30647,22 @@
license = lib.licenses.free;
};
}) {};
- helm-open-github = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, gh, helm-core, lib, melpaBuild }:
+ helm-open-github = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, helm-core, lib, melpaBuild }:
melpaBuild {
pname = "helm-open-github";
- version = "20151226.642";
+ version = "20161203.604";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-helm-open-github";
- rev = "4c5a47003b2efed1c3437e91121a77d082cf64c8";
- sha256 = "1wkmbc7247f209krvw4dzja3z0wyny12x5yi1cn3fnfh5nx04851";
+ rev = "553f3ab0fe0a028015e9b6cb7c35fb139ec222fc";
+ sha256 = "1xj5b44nkdvbxhk1bnllqm2qq393w22ccy708prrhiq8fmk53aa8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-open-github";
sha256 = "1wqlwg21s9pjgcrwr8kdrppinmjn235nadkp4003g0md1d64zxpx";
name = "helm-open-github";
};
- packageRequires = [ cl-lib gh helm-core ];
+ packageRequires = [ emacs gh helm-core ];
meta = {
homepage = "https://melpa.org/#/helm-open-github";
license = lib.licenses.free;
@@ -30271,12 +30671,12 @@
helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-org-rifle";
- version = "20161008.1645";
+ version = "20161112.1505";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "helm-org-rifle";
- rev = "671827a2b72ab6ee1f2736ea33a68b4bf5f93324";
- sha256 = "1z7jr7v67g9vxf7bv18vvmrdi09rvhjp8aw3malynp9iddz8hab6";
+ rev = "4596ac225a90bc49d96a416d661f5da2a13b711d";
+ sha256 = "0snynrrrkhm7c3g2iwr5m4lq49lxfrkf7il1rm2k56r5lbzw7mkm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -30334,12 +30734,12 @@
helm-pages = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-pages";
- version = "20160929.2141";
+ version = "20161120.1826";
src = fetchFromGitHub {
owner = "david-christiansen";
repo = "helm-pages";
- rev = "002ee736e082f792aa3f66b040902c19b81d2b5e";
- sha256 = "1lbhdwpqzj5z8yi3qma9r7p7ar2diz2qyi56mvm5qmjmnq7nqpwr";
+ rev = "51dcb9374d1df9feaae85e60cfb39b970554ecba";
+ sha256 = "0znmj13nshzspysnzrn2x6k9fym21n9ywkpjibljy0s05m36nbs5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a33cb19b6e71240896bbe5da07ab25f2ee11f0b/recipes/helm-pages";
@@ -30460,12 +30860,12 @@
helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
melpaBuild {
pname = "helm-projectile";
- version = "20161008.45";
+ version = "20161213.2311";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "helm-projectile";
- rev = "bc14d326fe892c902c55d093cccefb0fefde29b9";
- sha256 = "1gkyk8cj55n5dxhhvflqvf14gcbg5i6pj329j04nnmk5kdn0crni";
+ rev = "10531b2634559ea2179f2530423beaac815e9a38";
+ sha256 = "1bh9cvkp5gr8ykmy8fr94appkhpqx9hicqyj6ahvi2ykgb50ib4c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile";
@@ -30586,12 +30986,12 @@
helm-rage = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-rage";
- version = "20161030.914";
+ version = "20161201.222";
src = fetchFromGitHub {
owner = "bomgar";
repo = "helm-rage";
- rev = "07c268d162d11d8b4254a78a1bdaf881cdc560ee";
- sha256 = "1dzlawga65z0c49xzwpya09clcg013w7fm7mhqf70cniim5mcya8";
+ rev = "d9a342e2bbdabe86d6c25bb1939c55e3a2a12381";
+ sha256 = "05amzj09jwn0ypnk53i1m1pzxqxghxcfv6s9y0gxnxhr440rbjhb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/84f831fdc5a0e90c23ac11c79f193f4d3c1ebb04/recipes/helm-rage";
@@ -30646,6 +31046,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-rdefs = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+ melpaBuild {
+ pname = "helm-rdefs";
+ version = "20161129.2136";
+ src = fetchFromGitHub {
+ owner = "saidie";
+ repo = "emacs-helm-rdefs";
+ rev = "cd3a6b3af3015ee58ef30cb7c81c79ebe5fc867b";
+ sha256 = "0ji7ak9pkmw0wxzmw5a1amvn3pkj90v9jv1yi12w388njxn7qsvj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e1c7a20847513dc1153d54a3a700bc120f71dc6b/recipes/helm-rdefs";
+ sha256 = "0z3nrqrz63j9nxkbxdsjj3z8zhsqlik28iry3j1plgsxq1mhrn0y";
+ name = "helm-rdefs";
+ };
+ packageRequires = [ emacs helm ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-rdefs";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-recoll = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-recoll";
@@ -30838,12 +31259,12 @@
helm-smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, smex }:
melpaBuild {
pname = "helm-smex";
- version = "20160530.1236";
+ version = "20161202.1252";
src = fetchFromGitHub {
owner = "ptrv";
repo = "helm-smex";
- rev = "c8f007c75b00be155b62d6b44f1f275a914bf31c";
- sha256 = "0i8qhlyil4p11lnb6f1x9qv7f5131dg0f74anbvnc1wjga0jifzx";
+ rev = "7af4e4b44671f739b39584fc50c20084700701ac";
+ sha256 = "1dhzglpd48mb47iyii8igb1dldvnr4alg18m7g8xb529dx8z9wni";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/85568bd732da952053148e07b95e53f7caf5f62c/recipes/helm-smex";
@@ -31087,6 +31508,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }:
+ melpaBuild {
+ pname = "helm-youtube";
+ version = "20161113.1848";
+ src = fetchFromGitHub {
+ owner = "maximus12793";
+ repo = "helm-youtube";
+ rev = "7a944bc25f0f9e915011e9325caf46b46fcaa1b8";
+ sha256 = "0948rq6i4ibwhmi6m2k23f83yvf56vwgri1sg2060d901zd86cxy";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7537f732091b96b6c1b96c0174895278eba6776a/recipes/helm-youtube";
+ sha256 = "1qal5q83p06ghn482rflcfklr17mir582r0mvchxabb5ql60dy0b";
+ name = "helm-youtube";
+ };
+ packageRequires = [ cl-lib helm request ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-youtube";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-zhihu-daily = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-zhihu-daily";
@@ -31443,10 +31885,10 @@
}) {};
highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "highlight";
- version = "20161103.1410";
+ version = "20161127.1729";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/highlight.el";
- sha256 = "15l0bg0pa24bm9lg3f8ghf326k5k5sa1x4lpg1749asvj5q8bjk4";
+ sha256 = "19niikr5608xq67hcknmg5s7qxcb867ff79xcn58162px8d41v3k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/603e9fc90e6e6cf7fe903cb3c38155c1a4f45278/recipes/highlight";
@@ -31577,22 +32019,22 @@
license = lib.licenses.free;
};
}) {};
- highlight-indent-guides = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "highlight-indent-guides";
- version = "20160708.1329";
+ version = "20161214.1619";
src = fetchFromGitHub {
owner = "DarthFennec";
repo = "highlight-indent-guides";
- rev = "81a21cf1099cbbed89b321b9ec38682df6e33b4a";
- sha256 = "04vmb0596cvmv0g882nazjv2cylja6wb3k1if5d9ylg2ykqr3z2l";
+ rev = "a1eeb2e50ca51b5b2e3a5cd190d2f1d79cf6ad28";
+ sha256 = "0bm5lqdvy0g2q7hd621vdc78430rk4fjbd94a6dj5wjh8vpcw7vd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides";
sha256 = "00ghp677qgb5clxhdjarfl8ab3mbp6v7yfsldm9bn0s14lyaq5pm";
name = "highlight-indent-guides";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/highlight-indent-guides";
license = lib.licenses.free;
@@ -31726,12 +32168,12 @@
highlight-stages = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "highlight-stages";
- version = "20150421.2057";
+ version = "20161212.657";
src = fetchFromGitHub {
owner = "zk-phi";
repo = "highlight-stages";
- rev = "c5a01b29cf79cebd09da863d45f9f35f6ad3bd06";
- sha256 = "0gnr1dqkcmc9gfzqjaixh76g1kq7xp20mg1h6vl3c4na7nk6a3fg";
+ rev = "87c476f8ca0474912af41680a8de243c0c8d5b46";
+ sha256 = "1s7hxv4vpbrpk4makdjn3589flddgfy35scyd3kac629fbqiiz79";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/46884aa6588f55d6f688477a5e9f528f57673131/recipes/highlight-stages";
@@ -31853,8 +32295,8 @@
src = fetchFromGitHub {
owner = "chrisdone";
repo = "hindent";
- rev = "295246ef496f3f2bff45a098433f171e0350b889";
- sha256 = "0g5k67znhzvxczby8pq8hcisjcgikf7yv2pwxz62cspfr2ylhvwk";
+ rev = "4b0b4f44bcf14d603f88842d66a62099f1e81a47";
+ sha256 = "0hfr0njzz5czprqb4sg06vhdfs7vsw079p7v8xilz32s3priz4lq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -32176,12 +32618,12 @@
hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
melpaBuild {
pname = "hledger-mode";
- version = "20161031.709";
+ version = "20161121.848";
src = fetchFromGitHub {
owner = "narendraj9";
repo = "hledger-mode";
- rev = "912d78a9e211f588fdb59a487d6fae3e13089023";
- sha256 = "0fnd2y0w07k0rz6k3ghmk9jkx2mzdymnizrbx4ykysqdwwwnj4lw";
+ rev = "413e34e748b3bbd168dec8d38f673c41232c51e2";
+ sha256 = "0hniidrs8dzaq11micc0l4sdp2zrv6ry0r34c5b3w32cnb33xp47";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode";
@@ -32343,12 +32785,12 @@
hound = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "hound";
- version = "20160731.2106";
+ version = "20161130.1955";
src = fetchFromGitHub {
owner = "ryoung786";
repo = "hound.el";
- rev = "209b87b64a0477718e5f0ec721a1a4b7f323ddff";
- sha256 = "0w7vknf8nz9a3rqwzpdp1lnscx0kamgyrd9mvravkp6644kjw3k4";
+ rev = "dd95fc10b79029142c95307e895da0bc92bba28c";
+ sha256 = "0c0fjfb8l0ladxw8b2ylnrnzw8k0xffl40hnkrc4bdzbl48zn55g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90cfc34eb4e8be7bf887533b85feba91131a435b/recipes/hound";
@@ -32531,16 +32973,16 @@
htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "htmlize";
- version = "20130207.1202";
+ version = "20161211.1019";
src = fetchFromGitHub {
- owner = "dunn";
- repo = "htmlize-mirror";
- rev = "aa6e2f6dba6fdfa200c7c55efe29ff63380eac8f";
- sha256 = "1vkqxgirc82vc44g7xhhr041arf93yirjin3h144kjyfkgkplnkp";
+ owner = "hniksic";
+ repo = "emacs-htmlize";
+ rev = "88e2cb6588827893d7bc619529393887c264d15a";
+ sha256 = "09xpv8dsc39a7w9s6xnilc5kh1krs2jw8cklizxzz4gp36hrsj2n";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8d1d4a17daa60f577c3f88f757997fa42f7b527e/recipes/htmlize";
- sha256 = "03rv3myds696gasfqw3lwvsjd680xgwcf9kilblzxdidd7l6n5xf";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize";
+ sha256 = "16nvvsi4nxi0zzk5a6mwmp43p0ls20zdx9r18mxz6bsaw6jangh2";
name = "htmlize";
};
packageRequires = [];
@@ -32552,12 +32994,12 @@
http = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "http";
- version = "20161025.1120";
+ version = "20161127.1449";
src = fetchFromGitHub {
owner = "emacs-pe";
repo = "http.el";
- rev = "3b8cac5d30bf8142cdb9839292f39643be326f5b";
- sha256 = "0842l2wbk1f86lxzjsicqwxlmw639w26pr3dfk9rnymwzpm267kg";
+ rev = "18057d0967015979ee7e59598b1d3410d5966fcb";
+ sha256 = "1bw9369c3r172p14rb74vqs0243696rqf46z627p1w73afq48zy5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7c63aaf27240706d84e464881d40cfb7cbe9ee3/recipes/http";
@@ -32675,12 +33117,12 @@
hungry-delete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hungry-delete";
- version = "20151203.1314";
+ version = "20161128.2238";
src = fetchFromGitHub {
owner = "nflath";
repo = "hungry-delete";
- rev = "ed1694ca3bd1fe7d117b0176d417341915ad4f1f";
- sha256 = "1vy521ljn16a1lcmpj09mr9y0m15lfjhl6xk04sb7nisps3vljyl";
+ rev = "78a787a87aceb821818bbe2a322fbf2e5cbf80c3";
+ sha256 = "171s7akqcpj0jcbm8w19b4n9kdzw0acf7cv0ymwdz5mmgmfiy292";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e33960d9b7e24f830ebe4e5a26a562422d52fe97/recipes/hungry-delete";
@@ -32780,12 +33222,12 @@
hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hydra";
- version = "20160913.216";
+ version = "20161204.505";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "hydra";
- rev = "dd5f703d5257e5fbedf3e2a400a68f2e7663077c";
- sha256 = "1h4lyr0mflvmv53x1w9i2dln090q2a4nfdj5p7vzpvran8hxrrwd";
+ rev = "2751f00c2c3daa8cc00f0fee7d01c803ddde7bb2";
+ sha256 = "146w0mqgcaz80la42i6i9si8kii6dn8al7iaj0ay292sq9f9dbfl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
@@ -32947,10 +33389,10 @@
}) {};
icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "icicles";
- version = "20161012.1345";
+ version = "20161127.1745";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/icicles.el";
- sha256 = "0x082kilmzq26f9pwwbq2bid98s9mjyfwljcwz2qlj8fbihwjn6l";
+ sha256 = "1j7x19jlr42mdncc3ignyra1m3w5a5gf0x51hjygrk7fh627i1jr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/icicles";
@@ -32984,12 +33426,12 @@
id-manager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "id-manager";
- version = "20160425.216";
+ version = "20161124.2045";
src = fetchFromGitHub {
owner = "kiwanami";
repo = "emacs-id-manager";
- rev = "cf0c3743f6a1a1d63637e25fff2ffa948ba40f3a";
- sha256 = "0xd0zhbabb9cx4rsapvq6qs40w4q2cav6p16vrka54rmr98544vl";
+ rev = "98bd85db17914af59e7b75c89e82117323965af2";
+ sha256 = "0fj3gsjpm58p7526c95g8fqkch51ic3h2rvr36fhmxqxd5baj5xf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/64a61b3801a0cafec87b1875eaec5950746f716d/recipes/id-manager";
@@ -33152,12 +33594,12 @@
ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ido-completing-read-plus";
- version = "20160623.815";
+ version = "20161211.910";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "ido-ubiquitous";
- rev = "950afaed5d36fc4447dd3a517ddb0dd281d8aaf6";
- sha256 = "0gk1bkllzs3fil2fcj3iha43y43370sgrrs5r6j7hzyhnxqmp965";
+ rev = "a1c2965e31ebc6bf6f86fba0184415da32a8214d";
+ sha256 = "0fvsi6hll1x0nvx1axsmsfv93pydkpmzq36hjw4kkp07nrf2byrz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+";
@@ -33450,8 +33892,8 @@
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "ido-ubiquitous";
- rev = "950afaed5d36fc4447dd3a517ddb0dd281d8aaf6";
- sha256 = "0gk1bkllzs3fil2fcj3iha43y43370sgrrs5r6j7hzyhnxqmp965";
+ rev = "a1c2965e31ebc6bf6f86fba0184415da32a8214d";
+ sha256 = "0fvsi6hll1x0nvx1axsmsfv93pydkpmzq36hjw4kkp07nrf2byrz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous";
@@ -33488,12 +33930,12 @@
ido-yes-or-no = callPackage ({ fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
melpaBuild {
pname = "ido-yes-or-no";
- version = "20160217.1617";
+ version = "20161108.1551";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "ido-yes-or-no";
- rev = "9ddee9e878ad62d58c9f4b3a7685f22b8e36e420";
- sha256 = "046ns1nqisz830f6xwlly1qgmi4v2ikw6vmj0f93jprv4vkjylpq";
+ rev = "c55383b1fce5879e87e7ca6809fc60534508e182";
+ sha256 = "1p50ycsn1mcq5nqa16w10hm8v2pixibvandc91mj5l7s8zspanik";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e575f46b8597a34523df6b6a75da5a640f4c5a2e/recipes/ido-yes-or-no";
@@ -33862,8 +34304,8 @@
src = fetchFromGitHub {
owner = "alezost";
repo = "imenus.el";
- rev = "ee1bbd2228dbb86df2865dc9004d375421b171ba";
- sha256 = "1y57xp0w0c6hg3gn4f1l3612a18li4gwhfa4dy18fy94gr54ycpx";
+ rev = "c24bc3a5b3bb942afcdf2dfb568968cf836ddafc";
+ sha256 = "1p6b7wvzf63dca446gpxm90pmbh9f7r097hbhwj2jmm2i9j5d0lg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cc571105a8d7e2ea85391812f1fa639787fa7563/recipes/imenus";
@@ -33980,22 +34422,22 @@
license = lib.licenses.free;
};
}) {};
- import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }:
melpaBuild {
pname = "import-js";
- version = "20161026.1046";
+ version = "20161128.1613";
src = fetchFromGitHub {
owner = "galooshi";
repo = "emacs-import-js";
- rev = "5726c33b8d8c43974d4b367348962025c6df56b9";
- sha256 = "1gamzw0ayfrnp4wcn41p294kg4l80xa01w8phhsqq9kpsxz8mcr0";
+ rev = "4818ece32dae9df773972815559617b803a3ac2c";
+ sha256 = "08hk5z5n1jk6wkwqn5lwk530ykrdf2v5xzds9z540vmk4dzv406q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/048344edd471a473c9e32945b021b3f26f1666e0/recipes/import-js";
sha256 = "0qzr4vfv3whdly73k7x621dwznca7nlhd3gpppr2w2sg12jym5ha";
name = "import-js";
};
- packageRequires = [ emacs ];
+ packageRequires = [ emacs grizzl ];
meta = {
homepage = "https://melpa.org/#/import-js";
license = lib.licenses.free;
@@ -34022,15 +34464,36 @@
license = lib.licenses.free;
};
}) {};
+ importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "importmagic";
+ version = "20161208.108";
+ src = fetchFromGitHub {
+ owner = "anachronic";
+ repo = "importmagic.el";
+ rev = "e536d96fdf4bfcbe44eb22827dec0955551f537e";
+ sha256 = "05ayg63v3a57d0x6lzkb25z7gwf4dwa4j56q25fk0p6y5ynrhfwr";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/695534126f0caa52f66bb90b0277d08d524daa21/recipes/importmagic";
+ sha256 = "1d85sg8wsm03v8zmv5w0znkgnr4q33x0d3frkr16dcmgqh2z9lgp";
+ name = "importmagic";
+ };
+ packageRequires = [ emacs epc f ];
+ meta = {
+ homepage = "https://melpa.org/#/importmagic";
+ license = lib.licenses.free;
+ };
+ }) {};
indent-guide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "indent-guide";
- version = "20160913.1754";
+ version = "20161207.1714";
src = fetchFromGitHub {
owner = "zk-phi";
repo = "indent-guide";
- rev = "2f764164d0ceb5dceddd8642447b74939d98d583";
- sha256 = "0g4ddx741liazyc16qh65phs8ic00gmxv768yhyhrns7f6hfrq5b";
+ rev = "38cc1c64d6f897230125c3590157f25c09703044";
+ sha256 = "10ymf5fwkxcs94pxvv754krqnvzz9hjv44ma7bakz0r1rfgn1jhc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d7110054801e3af5e5ef710a29f73116a2bc746/recipes/indent-guide";
@@ -34043,22 +34506,22 @@
license = lib.licenses.free;
};
}) {};
- indicators = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ indicators = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "indicators";
- version = "20161029.706";
+ version = "20161211.326";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "indicators.el";
- rev = "a9f228bab20285d599976d3acd506b38e03a0ff3";
- sha256 = "0wfdg3ijysvfi1vbgnc50m1f8c6mcg3qhhz987qflxkb8vdrcnqy";
+ rev = "f62a1201f21453e3aca93f48483e65ae8251432e";
+ sha256 = "0n933jigp0awba2hxg3kwscmfmmqn3jwbrxcw3vw9aj0a5rg5bq6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/72c96bad0d0b5a4f738fd1b2afe5d302eded440d/recipes/indicators";
sha256 = "1rhmz8sfi2gnv72sbw6kgyzidk43mnp05wnscw9vjvz9v0vwirss";
name = "indicators";
};
- packageRequires = [];
+ packageRequires = [ cl-lib dash ];
meta = {
homepage = "https://melpa.org/#/indicators";
license = lib.licenses.free;
@@ -34088,12 +34551,12 @@
inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-clojure";
- version = "20161015.2329";
+ version = "20161121.314";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "inf-clojure";
- rev = "98b530af7c3098a2c30b9c38751c3e80c37acac4";
- sha256 = "006cmqqykr09krlhwhb2wbv0f466w4wdmc6xxvn39qiqmprwv9a2";
+ rev = "117d8cb2564bca1248bd71eaec8b97ff1d94668d";
+ sha256 = "0wdajff7p1d1ziac6immc11jx9c4ivkj6npnjx80cyjnacj7byn4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -34151,12 +34614,12 @@
inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-ruby";
- version = "20161019.1425";
+ version = "20161204.1637";
src = fetchFromGitHub {
owner = "nonsequitur";
repo = "inf-ruby";
- rev = "df014b0717d5b35b54587fcfcda6f753d3e1091e";
- sha256 = "1vbykxzy4b4vgnvrjj9vwi2m4f65i1wkw2kiy0l4abssrdwsnsdc";
+ rev = "e05cc847385f9160703ae00b8046bb2a9eafdd64";
+ sha256 = "1zgqvsgv6b6bysw22yybkasra45fy9i8v7dp8bhnkiwgldjsk98i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby";
@@ -34193,12 +34656,12 @@
inflections = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inflections";
- version = "20161017.157";
+ version = "20161126.1727";
src = fetchFromGitHub {
owner = "eschulte";
repo = "jump.el";
- rev = "23984a363dcb1a5faad2e5d0a731b7d593d97efc";
- sha256 = "1s0cw1vcagx1rxpk00nnca8bnqphvblyi7p5rjj6fiq5rb5adqqj";
+ rev = "9519c675e8a650f6afade7d870e925d0fb50f112";
+ sha256 = "1bm1mgd632gq3cl4zrq66vnqq9ynvc01iy6szp464ccnm3cmqdzr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/392c7616d27bf12b29ef3c2ea71e42ffaea81cc6/recipes/inflections";
@@ -34213,10 +34676,10 @@
}) {};
info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "info-plus";
- version = "20161031.727";
+ version = "20161213.646";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/info+.el";
- sha256 = "11kili1v46sji4ymdz1a3fx159hzdk4r39irhlsmxy3zrnzwlaxj";
+ sha256 = "0d3qf6vlz8qbxm8i2f3qqj005mmkr35k2xr9jr1hwvwm30jrwy4z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+";
@@ -34295,12 +34758,12 @@
init-open-recentf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "init-open-recentf";
- version = "20160822.701";
+ version = "20161206.645";
src = fetchFromGitHub {
owner = "zonuexe";
repo = "init-open-recentf.el";
- rev = "a4f5338a14302d44fa5aebb1ddc7aff3dc9abbe3";
- sha256 = "0iph5cpz2dva1rnvp5xynmkndny87z308pziadk1qgf05mc0i61d";
+ rev = "7d8fb124806291f7f6ef2ec3a664ea25899b6d68";
+ sha256 = "0vswa7304s7m6cirbaky9rmrxjb2aylvif2vg2p6l274k37c4jyh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4db8b6eced50726c788d7343137f6b4558575abf/recipes/init-open-recentf";
@@ -34525,12 +34988,12 @@
interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "interleave";
- version = "20161101.256";
+ version = "20161214.515";
src = fetchFromGitHub {
owner = "rudolfochrist";
repo = "interleave";
- rev = "f0707fd914d547e88594b3208a216ddff9664a97";
- sha256 = "0xk62r0fziyybr5ivvl6yyknfv98b60nw66swz65ld9w3ld8xlpp";
+ rev = "f4a31271362fd3610a83f6c93ea52581c1ffb3c5";
+ sha256 = "0n4p02yf7faajwnrdinphbqc6akq657cndh7h5k7bgsakykflja2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave";
@@ -34546,12 +35009,12 @@
intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "intero";
- version = "20161027.207";
+ version = "20161204.626";
src = fetchFromGitHub {
owner = "commercialhaskell";
repo = "intero";
- rev = "fe0b045aadef5590eb33e03c1512430e5d52d639";
- sha256 = "18phlz8b2qwiy1mwqri02syxp7564ca0kmcdlw8m7wz6xqdr9vih";
+ rev = "c03881e03973972b44fa0e775ed2e832ebb76815";
+ sha256 = "1dlpnnajp1qg4kc99c9zhwxwy36cjicnfvbnlvjwn6flz415lavx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -34714,12 +35177,12 @@
iplayer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iplayer";
- version = "20150101.255";
+ version = "20161120.1320";
src = fetchFromGitHub {
owner = "csrhodes";
repo = "iplayer-el";
- rev = "48b664e36e1a8e37eeb3eee80b91ff7126ed449a";
- sha256 = "043dnij48zdyg081sa7y64lm35z7zvrv8gcymv3l3a98r1yhy3v6";
+ rev = "b788fffa4b36bbd558047ffa6be51b1f0f462f23";
+ sha256 = "0x82mxbc6f5azzg7c4zrxz1q763k8i3y1kfb79xfspb2i64dgg5g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a97667365f1c30f53a6aeeb7b909a78888eb1/recipes/iplayer";
@@ -34878,10 +35341,10 @@
}) {};
isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "isearch-plus";
- version = "20161106.1457";
+ version = "20161213.1957";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/isearch+.el";
- sha256 = "0bg6cy0yksklb929xxrpb6qyzkfbix7d5sgl48hfr4am0y3qgqi0";
+ sha256 = "1pmp9r48m62zq4r5xbwjm1h2rhlgb5ibfs27gkw5i5lcr2pvvsz3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+";
@@ -34896,10 +35359,10 @@
}) {};
isearch-prop = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "isearch-prop";
- version = "20160827.922";
+ version = "20161127.1755";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/isearch-prop.el";
- sha256 = "065nbrc14iw4ppj6v7fp5iygi52rbd2iwm7z5kif292ffdn499zn";
+ sha256 = "1nni8lbmh215icv2n5kzq59vbnjq2z3h021drk6szdxm5hcsgmg4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/isearch-prop";
@@ -35104,12 +35567,12 @@
ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ivy";
- version = "20161030.27";
+ version = "20161213.719";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "c8be3973a4841a3ee7d05e59666724965ecc8dd8";
- sha256 = "010hrxabaf9pj9dyj6x12sx6m9y8bk8nzdz1xsha2jq3fcglw2mc";
+ rev = "abdbfa790074632800a449b190a8fc8d0770c738";
+ sha256 = "0g54crkziiw7ll1kifqg3shw9k50rnqvpdkf1w6zk3c2v4h40yll";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -35125,12 +35588,12 @@
ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
melpaBuild {
pname = "ivy-bibtex";
- version = "20161101.2345";
+ version = "20161213.2242";
src = fetchFromGitHub {
owner = "tmalsburg";
repo = "helm-bibtex";
- rev = "4dde1da1963c5ccbe8c4d304000011fd85f2e462";
- sha256 = "1nnj197hchbgz77lskymb7mjwjljd9m2gzyx6vl4yrsqwl4y3h6h";
+ rev = "58dc08b8b8e6ea0c809052e082c867e05acef16a";
+ sha256 = "0cf3h0lkya6rsmg60qzbiz63vp8lm7nd4xlxym44hpp75nw06mgb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -35188,12 +35651,12 @@
ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-hydra";
- version = "20160517.1349";
+ version = "20161213.439";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "c8be3973a4841a3ee7d05e59666724965ecc8dd8";
- sha256 = "010hrxabaf9pj9dyj6x12sx6m9y8bk8nzdz1xsha2jq3fcglw2mc";
+ rev = "abdbfa790074632800a449b190a8fc8d0770c738";
+ sha256 = "0g54crkziiw7ll1kifqg3shw9k50rnqvpdkf1w6zk3c2v4h40yll";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -35248,6 +35711,27 @@
license = lib.licenses.free;
};
}) {};
+ ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ivy-rich";
+ version = "20161213.302";
+ src = fetchFromGitHub {
+ owner = "yevgnen";
+ repo = "ivy-rich";
+ rev = "92d7312059f8c1f055f3336580ae77437038b472";
+ sha256 = "098xsg2yggfv1b931yw4r87l8rqmgxbib5ca8bgvr3nafxfya6la";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich";
+ sha256 = "0knkqc403gch4dp1q114h64cwwisxwnsxjqbl3cnidlwkn7lzk7m";
+ name = "ivy-rich";
+ };
+ packageRequires = [ emacs ivy ];
+ meta = {
+ homepage = "https://melpa.org/#/ivy-rich";
+ license = lib.licenses.free;
+ };
+ }) {};
ivy-xcdoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-xcdoc";
@@ -35396,12 +35880,12 @@
jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
melpaBuild {
pname = "jade";
- version = "20161102.1441";
+ version = "20161210.804";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "jade";
- rev = "87697c66f883f07ff3cf646ff182a7edb49b957a";
- sha256 = "0cb17p1g7zm1cnxzfb520v7v430x01df0s6g8xi05y197kd99lbj";
+ rev = "2bacd4da0b190547d2d767adfea1b3c4501710c0";
+ sha256 = "18r8rkcqrcizg884axf3d2zi9a6d5nlh1syn68l17yf2fi4mkkzw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
@@ -35729,22 +36213,22 @@
license = lib.licenses.free;
};
}) {};
- jdee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }:
melpaBuild {
pname = "jdee";
- version = "20161106.1043";
+ version = "20161207.1325";
src = fetchFromGitHub {
owner = "jdee-emacs";
repo = "jdee";
- rev = "28fd7e8045387c4abeecb73623afad366417de07";
- sha256 = "12qj3r7apylh0qccqsr6lqlfbrp6xz3hpqrk2gqd3b01j0hp4cwd";
+ rev = "c4ee9b3fefe42e00475af452d7c664c62dbe067b";
+ sha256 = "11sz08a59hqcyynmd2zyllbvqnh7ll0ql22vj4gxrvkv18sb79za";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
sha256 = "15n76w0ygjmsa2bym59bkmbbh0kpqx6nacp4zz32hlg48kgz1dx4";
name = "jdee";
};
- packageRequires = [ emacs ];
+ packageRequires = [ dash emacs flycheck memoize ];
meta = {
homepage = "https://melpa.org/#/jdee";
license = lib.licenses.free;
@@ -36044,12 +36528,12 @@
jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jq-mode";
- version = "20160222.440";
+ version = "20161128.748";
src = fetchFromGitHub {
owner = "ljos";
repo = "jq-mode";
- rev = "ce63cb10e5a69c9017ceccf8adb7ab33450b057e";
- sha256 = "08wffbljnaxz2sh72vsqpq1lc47mnh4d47fl71dvw4pqs50zp8v0";
+ rev = "f2dc70af890694828b8227b2727240e82780d7e5";
+ sha256 = "18hprvhlwf110j7anyrrrjp4xjr3556yipz7n4jyqj69i0kvjw5c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode";
@@ -36107,12 +36591,12 @@
js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js-comint";
- version = "20160907.1705";
+ version = "20161212.2125";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "js-comint";
- rev = "2f293bde7ad99fa1f3c8eccf2c4d4782b90c515e";
- sha256 = "1maxypb349k5aw8q72k46zr4j3wmw2c81lghpb5j2jq70ndnpj4d";
+ rev = "067d52cd5f1f30634b7f332b33d0ee181594508f";
+ sha256 = "08k8pcswk8d31mqnld0pk3jawskxjzc4sa1mh15jqpli9phym0va";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint";
@@ -36146,6 +36630,27 @@
license = lib.licenses.free;
};
}) {};
+ js-format = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
+ melpaBuild {
+ pname = "js-format";
+ version = "20161215.33";
+ src = fetchFromGitHub {
+ owner = "futurist";
+ repo = "js-format.el";
+ rev = "dc5078de6bfdab3b23b0c5a4cbea4b96066c762e";
+ sha256 = "1b67nv9m30243pwarjqbvd3xwbcxgms21qdlgljpq7pjbjfh26yf";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6deaa93f7deaba9f5f36f1963522b6dc5c673a/recipes/js-format";
+ sha256 = "112zqb3q1gjlaa9zkmhx7vamh0g97dwp9j55215i1sx66lmp18iq";
+ name = "js-format";
+ };
+ packageRequires = [ emacs js2-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/js-format";
+ license = lib.licenses.free;
+ };
+ }) {};
js-import = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "js-import";
@@ -36188,22 +36693,22 @@
license = lib.licenses.free;
};
}) {};
- js2-highlight-vars = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
+ js2-highlight-vars = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "js2-highlight-vars";
- version = "20150914.108";
+ version = "20161209.128";
src = fetchFromGitHub {
owner = "unhammer";
repo = "js2-highlight-vars.el";
- rev = "5857999e6a376810816a0bee71f6d235ffe8911d";
- sha256 = "1gad5a18m3jfhnklsj0ka3p2wbihh1yvpcn7mwlmm7cjjxcaly9g";
+ rev = "15dbc583d8c2b7385f677d7ea563065fe6bfdb56";
+ sha256 = "0da32ky9fg5rilb3h3s6s7v8swvnyqfwv51f55y3dhyya3n1lclm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5f4a7c90be2e032277ae87b8de36d2e3f6146f09/recipes/js2-highlight-vars";
sha256 = "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475";
name = "js2-highlight-vars";
};
- packageRequires = [ js2-mode ];
+ packageRequires = [ emacs js2-mode ];
meta = {
homepage = "https://melpa.org/#/js2-highlight-vars";
license = lib.licenses.free;
@@ -36212,12 +36717,12 @@
js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js2-mode";
- version = "20161025.1012";
+ version = "20161212.1716";
src = fetchFromGitHub {
owner = "mooz";
repo = "js2-mode";
- rev = "94b27217cd8305029fdfdd2f4ef660622de8a582";
- sha256 = "0p8025p7n6frmdiycr5g8fg8hs2ygszpmx51c1xla2qjhn7wcf61";
+ rev = "90e37cdfdec06c7127cbb35f03a341c9d39cc2d5";
+ sha256 = "1m40hsfybqkplhwcn5b2kgm6czgdfiv7bp155fng7j045nmc8jgw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -36258,8 +36763,8 @@
src = fetchFromGitHub {
owner = "thomblake";
repo = "js3-mode";
- rev = "7fceb21ec56aac7af4b189bb0c0d0cf620327f5a";
- sha256 = "18c0s3i21b77pi5y86zi7jg9pwxc0h5dzznjiyrig0jab0cksln5";
+ rev = "229aeb374f1b1f3ee5c59b8ba3eebb6385c232cb";
+ sha256 = "0yd2lck1kq01pxk86jpxff5ih6fxx1a1wvl7v8b5ys7gi33fjqz2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/805a7c7fee2bafd8785813963bf91ac1ca417fd1/recipes/js3-mode";
@@ -36480,27 +36985,6 @@
license = lib.licenses.free;
};
}) {};
- judge-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "judge-indent";
- version = "20160609.622";
- src = fetchFromGitHub {
- owner = "yascentur";
- repo = "judge-indent-el";
- rev = "f76c012284abc296681167d7b33d5e61f3ac7cec";
- sha256 = "0547jy339ql31wym066pi79k520agdq062xblyvj0bi91j0rqld3";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/73fb2c31f6af63145aae7c449bfde1bbb00e1100/recipes/judge-indent";
- sha256 = "1gakdhnlxfq8knnykqdw4bizb5y67m8xhi07zannd7bsfwi4k6rh";
- name = "judge-indent";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/judge-indent";
- license = lib.licenses.free;
- };
- }) {};
julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "julia-mode";
@@ -36525,12 +37009,12 @@
julia-shell = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
melpaBuild {
pname = "julia-shell";
- version = "20160514.728";
+ version = "20161125.1110";
src = fetchFromGitHub {
owner = "dennisog";
repo = "julia-shell-mode";
- rev = "b9d82d0cb8d4d50c385e03312f08ab5d7676bf67";
- sha256 = "056pyq31fq86fskwhqny8n6jzavgcjv979kkg9hwbz7h90zvf9q4";
+ rev = "583a0b2ca20461ab4356929fd0f2212c22341b69";
+ sha256 = "182r7x7w3xnx7c54izz3rlz0khcwh7v21m89qpq99f9dvcs6273k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a812c6a8498949d8bd9828a95433c539da87c1c8/recipes/julia-shell";
@@ -36564,22 +37048,22 @@
license = lib.licenses.free;
};
}) {};
- jump = callPackage ({ fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }:
+ jump = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }:
melpaBuild {
pname = "jump";
- version = "20161016.2313";
+ version = "20161126.1728";
src = fetchFromGitHub {
owner = "eschulte";
repo = "jump.el";
- rev = "23984a363dcb1a5faad2e5d0a731b7d593d97efc";
- sha256 = "1s0cw1vcagx1rxpk00nnca8bnqphvblyi7p5rjj6fiq5rb5adqqj";
+ rev = "9519c675e8a650f6afade7d870e925d0fb50f112";
+ sha256 = "1bm1mgd632gq3cl4zrq66vnqq9ynvc01iy6szp464ccnm3cmqdzr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f0c791aebccc08b770b3969ce5d2e82cbe26f80e/recipes/jump";
sha256 = "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364";
name = "jump";
};
- packageRequires = [ findr inflections ];
+ packageRequires = [ cl-lib findr inflections ];
meta = {
homepage = "https://melpa.org/#/jump";
license = lib.licenses.free;
@@ -37045,12 +37529,12 @@
keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "keymap-utils";
- version = "20160902.513";
+ version = "20161212.957";
src = fetchFromGitHub {
owner = "tarsius";
repo = "keymap-utils";
- rev = "14c86914b708081299cf6a290570ff8e11853cab";
- sha256 = "15zsx296cqzmwivrkkknr8lmdsr6dkggxbwp2yggr20278vsvbhv";
+ rev = "a4f6ff724eeade5612c01c6f6bf401f264687793";
+ sha256 = "0jgmw8798g3ikhwnic3fbbjld0hj8fvg50q6x78pngf78ws92mkl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils";
@@ -37280,8 +37764,8 @@
src = fetchFromGitHub {
owner = "kivy";
repo = "kivy";
- rev = "e66f76fedbe7b8c042bd57eec282b6e1a88cb492";
- sha256 = "04w9gsip1h8qhppmw4g42apwnqpnfx8rcxgjvlskln97fgpf083d";
+ rev = "76138882e7fb7c609ae8f8f83d60d1ff1c11b64f";
+ sha256 = "1gq3wnf2rwm5gcf1kvz3vxhsnsymhnnh17vn9l0n42dy9r2jn50a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -37297,12 +37781,12 @@
kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kiwix";
- version = "20160902.759";
+ version = "20161215.535";
src = fetchFromGitHub {
owner = "stardiviner";
repo = "kiwix.el";
- rev = "686bac60f942665ddf695e761a1a37900c30885f";
- sha256 = "1salimr0295hqk14g0s3lw8a7znkkfw2mdk6g1ij07lc4cahhfx6";
+ rev = "6fb8354e1770e752ae4eb3b79d5b873f65682904";
+ sha256 = "02k0pvax9gf8gx9gcgm6zv25pvn4962c8zipp1sn5ik7i8z4fcwq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/673b4ecec96562bb860caf5c08d016d6c4b89d8c/recipes/kiwix";
@@ -37357,22 +37841,22 @@
license = lib.licenses.free;
};
}) {};
- kodi-remote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+ kodi-remote = callPackage ({ fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }:
melpaBuild {
pname = "kodi-remote";
- version = "20161007.1409";
+ version = "20161126.1914";
src = fetchFromGitHub {
owner = "spiderbit";
repo = "kodi-remote.el";
- rev = "5d767f98a65101cd32ea2dcc897967649b964a8f";
- sha256 = "0v3lh67a2z0hl7qzcnp5cihgfl7421dircrsi7n0csbzla02wxqq";
+ rev = "ddb4e59bcbac9d198f0ba6c5e8acebb4c5005946";
+ sha256 = "0gkg0n71fg74a95ckpblizwlp3a59iqqlcq7ix0q6055q6gcvixc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote";
sha256 = "0f3n7b3plsw28xpz07lf5pv71b6s2xjhq2h23gpyg0r69v99chh5";
name = "kodi-remote";
};
- packageRequires = [ request ];
+ packageRequires = [ json let-alist request ];
meta = {
homepage = "https://melpa.org/#/kodi-remote";
license = lib.licenses.free;
@@ -37591,12 +38075,12 @@
labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "labburn-theme";
- version = "20161103.932";
+ version = "20161212.313";
src = fetchFromGitHub {
owner = "ksjogo";
repo = "labburn-theme";
- rev = "28ec20825e266723a5a42a630d865ae8fdfab3d4";
- sha256 = "0kc0l07c3zq48mpjkqj7sbpz3j3h5bx4z83r7954pj6s4za8cqmg";
+ rev = "ed5481c4fe2cc7ffab8ff066e3cae5118c582484";
+ sha256 = "0wza7rn34y0p7drgrl9w10ij9w4z03vvy775zkp4qifryv78rzk2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme";
@@ -37611,10 +38095,10 @@
}) {};
lacarte = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "lacarte";
- version = "20151231.1409";
+ version = "20161127.1758";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/lacarte.el";
- sha256 = "01vs0v17l76zwyrblf9c6x0xg5fagd4qv8pr1fwfw7kl64hb9aa2";
+ sha256 = "0bpjrnxfxfmrjj07hf5sgxjm4v8i6hr7ssq235jbh4r29vgf9qlc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/85457b78a0fcc4ac0e0910d09594397b21cb1aa8/recipes/lacarte";
@@ -37690,6 +38174,27 @@
license = lib.licenses.free;
};
}) {};
+ language-detection = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "language-detection";
+ version = "20161123.1013";
+ src = fetchFromGitHub {
+ owner = "andreasjansson";
+ repo = "language-detection.el";
+ rev = "54a6ecf55304fba7d215ef38a4ec96daff2f35a4";
+ sha256 = "0p8kim8idh7hg9398kpgjawkxq9hb6fraxpamdkflg8gjk0h5ppa";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ed2b68d0a11e5db0e7f2f5cbb2eb93c298bcb765/recipes/language-detection";
+ sha256 = "1c613dj6j05idqyjd6ix7llw04d0327aicac04cicrb006km3r51";
+ name = "language-detection";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/language-detection";
+ license = lib.licenses.free;
+ };
+ }) {};
latest-clojure-libraries = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "latest-clojure-libraries";
@@ -37797,12 +38302,12 @@
latex-unicode-math-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "latex-unicode-math-mode";
- version = "20160708.902";
+ version = "20161201.835";
src = fetchFromGitHub {
owner = "Christoph-D";
repo = "latex-unicode-math-mode";
- rev = "54ddb8742c50a338639625183f7315278fa7369c";
- sha256 = "1yp6nicz0zzd28hfpi94shgj76l1h68mbw875c7x9abyhfz06sfm";
+ rev = "3b82347291edcb32e4062b0048c367a3079b3e8c";
+ sha256 = "1xylfg8xpyb2m0qnysf58cl05ibbg4drhgq7msiiql2qrdzvpx9f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9c021dfad8928c1a352e0ef5526eefa6c0a9cb37/recipes/latex-unicode-math-mode";
@@ -37944,12 +38449,12 @@
ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ledger-mode";
- version = "20161030.1103";
+ version = "20161204.758";
src = fetchFromGitHub {
owner = "ledger";
repo = "ledger-mode";
- rev = "20901f226c0fc32dbd2a2836bdf6525389205313";
- sha256 = "0y1vsr7szjvcy6dk6v98rdm1hkvyn8mg6lj18dcm1kwaxgbycdih";
+ rev = "187851c47cd5a2ab397fbbdb09d2cf9ce6d50cae";
+ sha256 = "1xhc5cvw7j6ninfw5knxqsjyxwg7p7ccf24gx72ik4gmddlki1x9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode";
@@ -38049,12 +38554,12 @@
lentic = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild, s }:
melpaBuild {
pname = "lentic";
- version = "20160721.1552";
+ version = "20161202.1352";
src = fetchFromGitHub {
owner = "phillord";
repo = "lentic";
- rev = "90a05765ebe890c0da88fe5177171473fe729574";
- sha256 = "1s82s5d7www2blz4zbyjdxwiqg9xb24gk5scxd8b8xqr7wd20sqj";
+ rev = "678db9327209a1e6200c9272f4080595dc68f8a5";
+ sha256 = "1wziqwclrkrz6bs66mj2rqcgavyf11l7iaz8vksv7vw6fh18bpbs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cbb6f9cc3c1040b80fbf3f2df2ac2c3c8d18b6b1/recipes/lentic";
@@ -38133,12 +38638,12 @@
leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "leuven-theme";
- version = "20161030.1205";
+ version = "20161211.1055";
src = fetchFromGitHub {
owner = "fniessen";
repo = "emacs-leuven-theme";
- rev = "db7181c9ffce2e5f3244344440895df4e08bbcc1";
- sha256 = "1nka98zp1xmk94vv1vxd5ymkpprs0mgss4zxny87jax8drmlbjbd";
+ rev = "10585a4333b409ee8b6e1a329de912464b69351d";
+ sha256 = "18id5zhf4kk8ws22zp3cfzxcrpc3cj5k9a1m51xrfqg3ykqbg8g1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme";
@@ -38193,12 +38698,12 @@
lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lfe-mode";
- version = "20160810.1940";
+ version = "20161204.908";
src = fetchFromGitHub {
owner = "rvirding";
repo = "lfe";
- rev = "82636b12d82b0e3be076b69bfc31bb3507ba3530";
- sha256 = "0bjx08s95xklq6qszg1p3gl62c4y3kacwvz61ywgchhxvxdwi450";
+ rev = "96ca72844dab04a5330e0f33d95a18544b7ba369";
+ sha256 = "1nzixvacppw37z5vfxp5ggg58ppqxrw86xhf2x4mfyyk9vs7jgg7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -38510,12 +39015,12 @@
lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
melpaBuild {
pname = "lispy";
- version = "20161026.1538";
+ version = "20161212.1048";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "lispy";
- rev = "fa1aaf0be0102ad5bedcea1154a62746f6457379";
- sha256 = "16hcy02jx4f3m6ps8m6sxks18a9mzagn262wcvf8vq3q1iargwai";
+ rev = "8e4f8c6545520cbb206588bc2989b5f942e95089";
+ sha256 = "0h09niqzzcc42sjrdr56n4ayddv9798naiwi7ws9w45nrpghz9b5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -38823,12 +39328,12 @@
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "live-py-mode";
- version = "20160521.1130";
+ version = "20161212.1937";
src = fetchFromGitHub {
owner = "donkirkby";
repo = "live-py-plugin";
- rev = "2670089597e586c82402767727c278e9c8edfca1";
- sha256 = "00bran2qvxqlp5081qqnwn48i48v95m3g5jgrxq0nvcgblxdv2ga";
+ rev = "cec5ce8bbfc04ec36c09e349b707f5941c9883b5";
+ sha256 = "075jdy3mpn90kc894lcppmznp78k1csxf3acrrkxm3r6gncf4vkg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -38910,8 +39415,8 @@
version = "20150910.644";
src = fetchgit {
url = "http://llvm.org/git/llvm";
- rev = "3e6b5bc83fc2b89b0d3624c3ba5d36af162a225c";
- sha256 = "0h1flxwsd83hrgpjz4z4plarvcvmwagvqxfpz3k05hi75c5cpcds";
+ rev = "152f85e176aa00afd6dde8544d6735151a019991";
+ sha256 = "16jvypkrrnnabxva089k8fy23fvr405jka1bw0a47mlgrdfxan04";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -38990,12 +39495,12 @@
loccur = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "loccur";
- version = "20160129.1222";
+ version = "20161122.1107";
src = fetchFromGitHub {
owner = "fourier";
repo = "loccur";
- rev = "fb1fbc0ff5da7a8b117542ab8083d29cd79e12b2";
- sha256 = "1npz90zf91wqf35bqd3zmkh0b538i69w8ygc78x5w2x5005aqr0p";
+ rev = "08aeadc69571bddf44f2708dd75f57c7e027d32f";
+ sha256 = "0wlz3skimgxbfvrd0xjj17ymm24c86847hd90wik861a4ig3wby0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/72550b043794331e85bc4b124f6d8ab70d969eff/recipes/loccur";
@@ -39136,12 +39641,12 @@
logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "logview";
- version = "20161007.1145";
+ version = "20161108.1149";
src = fetchFromGitHub {
owner = "doublep";
repo = "logview";
- rev = "9b2f610a32557937e704b32e97f4b61abdec6845";
- sha256 = "0w1csjcgvl1jfhjpfj19hzrd6f055iaiq0qafpgjlyn6dd4sf9gj";
+ rev = "4f1db3f2081e819dd35545497529a03466bd0397";
+ sha256 = "0f96wxijls743qyqfgkdqil3p5nn0sm02rlz1nqkm6bd8k28rcg1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -39445,12 +39950,12 @@
macrostep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "macrostep";
- version = "20160925.505";
+ version = "20161120.1306";
src = fetchFromGitHub {
owner = "joddie";
repo = "macrostep";
- rev = "e5376126947837958983364b8615c7dea6953eda";
- sha256 = "0hdn0gwfwp5ixqqcjsiz4sjq13xzkynnbz2rclg4ajl53mgknfbv";
+ rev = "424e3734a1ee526a1bd7b5c3cd1d3ef19d184267";
+ sha256 = "1fm40mxdn289cyzgw992223dgrjmwxn4q8svyyxfaxjrpb38jhjz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/362b5cb71e81172bc654594c08a5d0b91262851a/recipes/macrostep";
@@ -39487,12 +39992,12 @@
magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "magic-filetype";
- version = "20160522.729";
+ version = "20161214.1017";
src = fetchFromGitHub {
owner = "zonuexe";
repo = "magic-filetype.el";
- rev = "3f58122429ea24c54fca79a91605eb660ee5bc3e";
- sha256 = "109j4czb71qg9jlnflzph0qmbxyfajddmg0yqwhl368pa29alvrk";
+ rev = "9a20137474697063898902b43a40423daa4eb64d";
+ sha256 = "1r16qlm2pqcph0zwy3fhzdjywdrfcwvldqk809vbhw71qkq4a54i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6027c5a66386f7140305a4cde12d66da4dfa09/recipes/magic-filetype";
@@ -39508,12 +40013,12 @@
magic-latex-buffer = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "magic-latex-buffer";
- version = "20160212.603";
+ version = "20161214.1726";
src = fetchFromGitHub {
owner = "zk-phi";
repo = "magic-latex-buffer";
- rev = "21c5030996bcd773b32b6fdd5990a64fcc3255f3";
- sha256 = "1gmhb8g1pl4qqk1d32hlvmhx2jqfsn3hkc4lkzhgk1n3qzfrq4hf";
+ rev = "572bc5d9054ba5a7e78abd333141722be9013a1f";
+ sha256 = "0hmmsn1i2izasfpgmz2p0zi1fhj96yym2vz6m7yb0gxd2ijhk1jw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/07e240ebe71d389d314c4a27bbcfe1f88b215c3b/recipes/magic-latex-buffer";
@@ -39529,12 +40034,12 @@
magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
melpaBuild {
pname = "magit";
- version = "20161105.1602";
+ version = "20161214.1516";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "c8517573287b9e533fb7465ba0c045655b0ec167";
- sha256 = "12dhqwk1hdx3aghwfdc8nhd0zxlzm7mfcvxxqz20vq1jjbraz5iw";
+ rev = "2fc26ea8f8a188a23dc1f819d8b512ddbf7307bb";
+ sha256 = "0mymbcm7i1y325n0p9q5qmx92j8j2ny61imv8w7m6xx30ylf1pdw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -39557,12 +40062,12 @@
magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "magit-annex";
- version = "20161106.1441";
+ version = "20161115.1528";
src = fetchFromGitHub {
owner = "magit";
repo = "magit-annex";
- rev = "aff3aa6f46f561e1cfe4f240396559097a409fb1";
- sha256 = "1mvg5qk93b7ihy7jbk6ywwp2a00qz7wwz3rd2basxj01z6glfxk4";
+ rev = "74e0343b4152ad5c0d4f77f9f15dd6f1b02de432";
+ sha256 = "08mpnj9c43p528iy3hj8yljhzpkpjxkjiaiiss5n2jgyyc64hw9z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex";
@@ -39704,12 +40209,12 @@
magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "magit-popup";
- version = "20161009.1506";
+ version = "20161214.519";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "c8517573287b9e533fb7465ba0c045655b0ec167";
- sha256 = "12dhqwk1hdx3aghwfdc8nhd0zxlzm7mfcvxxqz20vq1jjbraz5iw";
+ rev = "2fc26ea8f8a188a23dc1f819d8b512ddbf7307bb";
+ sha256 = "0mymbcm7i1y325n0p9q5qmx92j8j2ny61imv8w7m6xx30ylf1pdw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -39809,12 +40314,12 @@
magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }:
melpaBuild {
pname = "magithub";
- version = "20161105.1817";
+ version = "20161129.934";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "magithub";
- rev = "55ef2b694109e8f4caeb7cebd49345bbce7e5749";
- sha256 = "05k68hx83dvnvr1mkw8pmyn77dh7wa7j5q8awcjswxqw2pkxcmxy";
+ rev = "c9bff9889650bee96c6d4f5cd46ac469ac1c3dbb";
+ sha256 = "0vzln1b6cf90nnv7a28n2w781qrc17sss1s8h6i7fmnaldr0913j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub";
@@ -39918,8 +40423,8 @@
src = fetchFromGitHub {
owner = "alezost";
repo = "make-color.el";
- rev = "a1b34e95ccd3ebee4fba1489ab613d0b3078026d";
- sha256 = "1ky3scyjb69wi76xg6a8qx4ja6lr6mk530bv5gmhj7fxbq8b3x5c";
+ rev = "5ca1383ca9228bca82120b238bdc119f302b75c0";
+ sha256 = "1wmpy1d966zzxwar2ng825zlch5fwsslsi1706ss9v7zl7i9wggd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bb765469c65589ae9d7dbc420a8edcf44c3be5d1/recipes/make-color";
@@ -40079,6 +40584,27 @@
license = lib.licenses.free;
};
}) {};
+ malyon = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "malyon";
+ version = "20161208.1325";
+ src = fetchFromGitHub {
+ owner = "speedenator";
+ repo = "malyon";
+ rev = "0d9882650720b4a791556f5e2d917388965d6fc0";
+ sha256 = "0an1yvp0p624rxd8n5phiwvznw35ripqhlwzwyv2bw7lc1rscllr";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/54b3785cfcdb3b54307f60ee634a101e8bcd9989/recipes/malyon";
+ sha256 = "050kj4c1vp9f3fiskf8hld7w46092n4jipdga226x97igx575g3r";
+ name = "malyon";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/malyon";
+ license = lib.licenses.free;
+ };
+ }) {};
man-commands = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "man-commands";
@@ -40124,12 +40650,12 @@
mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
melpaBuild {
pname = "mandoku";
- version = "20161103.115";
+ version = "20161211.2253";
src = fetchFromGitHub {
owner = "mandoku";
repo = "mandoku";
- rev = "9c32e47b80dce357278f520593eb670abb66879d";
- sha256 = "1p5i26bcsa9vp5hapy2pxkb55yhqyhpmsi9qyqhkh9bxaqa70baf";
+ rev = "04f1aaf687ad1d3bf6bf032b817032b82a6cd6bb";
+ sha256 = "0pf6hcbd13gfjb58z2cgc4ql2m08kx0inxz1x7sfrpg1cvh8nb8f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -40310,22 +40836,29 @@
license = lib.licenses.free;
};
}) {};
- markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, websocket }:
+ markdown-preview-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, uuidgen, web-server, websocket }:
melpaBuild {
pname = "markdown-preview-mode";
- version = "20161004.513";
+ version = "20161211.1443";
src = fetchFromGitHub {
owner = "ancane";
repo = "markdown-preview-mode";
- rev = "a5de48c4dc2cb2c8703b3ca139863f59d91086c9";
- sha256 = "1x0rv26sq7x5pd1zyc8j3xwhmg8cbm8q4aibhrnrzf9gmc54jn0l";
+ rev = "b55c8ddba2f9c4e87f0dd9bed586f4d94890350f";
+ sha256 = "18x7mk4xysiihr707xl4s52a73mpj9bwlh53gli37wmpjfgdlp1y";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/011d26360a109b074cdecbcb133269ec6452ab86/recipes/markdown-preview-mode";
- sha256 = "0i0mld45d8y96nkqn2r77nvbyw6wgsf8r54d3c2jrv04mnaxs7pg";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode";
+ sha256 = "1cam5wfxca91q3i1kl0qbdvnfy62hr5ksargi4430kgaz34bcbyn";
name = "markdown-preview-mode";
};
- packageRequires = [ cl-lib markdown-mode websocket ];
+ packageRequires = [
+ cl-lib
+ emacs
+ markdown-mode
+ uuidgen
+ web-server
+ websocket
+ ];
meta = {
homepage = "https://melpa.org/#/markdown-preview-mode";
license = lib.licenses.free;
@@ -40334,12 +40867,12 @@
markdown-toc = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, s }:
melpaBuild {
pname = "markdown-toc";
- version = "20160727.908";
+ version = "20161214.1011";
src = fetchFromGitHub {
owner = "ardumont";
repo = "markdown-toc";
- rev = "297bb643e222ec2f95a23403723e45eaf4a1dcd2";
- sha256 = "0vk6zrxpinmzmgx74k1kc9kw6slb3j1z0lk4cyhcpxd202dm1bmw";
+ rev = "c7a526c0cd2c3b2ecc7b36458c762e0a0b55909e";
+ sha256 = "1j35pmm9rk7zk5j6x0fzglx09hbm8csf07f0pc9fkvvyh1nqskxf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4db1e90be8e34d5ad0c898be10dfa5cd95ccb921/recipes/markdown-toc";
@@ -40443,8 +40976,8 @@
src = fetchFromGitHub {
owner = "sigma";
repo = "marshal.el";
- rev = "6332b3f567f3a09ebed8f7f01e99e503f096e2a4";
- sha256 = "1i0w27fbm9vyz8g3pv4ksmzmabflwzcb5705g5zb696kl20n6jxz";
+ rev = "d5b6fdd97159b22d5a9dbc3b0db18a04089b3f2f";
+ sha256 = "1pix1cz8zv3kgf103ml1y42a0l2hvakbykfpbyx81z4nw7n958lf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal";
@@ -40561,6 +41094,26 @@
license = lib.licenses.free;
};
}) {};
+ matrix-client = callPackage ({ fetchgit, fetchurl, json ? null, lib, melpaBuild, request }:
+ melpaBuild {
+ pname = "matrix-client";
+ version = "20161004.1933";
+ src = fetchgit {
+ url = "https://fort.kickass.systems/git/rrix/matrix-client.git";
+ rev = "5bf61e088fba83754a9e9bbef8459c82bea3be1d";
+ sha256 = "1p8wfxf8pxy9ic5sd6ci1197v3j0r6564k4sw5agqplyzap5g9v5";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/adeaf97d285120d7b20f1f7a21cb89eb3c40b3b6/recipes/matrix-client";
+ sha256 = "05q1ggiq4nldcklpv2hndg1nx8jxl6qgi5jjc3kz736x7syb0j34";
+ name = "matrix-client";
+ };
+ packageRequires = [ json request ];
+ meta = {
+ homepage = "https://melpa.org/#/matrix-client";
+ license = lib.licenses.free;
+ };
+ }) {};
maude-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "maude-mode";
@@ -40606,12 +41159,12 @@
maxframe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "maxframe";
- version = "20140916.754";
+ version = "20161213.1734";
src = fetchFromGitHub {
owner = "rmm5t";
repo = "maxframe.el";
- rev = "174e3a0f3a716e904eba15e659096a99976ee39a";
- sha256 = "0g9kpsg6623nmxnshj49q8k952xybrkmqqy6m892m8wnm22pjdz1";
+ rev = "50dc78c7b33959c10d5f6da00c338d4611467c36";
+ sha256 = "1qz3q63g0zh5xhsxcqm37swcdpliii15cqfbbvm0jjyd9kfysblw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7944652cb7a7bf45f16e86ea379a104d31861e76/recipes/maxframe";
@@ -40813,12 +41366,12 @@
melancholy-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "melancholy-theme";
- version = "20160929.43";
+ version = "20161110.120";
src = fetchFromGitHub {
owner = "techquila";
repo = "melancholy-theme";
- rev = "3477a88cdf4586203430e24a1a72bc95e5fab3f5";
- sha256 = "0kkx7iwj4bp9yknk6k6mw80bsh6d00kqjdsscr1p0srv9vqnrwba";
+ rev = "bf15e39ed0579fa1cf1ceb5fb91876c2be115bfb";
+ sha256 = "0wphlp2vq8clv0q9c5lrpbajzhn7pr4z6x661q6vd51z9azh3qp2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8f708d1300d401697c099709718fcb70d5db1f/recipes/melancholy-theme";
@@ -40939,12 +41492,12 @@
mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
melpaBuild {
pname = "mentor";
- version = "20140904.1710";
+ version = "20161212.1342";
src = fetchFromGitHub {
owner = "skangas";
repo = "mentor";
- rev = "f5d653348140cdab1d8ee9143b14a50ea88ed3fb";
- sha256 = "11hyydc13jdai6lkxx8nqf8xljh0gx7fcmywhik4f1hf3pdv7i2q";
+ rev = "c0cf0fcac1a2bbc9887e15bed00dce10fcb6ecab";
+ sha256 = "1v2dqwbfwf21az6qpqxd5bskspampp3mdhdzy7vsmfd50gq3jb5l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor";
@@ -40959,10 +41512,10 @@
}) {};
menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "menu-bar-plus";
- version = "20160918.1025";
+ version = "20161209.734";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/menu-bar+.el";
- sha256 = "1kzmdanaf167qvmybf6hfbgia628xpqycnnl4a9qms6vfjzmqznk";
+ sha256 = "18i4isl86ldmbxkyiqiawby1izhdhpa8x7zyvzbfhzrny15dp32p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/menu-bar+";
@@ -40978,12 +41531,12 @@
merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "merlin";
- version = "20161017.205";
+ version = "20161103.821";
src = fetchFromGitHub {
owner = "the-lambda-church";
repo = "merlin";
- rev = "6480e585a0e9d036d11aaf28bcee97e8e9b77c2e";
- sha256 = "0p3hqxawp18q43ws6506cnndi49f3gxzmai0x2qch7h42dgh1cb8";
+ rev = "69b1ec176603cfab6b60941c2dc8d75d64fac019";
+ sha256 = "150iyy75wqwva096c8g1w2sc97nfdgbry6kpz4ngz6l7ij3vivpc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -41122,12 +41675,12 @@
mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mew";
- version = "20161030.1807";
+ version = "20161123.1840";
src = fetchFromGitHub {
owner = "kazu-yamamoto";
repo = "Mew";
- rev = "15469053c8d7996b82270179d879d6e1e038282b";
- sha256 = "1ss01b1add6p8fgxaqy1nc5h9ycr87a647qyaqbm2knza0xrbhni";
+ rev = "90485fb0f21c250d308d1952ccad1049e766fcd8";
+ sha256 = "03bksshs2n3jxiccbgd86kbbwm79hmvsrbxw4yyjv311w8p2i1gw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew";
@@ -41331,12 +41884,12 @@
mini-header-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mini-header-line";
- version = "20160616.327";
+ version = "20161108.137";
src = fetchFromGitHub {
owner = "ksjogo";
repo = "mini-header-line";
- rev = "1480c578a1f4c77365744d2487ae868a36d49d2a";
- sha256 = "0iadwh86025wnxg30q866zsb156rhf82x8b9ih229ln2v0ank6as";
+ rev = "d8c3b6e93ad631d22564c273f61463dc9ded49ba";
+ sha256 = "07r231xz45k1b3pzix308jn24s0gl8vgdbcd4vdh6p154znvcbm5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/122db5436ff9061713c0d3d8f44c47494067843e/recipes/mini-header-line";
@@ -41762,12 +42315,12 @@
mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "mocha";
- version = "20160818.1456";
+ version = "20161214.839";
src = fetchFromGitHub {
owner = "scottaj";
repo = "mocha.el";
- rev = "7a658c112220d759fccb1c16e49f3712d8bb1af7";
- sha256 = "0gwgq5iq7lazy596hsld0yib88r1wv57wb92rjga79vbmg5pi1nq";
+ rev = "23831bab8290a90e9253b648176d99385a438568";
+ sha256 = "0v8d0605c31x1crjhgr73x5372rhxlrbap29j0j3zlbv0shd39v7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha";
@@ -41846,12 +42399,12 @@
mode-icons = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mode-icons";
- version = "20160808.525";
+ version = "20161125.2230";
src = fetchFromGitHub {
owner = "ryuslash";
repo = "mode-icons";
- rev = "0b5e76b2418d455bf7cf8ee52dd3354964626b5e";
- sha256 = "1z9jrc85mlgcqpyys9filyaav7f8asn2w5dd2q5wp4s7i3gj8mc2";
+ rev = "1b3ab62793b0e5f31e1ee2d8053a219ec34287f8";
+ sha256 = "0jz2mb3xinjkxw4dzgpfpxzzi27j9wdzbnn7rnfwkpj66v4fcl20";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mode-icons";
@@ -41887,10 +42440,10 @@
}) {};
modeline-char = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "modeline-char";
- version = "20160523.1520";
+ version = "20161210.852";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/modeline-char.el";
- sha256 = "0qikw44mj209xycchxqifbn9vwyd4zd2d25w8m134cnkhbbjmf5q";
+ sha256 = "06n97a196rqc88py7jnydv8a4q1vd0bb2ich2mx25sl3pylmd6lq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9655505f56fc90ea8ef61e7595af0de7427b273b/recipes/modeline-char";
@@ -41966,12 +42519,12 @@
moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "moe-theme";
- version = "20160907.727";
+ version = "20161129.115";
src = fetchFromGitHub {
owner = "kuanyui";
repo = "moe-theme.el";
- rev = "01274c8538f6e95ce8b82e0db672746cbeab6b23";
- sha256 = "0h7nlrhcg6sclrmw075n1rsv3rjsi8z0sgr1al998pv4a3w4m6bj";
+ rev = "1a77b2ee52f5077ef3a31c794ecf13b37b3b4fd3";
+ sha256 = "1gimdcrkbanzl1zxxw2955k7a4ygyqgls12g31g8nvjjp46hgjhr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme";
@@ -42092,12 +42645,12 @@
monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "monokai-theme";
- version = "20160902.1417";
+ version = "20161215.347";
src = fetchFromGitHub {
owner = "oneKelvinSmith";
repo = "monokai-emacs";
- rev = "11fa06c8fd5d5734e635427565a7fc980908b877";
- sha256 = "1vkjgmwlnhfqs4dnp6lf0vpjss5pxcmdqy29yg62igsg1xjd7whw";
+ rev = "241f7a218d7697efe47ac2fc7751717a1c47ef5c";
+ sha256 = "1fgadbbvsh78xq3gg203jc7c93b3ypmxsnncx0kpq3rhd96ym730";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -42238,10 +42791,10 @@
}) {};
mouse-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "mouse-plus";
- version = "20151231.1525";
+ version = "20161209.737";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/mouse+.el";
- sha256 = "0rakxcpqdx175hic3ykwbd5if53dvvf0sxhq0gplpsybpqvkimyv";
+ sha256 = "1jr6m5cm6j6bfdk2f2n632aybjna4pcpyqm6j9flcr537fciwvap";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/01cbe9b5bb88f8c02fab67a269ac53c8aa4d8326/recipes/mouse+";
@@ -42338,12 +42891,12 @@
mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mowedline";
- version = "20150601.1009";
+ version = "20161121.1835";
src = fetchFromGitHub {
owner = "retroj";
repo = "mowedline";
- rev = "63056cb9b29c5d3b5ef9d22ace7633c87e1e4299";
- sha256 = "1f4ijffjpf9p1p5gvbv8yd9hiyqrdiyg4wmqrnr76yls7zbxdf1a";
+ rev = "ad7622969366e40401af877db75940ae23b5e4fc";
+ sha256 = "0d2xabp9dkzixn7kqsxpapjcy846wgsh27l468pl2ar6pxnwwc86";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline";
@@ -42405,8 +42958,8 @@
src = fetchFromGitHub {
owner = "google";
repo = "mozc";
- rev = "efc1eaa4361add1803ae5245c4f3dfdea106ba48";
- sha256 = "0ws529sh9xa583m8gk78gwqnz2704sz0dw9c0l9nfz0hk3h75ivk";
+ rev = "4767ce2f2b6a63f1f139daea6e98bc7a564d5e4e";
+ sha256 = "1azx128zsr7mlg2k538483c3qi1zmm8cc4z8sk06534wnx7wxs88";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc";
@@ -42569,12 +43122,12 @@
mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mtg-deck-mode";
- version = "20161004.1742";
+ version = "20161113.1359";
src = fetchFromGitHub {
owner = "mattiasb";
repo = "mtg-deck-mode";
- rev = "362fcac725b31570d01df6e9bad545ab636a7dc5";
- sha256 = "0fzh2sq9gki87yqar48jxa34zqqmyfjiifcmv3br97im25sjfq3p";
+ rev = "14d117dce8e082eb26007abd01f0e4af3ce3b698";
+ sha256 = "03lff20d10s5nzh6jddf8q31lm3c20zflwbklnbsrydm2w5j6d16";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode";
@@ -42632,12 +43185,12 @@
mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mu4e-maildirs-extension";
- version = "20160911.41";
+ version = "20161209.635";
src = fetchFromGitHub {
owner = "agpchil";
repo = "mu4e-maildirs-extension";
- rev = "b695dcf4688e288488a6dd1583de3782df0a4549";
- sha256 = "1bwgrhsbf6frxvn8l66yi3qm1l7dc54dkjzdsad0mdas1vmibh0l";
+ rev = "19ff86e117f33a5e3319f19c6d84cf46854ba874";
+ sha256 = "02pmnvq3crrivrv5l1x40y2ab0x2mmg7zkxl7q08bpglxzc8i4k0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3b20c61c62309f27895f7427f681266e393ef867/recipes/mu4e-maildirs-extension";
@@ -42734,11 +43287,11 @@
multi-project = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "multi-project";
- version = "20150314.744";
+ version = "20161204.223";
src = fetchhg {
url = "https://bitbucket.com/ellisvelo/multi-project";
- rev = "f7fd0ae6819e";
- sha256 = "0lcx73vzm7zwvzzc53pfb5y16bhvq9cm9fdy63d3242s8v834z3c";
+ rev = "a6fd748acd9b";
+ sha256 = "0j6lq5sxrn5yvxja5ag0q01bic6r6hbnfr7010ahc3bwl78yslc3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project";
@@ -42856,12 +43409,12 @@
multitran = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "multitran";
- version = "20161017.1307";
+ version = "20161122.1323";
src = fetchFromGitHub {
owner = "zevlg";
repo = "multitran.el";
- rev = "0a18683644b63aaf9a55a433c23ff4c83bceb915";
- sha256 = "1fgwpzfr6bhzsbw52gvw0g4qn2fzrr9cw0a3g85p8qqkhja0cfbx";
+ rev = "c0ce2e1b3706263946f9240a47c3f65ed4fc0afa";
+ sha256 = "1dd82jlc865achy70ldjwkjx45p11sjj0snvf85r1dj4aywci6i5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d665759fa6491b77103920a75c18a561f6800c1c/recipes/multitran";
@@ -43126,12 +43679,12 @@
mysql-to-org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "mysql-to-org";
- version = "20160901.2358";
+ version = "20161119.1256";
src = fetchFromGitHub {
owner = "mallt";
repo = "mysql-to-org-mode";
- rev = "25e30a8f3582e64377c8df23531b17dcc14a84e2";
- sha256 = "0vjnah8nkhh01nq758c79rssscd3rwmfrcb02sq98mcqa0aaqk07";
+ rev = "0f51b174a0ee6c9820baf9d79783923b270f3ffc";
+ sha256 = "1gxp1a26sna0p3xq6by8bk4yphhh32bvll0sdm2p3wkpdaci7hyz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca23f61be1dc8b0ae2ec0ae38d4614cf9c855023/recipes/mysql-to-org";
@@ -43396,12 +43949,12 @@
nand2tetris = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nand2tetris";
- version = "20161011.1748";
+ version = "20161109.1637";
src = fetchFromGitHub {
owner = "CestDiego";
repo = "nand2tetris.el";
- rev = "9c5161c840f30f01647c188699dacba5e51b3b44";
- sha256 = "05ngqw29gzjs0zzs8nyldfcqkbnh9n7jkaxrsc40dfqikjhaj5xc";
+ rev = "e1be652b7d46e653a85c564ed917b5b75ab4bc50";
+ sha256 = "1xnb5y1ddy4s7kia6zfzd8s5q9m2zfd72344qizywla86rqk7lpb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris";
@@ -43417,12 +43970,12 @@
nand2tetris-assembler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nand2tetris }:
melpaBuild {
pname = "nand2tetris-assembler";
- version = "20161011.1748";
+ version = "20161109.1637";
src = fetchFromGitHub {
owner = "CestDiego";
repo = "nand2tetris.el";
- rev = "9c5161c840f30f01647c188699dacba5e51b3b44";
- sha256 = "05ngqw29gzjs0zzs8nyldfcqkbnh9n7jkaxrsc40dfqikjhaj5xc";
+ rev = "e1be652b7d46e653a85c564ed917b5b75ab4bc50";
+ sha256 = "1xnb5y1ddy4s7kia6zfzd8s5q9m2zfd72344qizywla86rqk7lpb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris-assembler";
@@ -43543,8 +44096,8 @@
src = fetchFromGitHub {
owner = "tiago4orion";
repo = "nash-mode.el";
- rev = "bb7ae728a16812a0ef506483b877f6221c92ca9c";
- sha256 = "1n4dxbd388ibghismc5d1nkvxwxdi4r415prsaa3qad8l9s4ivwh";
+ rev = "2cd96535eb7d669a94306183e95ee37333872c1a";
+ sha256 = "0wdkl56pgm6qlgqjs4kqjglnxzjsfjd0y4fiffhxc893gm0psrpg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c8bd080c81b163a6ddcfffc710316b9711935b4a/recipes/nash-mode";
@@ -43732,8 +44285,8 @@
src = fetchFromGitHub {
owner = "rsdn";
repo = "nemerle";
- rev = "2e74d2bcab9ea91078f0ffa040ad8d9372e0a305";
- sha256 = "1n6gma3g08wvs083frbb0a7nygy5f9cfidqkbqf1xxm806ancvdz";
+ rev = "9339ad5534676dac089048f9955a77c282862b25";
+ sha256 = "17wq5lsrps94qgxhmk2xgp6j8lr17g8c2liz39ffvvwawcr207k7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle";
@@ -43770,12 +44323,12 @@
neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "neotree";
- version = "20161028.2314";
+ version = "20161214.2346";
src = fetchFromGitHub {
owner = "jaypei";
repo = "emacs-neotree";
- rev = "991e1b8cb7cc3a0bbb9aa8fb109800b46b6cf3b2";
- sha256 = "0v4l4y4zwp93dgvlca23f6y9kgkzvv7i3cmvb6s5jki5syb86r3m";
+ rev = "cfef6036b69d53a83689694f5f257e5aaaeef265";
+ sha256 = "0bbhvldxid7g4jg6pp9ywcf0xipbf9y2wqbg3pr7g45sbl3i7zz3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
@@ -44026,8 +44579,8 @@
src = fetchFromGitHub {
owner = "martine";
repo = "ninja";
- rev = "b7bac03427e4f13ec7681aa25d3a1111fab7a4c3";
- sha256 = "1sga2iqm3qf4qyvxm89maakkxg4dskwy0m5vfa54b95jr8616p5g";
+ rev = "7d705a3dfcd09a31c67c440ca2120d3994357e57";
+ sha256 = "0x2bkdbv0p5rj4nwybnajdwbyhnbyk4vxjlpmf5zljs5kc49h3zs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode";
@@ -44068,8 +44621,8 @@
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "eec5409a69054cf21214c3f5846ec0310fcb8228";
- sha256 = "1478xf9mp6v539r6mgpm7lfqa21xa5vd1kwybm24bdnzlq7h5pws";
+ rev = "5278bb7c16c227d64551fc6578cb1b1b22f3b036";
+ sha256 = "11f3fk1w40ynjzabs9rmzjzbwlkr91bhc5a0wk6m9pmm9lmshl6b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -44190,12 +44743,12 @@
no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "no-littering";
- version = "20161008.1358";
+ version = "20161212.956";
src = fetchFromGitHub {
owner = "tarsius";
repo = "no-littering";
- rev = "c176eae5d97f627c946ad43c980a1300e3cbeb50";
- sha256 = "1fs50qll79w0kiyh4jr9kj08ara4s8mhfybx2x1s01xnd6yzjhk8";
+ rev = "0421f2c8aba7d369135d9e7e0d181d0da8c08d8c";
+ sha256 = "1vk4cz12r0aw1rapf9k2g730ak5q8b5rpylhwsr819ixyr9zpz7a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -44232,12 +44785,12 @@
noctilux-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "noctilux-theme";
- version = "20161029.810";
+ version = "20161113.642";
src = fetchFromGitHub {
owner = "sjrmanning";
repo = "noctilux-theme";
- rev = "8980a500eb2613771c873c78499a1f8a580fff9c";
- sha256 = "1qfwra5q6k3p5p2i35pzs3hcksvpg1f5nk4q4qrkqb8flypfasdc";
+ rev = "a3265a1be7f4d73f44acce6d968ca6f7add1f2ca";
+ sha256 = "12xx0v8d97kjvlkj0ii78vxxvzgmcfc4hzv4yvxymg50rsy0zzqi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c0a18df34c105da8c5710643cd8027402bb07c95/recipes/noctilux-theme";
@@ -44334,11 +44887,11 @@
}) {};
notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "notmuch";
- version = "20161104.851";
+ version = "20161215.457";
src = fetchgit {
url = "git://git.notmuchmail.org/git/notmuch";
- rev = "343534d82dc8882b3f0e2a847ee9d10ba5392809";
- sha256 = "1gq6vj6ac5f2kxrmzh8szn5577znfaxmp9fw3zcfjdrdmw0775n4";
+ rev = "5de84d07526d330a46e50d955bdfeed8f629637d";
+ sha256 = "0zz3xg9v8g9vj4lwdx4phwr54ky49bws2amm1cq7yijwzgj2qbjk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -44708,11 +45261,11 @@
ob-axiom = callPackage ({ axiom-environment, emacs, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-axiom";
- version = "20160310.1353";
+ version = "20161122.1222";
src = fetchhg {
url = "https://bitbucket.com/pdo/axiom-environment";
- rev = "4d70a7ec2429";
- sha256 = "1dmixpwsl2qsiy6c0vspi1fwvgwisw84vhijhmbkfpzrqrp1lkwc";
+ rev = "110e20a7a86c";
+ sha256 = "0s18bbfw4kcv9iij1016pamq394rg8xr7016qp6cxyklp9hivcdm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ob-axiom";
@@ -44875,12 +45428,12 @@
ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ob-http";
- version = "20160709.224";
+ version = "20161208.222";
src = fetchFromGitHub {
owner = "zweifisch";
repo = "ob-http";
- rev = "47a7b367314f6051715882e46a0e40477bda20a2";
- sha256 = "1y5izm9yxa556536mnpc8dp0nzm8wzr778qycpk4l9xfyp4xybaw";
+ rev = "9155a413e41d918042e9839399e3940aa0f8499c";
+ sha256 = "1b39g0nifw0000s0x8ir0cfr716jypq6b5n2l1i4mrby6aw3bw1k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http";
@@ -44980,12 +45533,12 @@
ob-mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ob-mongo";
- version = "20160504.1434";
+ version = "20161130.152";
src = fetchFromGitHub {
owner = "krisajenkins";
repo = "ob-mongo";
- rev = "abfe62e964f6f3e097f94111ae14247e1f442134";
- sha256 = "1xrapp8mvxlbz0v5s3lrmfacijdgs6qrpklbk85rswx1gisl0kmb";
+ rev = "d64a507c2f9e2a1f8062acae50199541fc23be65";
+ sha256 = "0xlddh28z9afqj8j9brcncrbwsyqzmv432zayn9ajjj1vk1avsxg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e020ea3ef89a3787d498c2f698c82c5073c9ee32/recipes/ob-mongo";
@@ -45110,8 +45663,8 @@
src = fetchFromGitHub {
owner = "stakemori";
repo = "ob-sagemath";
- rev = "450d510a5eb1fd644d0037e9f02271ca33639fb0";
- sha256 = "00i7jszlfh67xzvqnp137aaia68rkk4ri5v0fs32ym10pcj8l4dp";
+ rev = "5715748b3448b1b1e4856387c5486c7b56c0699b";
+ sha256 = "1jhzrlvwf02g0v4wybyry6n9dqcihv47n11m1rpmaxpg2z8551rb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath";
@@ -45745,12 +46298,12 @@
omtose-phellack-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "omtose-phellack-theme";
- version = "20160919.2240";
+ version = "20161111.1320";
src = fetchFromGitHub {
owner = "franksn";
repo = "omtose-phellack-theme";
- rev = "ae389d81e84646e1bbb283f56849ef34b449e4b8";
- sha256 = "0wn0xzvc8c5dlh53fl2naa44512w04j6xjxrw17gjs0ysvbqg4ns";
+ rev = "66f99633e199e65bd28641626435e8e59246529a";
+ sha256 = "0imf2pcf93srm473nvaksw5pw5i4caqxb6aqfbq6xww8gdbqfazy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/478b1e07ed9010408c12598640ec8d154f9eb18d/recipes/omtose-phellack-theme";
@@ -45889,12 +46442,12 @@
open-junk-file = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "open-junk-file";
- version = "20160912.1859";
+ version = "20161210.314";
src = fetchFromGitHub {
owner = "rubikitch";
repo = "open-junk-file";
- rev = "31b6a88001d66cda95eabb444df188a61bde6346";
- sha256 = "0xqpwf1sc36r465wi1d3vk18grpcb32fyyxy62xdxfvlw5nlnphp";
+ rev = "558bec7372b0fed4c4cb6074ab906535fae615bd";
+ sha256 = "0kcgkxn5v9bsbkcvpjxjqhj1w3c29bfb33bmiw32gzbfphmrvhh1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/open-junk-file";
@@ -45931,12 +46484,12 @@
opener = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "opener";
- version = "20161017.236";
+ version = "20161207.1010";
src = fetchFromGitHub {
owner = "0robustus1";
repo = "opener.el";
- rev = "ad3c65a5a748230bf07c18f56b1998ac03e3807a";
- sha256 = "178h7sbpgsn0xl93j7375f2ahmqcszmbl3f7mfb6vgjmm791q03p";
+ rev = "c384f67278046fdcd220275fdd212ab85672cbeb";
+ sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c5a448f1936f46176bc2462eb03955a0c19efb9e/recipes/opener";
@@ -46136,6 +46689,27 @@
license = lib.licenses.free;
};
}) {};
+ org-babel-eval-in-repl = callPackage ({ emacs, eval-in-repl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "org-babel-eval-in-repl";
+ version = "20161120.1243";
+ src = fetchFromGitHub {
+ owner = "diadochos";
+ repo = "org-babel-eval-in-repl";
+ rev = "1e3189e2da14c1c2a2b793c6563597c1aa7d1122";
+ sha256 = "0vf77wc1pq9dfqkrnagkxfg7klwyaichms492jsp0dh5warnw7hm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/042745d47c379778195ed798ca5e0130e4877271/recipes/org-babel-eval-in-repl";
+ sha256 = "00x4idm9a5ddng74axm4xjnw7z89qv3yav8j8rw2z1jf5cgbgah6";
+ name = "org-babel-eval-in-repl";
+ };
+ packageRequires = [ emacs eval-in-repl ];
+ meta = {
+ homepage = "https://melpa.org/#/org-babel-eval-in-repl";
+ license = lib.licenses.free;
+ };
+ }) {};
org-beautify-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-beautify-theme";
@@ -46160,12 +46734,12 @@
org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-board";
- version = "20161025.1203";
+ version = "20161120.1201";
src = fetchFromGitHub {
owner = "scallywag";
repo = "org-board";
- rev = "fcc653735faf1ab018273d7821981090f752c838";
- sha256 = "0x8mfka6m5452r5sj7m6ypvd91cqqgyxb00rx3v8y6wbpf2nsrc8";
+ rev = "cdb62dd5bf1e316d2dcc6da9661231f6c8e3be72";
+ sha256 = "0clpx15lcbjsml10z87zbbi3jwzm76f01f7ikgjj8y5xxj09nhh9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -46496,12 +47070,12 @@
org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-download";
- version = "20160907.1021";
+ version = "20161119.315";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "org-download";
- rev = "115433394221da8071dedf7e3f056e37f097a272";
- sha256 = "1y2654ihc0py9nhl8178bmqvaqwx2wydyfqydd6vsis31hahxmnd";
+ rev = "37d323034b09fe17029985aa556999acb2f9a0e5";
+ sha256 = "0g77grkhy76nlxq4fblw3biiik5mpq7r444dmvwi8fslkyshfkgs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download";
@@ -46622,12 +47196,12 @@
org-elisp-help = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-elisp-help";
- version = "20161105.719";
+ version = "20161121.1655";
src = fetchFromGitHub {
owner = "tarsius";
repo = "org-elisp-help";
- rev = "23506883074b65943987d09f1c0ecd6dc1e4a443";
- sha256 = "1wqq6phpp73qj2ra9k0whrngfaia28wc772v24dsds4dnw3zxsq0";
+ rev = "3e33ab1a2933dd7f2782ef91d667a37f12d633ab";
+ sha256 = "088pbafz1x4z7qi70cjbrvfrcdrjp4zy0yl115klbidshqhxycmj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9bf5046a4c3be8a83004d506bd258a6f7ff15/recipes/org-elisp-help";
@@ -46684,12 +47258,12 @@
org-gcal = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred }:
melpaBuild {
pname = "org-gcal";
- version = "20160805.2144";
+ version = "20161115.357";
src = fetchFromGitHub {
owner = "myuhe";
repo = "org-gcal.el";
- rev = "4a5c9eb487b3206771bac0ef2016492af628fc3a";
- sha256 = "1lhy8cjzz2bkw2g0ihvh6yxaavg4g3zrvnzlqi9p2y0lcw1w65lr";
+ rev = "5d3cfb2cfe3a9cd8b504d4712a60840d4df17fe6";
+ sha256 = "0hjiza2p7br5wkz1xas2chlzb2d15c3fvv30232z0q5ax9w428m0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1c2d5bd8d8f2616dae19b9232d9442fe423d6e5e/recipes/org-gcal";
@@ -46709,8 +47283,8 @@
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "org-gnome.el";
- rev = "1012d47886cfd30eed25b73d9f18e475e0155f88";
- sha256 = "0b57ik05iax2h3nrj96kysbk4hxmxlaabd0n6lv1xsayrlli3sj1";
+ rev = "122e14cf6f8104150a65246a9a7c10e1d7939862";
+ sha256 = "0jd5zwykc6fkkaj8qhg7wgmrjn47054x242b5s03w8ylyczqbcg3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4f7ebd2d2312954d098fe4afd07c3d02b4df475d/recipes/org-gnome";
@@ -46807,22 +47381,22 @@
license = lib.licenses.free;
};
}) {};
- org-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ org-jira = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "org-jira";
- version = "20160821.1939";
+ version = "20161209.2253";
src = fetchFromGitHub {
- owner = "baohaojun";
+ owner = "ahungry";
repo = "org-jira";
- rev = "da3c987fc078ea142632bf9f050adcac719f9a9d";
- sha256 = "0zkabdqjkazcl6y4yn5c1lrhw3qny8dm51mjf18pfcfvz8fmr13c";
+ rev = "370c05876f151e7aba9c63562d41d9b7cade30ed";
+ sha256 = "0scslv9il8i6yz2akrz88q7dig1lf2sz34c7hn2adbkl0ykj4wh6";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d83f6897d422f81eef83933c49d82fc5db1d1ae3/recipes/org-jira";
- sha256 = "11h7kbkf38p2xycw8hvabpaacp72xdgy8c7kzcgjb2a8qlbs5ifm";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
+ sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib";
name = "org-jira";
};
- packageRequires = [];
+ packageRequires = [ cl-lib request ];
meta = {
homepage = "https://melpa.org/#/org-jira";
license = lib.licenses.free;
@@ -46835,8 +47409,8 @@
src = fetchFromGitHub {
owner = "bastibe";
repo = "org-journal";
- rev = "8f3de8d1e60a9d1fcdd9c63e5dbe3d461448c75b";
- sha256 = "0p79wqvsnvx94fkjkrapsalgs4drkj0dbybkbgxf1r8zi1040mm2";
+ rev = "c5c8724ca987da77446161c0400d444ebd5bd983";
+ sha256 = "17pjhs6x2qnqrag56f7rgnraydl6nbz6y21hj981zsjy3mv899hs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
@@ -46897,8 +47471,8 @@
version = "20140107.519";
src = fetchgit {
url = "git://orgmode.org/org-mode.git";
- rev = "8dc2d7767811f7d754328da0398e49718bd797de";
- sha256 = "06xl5rrw2kx6dx604gm50jj5ccv9m9szgwa4pkk1nvigy52vsj0q";
+ rev = "901d2470ddc862b07a2cbf30d3b0e5fed997030b";
+ sha256 = "0absbqlgghp3znlq0pkw4261f3liv5hcn8ydfi66ar6rx2awp92w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -46914,11 +47488,11 @@
org-mac-link = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-mac-link";
- version = "20160808.220";
+ version = "20161126.239";
src = fetchgit {
url = "git://orgmode.org/org-mode.git";
- rev = "8dc2d7767811f7d754328da0398e49718bd797de";
- sha256 = "06xl5rrw2kx6dx604gm50jj5ccv9m9szgwa4pkk1nvigy52vsj0q";
+ rev = "901d2470ddc862b07a2cbf30d3b0e5fed997030b";
+ sha256 = "0absbqlgghp3znlq0pkw4261f3liv5hcn8ydfi66ar6rx2awp92w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -47018,12 +47592,12 @@
org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
melpaBuild {
pname = "org-page";
- version = "20160626.108";
+ version = "20161121.2129";
src = fetchFromGitHub {
owner = "kelvinh";
repo = "org-page";
- rev = "870d47a63f36f2aabe5d0d261d9b534127dedd4b";
- sha256 = "13rsv2d96hndvkllfjgip7y6477pv4hkpi3asqszkbxian4y9rjd";
+ rev = "bef1e2fbcb60e85b3d27887fb0c6c988a18a0b59";
+ sha256 = "1yhy98rg7zqj91hkabkf00mzgzk9cb5mvp5mad09gfy9ijkkm6sg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page";
@@ -47068,12 +47642,12 @@
org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }:
melpaBuild {
pname = "org-pdfview";
- version = "20161105.1652";
+ version = "20161130.1053";
src = fetchFromGitHub {
owner = "markus1189";
repo = "org-pdfview";
- rev = "8de30861216eaa2a922a2eccb6e7b1392f70a58d";
- sha256 = "1n5m3smgn3rxq9l110m3hqxip1xnyk4mjf70822ald4fv3l33q32";
+ rev = "9de96eef6f187a10cd910e3bc3eb274d38856819";
+ sha256 = "0lrcj3mcdfcdrndivhj5ds386zrsy78sfg0i8126wwwc5lfh48vq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aadf708e55ddfe13d93d124681a5e6f97a690d79/recipes/org-pdfview";
@@ -47089,12 +47663,12 @@
org-pomodoro = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-pomodoro";
- version = "20160725.349";
+ version = "20161119.226";
src = fetchFromGitHub {
owner = "lolownia";
repo = "org-pomodoro";
- rev = "a6d867865f1a033fb5a09cca6643045d7ebac49c";
- sha256 = "0r5shgikm34d66i2hblyknbblpg92lb2zc9x4bcb28xkh7m9d0xv";
+ rev = "4b1d650b8d0b607a616a8c792da428334fe635f7";
+ sha256 = "0z613daq1r4l0bfn9h8h69dcpczhnsgc653v0753jahmcj0hrqx6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e54e77c5619b56e9b488b3fe8761188b6b3b4198/recipes/org-pomodoro";
@@ -47149,22 +47723,22 @@
license = lib.licenses.free;
};
}) {};
- org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, projectile }:
+ org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "org-projectile";
- version = "20161103.2316";
+ version = "20161205.1508";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "org-projectile";
- rev = "a68ef488404f175d8b8867ad958233f927e451f1";
- sha256 = "0xvy108m4gqkzh00zgch8c163kri10rzgshbmz9kx9vgsqki2m1r";
+ rev = "e2b78ca7fbd2e3b873d3ab9bb7196be4d7613f92";
+ sha256 = "03zy2bb1ha22xpx29d8610yrqfyaiaa8vgplpx6bmixaw85mcv58";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dde8c06c968d4375926d269150a16b31c3a840e/recipes/org-projectile";
sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm";
name = "org-projectile";
};
- packageRequires = [ dash emacs pcache projectile ];
+ packageRequires = [ dash emacs projectile ];
meta = {
homepage = "https://melpa.org/#/org-projectile";
license = lib.licenses.free;
@@ -47263,12 +47837,12 @@
org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
melpaBuild {
pname = "org-ref";
- version = "20161107.323";
+ version = "20161208.1825";
src = fetchFromGitHub {
owner = "jkitchin";
repo = "org-ref";
- rev = "40b1c4322903b30b9c44906093f3ad73f7fba142";
- sha256 = "02hm36hkcsyjp28idrsfz52imjaig9qlwsamfkww0fqf9j5vp0hs";
+ rev = "f5a5e5e20e5f99d069d3fd8c89ee5b186a02f1de";
+ sha256 = "0szn5rg3xwlfgkq26fadkdsxdx2a1srshwcri9j0rlj4111c2fp4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -47399,12 +47973,12 @@
org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-tfl";
- version = "20160407.1440";
+ version = "20161120.932";
src = fetchFromGitHub {
owner = "storax";
repo = "org-tfl";
- rev = "308251618e215eb78d5436e7412a0c14216fa890";
- sha256 = "1qz1qhd7v6ynmvz7j1xscz85z6zwy9dcarwhbz020l4bk4g9zf94";
+ rev = "f0405e3ad62b90ea43489bdd6312adbd77edb9f3";
+ sha256 = "0cznw60ivaz42ass35sf9i62x7mf9in6z8kr8wc5i1mb7hafy2hk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf/recipes/org-tfl";
@@ -47483,12 +48057,12 @@
org-tracktable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-tracktable";
- version = "20160621.1127";
+ version = "20161118.529";
src = fetchFromGitHub {
owner = "tty-tourist";
repo = "org-tracktable";
- rev = "b39fc45a795446b3675dd4a7c809be7bf315901b";
- sha256 = "11q85blkrfs4db0mpgn7wqfrb3ydcw4v2ccy02ba0m5dsign4wbv";
+ rev = "8e0e60a582a034bd66d5efb72d513140b7d4d90a";
+ sha256 = "1aq7qv5jyc2x2a4iphnzmmsvak6dbi7nwdcf3m8nly8w75vrl5lj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57263d996e321f842d0741898370390146606c63/recipes/org-tracktable";
@@ -47994,12 +48568,12 @@
osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "osx-dictionary";
- version = "20160628.111";
+ version = "20161207.810";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "osx-dictionary.el";
- rev = "2701c76a641cb3ab3c33a330bf48adfb08e17061";
- sha256 = "10d6mhb541gz042q02ysdazc2vv9wh1m2a9i35akc15978dwd5yv";
+ rev = "0e5e5f1b0077a62673855889d529dd4f0cc8f665";
+ sha256 = "1zpr50q7i4wg1x7vsj69rh1b8xvk9r0591y4fvvs3a2l1llca2mq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ae4467ad646d663f0266f39a76f9764004903424/recipes/osx-dictionary";
@@ -48498,12 +49072,12 @@
ox-mediawiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ox-mediawiki";
- version = "20150923.902";
+ version = "20161115.541";
src = fetchFromGitHub {
owner = "tomalexander";
repo = "orgmode-mediawiki";
- rev = "973ebfc673dfb4beeea3d3ce648c917b58dcf879";
- sha256 = "0c2m02g6csg5fqizj3zqcm88q7w17kgvgi7swcx4fzz6rixnpsji";
+ rev = "9017740cbe5866e21d81838e540dec310cc0dec0";
+ sha256 = "00c7l8skxjkphqpviwkgl28gqsj5cm63h64ffg09gkvp42mwjshz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/24244d146306ce965df382c8958c7574c74313f2/recipes/ox-mediawiki";
@@ -48540,12 +49114,12 @@
ox-pandoc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-pandoc";
- version = "20161101.1920";
+ version = "20161125.35";
src = fetchFromGitHub {
owner = "kawabata";
repo = "ox-pandoc";
- rev = "973bb43495213e883383cf263ce173e36e09fb66";
- sha256 = "0g6jil43c8761ynhy77g0fvddw9wg9f6lzs5fr24hwj30q9vlnyz";
+ rev = "d9cf410096fb27be8eb13b2207697f8530f62abf";
+ sha256 = "0c8nfvh9vn850i3minfqvri2py48ycgz3sf5p1l0a3k98s4x4jl3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92f89a923d877c9dea9349a5c594209cb716bf18/recipes/ox-pandoc";
@@ -48603,12 +49177,12 @@
ox-reveal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-reveal";
- version = "20160719.28";
+ version = "20161027.226";
src = fetchFromGitHub {
owner = "yjwen";
repo = "org-reveal";
- rev = "6ee0e547ddf1596496e558d1b7ab78f315f980ec";
- sha256 = "0p71pvsgyri2pgvv208pp7fizqx40asy6m60si9mhlk8smdris72";
+ rev = "001567cc12d50ba07612edd1718b86a12e8c2547";
+ sha256 = "18rma8smjrskbjyna076zhvx79zs5r5vinb537h8mw13pfxd6cm8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8bb4024eef5dc4cc3674bbbed9d92f074d533f35/recipes/ox-reveal";
@@ -48834,12 +49408,12 @@
package-filter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-filter";
- version = "20140105.1426";
+ version = "20161121.2319";
src = fetchFromGitHub {
owner = "milkypostman";
repo = "package-filter";
- rev = "ba3be37e0ef3972b2d8db7c2f2cb68c460699f12";
- sha256 = "0i7f8ambcrhyqq15xwlk31jjdcii2hr37y45va8m5w6n9mkpz8c6";
+ rev = "c8e2531227c02c4c5e9d593f2cdb6a4ab4a6849b";
+ sha256 = "001h92jchz6x6pm8bj90law0yzc5xd84f703z7fcwan4k0g1iwl7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/89312eaf69f3d7ac46647255c847fcb45415e78d/recipes/package-filter";
@@ -48855,12 +49429,12 @@
package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-lint";
- version = "20161106.718";
+ version = "20161124.1615";
src = fetchFromGitHub {
owner = "purcell";
repo = "package-lint";
- rev = "46f12c815bc791b2889292d4b32eccad9e313d1d";
- sha256 = "0dvljayxc9dkrw5w0xj92859wvh0kmvq1jl8mgf7916nafxgl0pf";
+ rev = "633fbff47fd4872d55d672029300c043e13e966e";
+ sha256 = "0mr0yry397777gmvqj3z7b9zy47k3k3ghr03jyjafra4kjm85x00";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -48915,22 +49489,22 @@
license = lib.licenses.free;
};
}) {};
- package-utils = callPackage ({ async, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ package-utils = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-utils";
- version = "20160627.909";
+ version = "20161125.930";
src = fetchFromGitHub {
owner = "Silex";
repo = "package-utils";
- rev = "f655efc89ea7675b6cc9990d46a9f48ca6d384b7";
- sha256 = "1q6hpfaj8hfybxmmh1v871arlv8dn77li9vgckcal4l6xf83nvpi";
+ rev = "1ad19f3a9de68ae68e6dd2d4dad31532b4de1700";
+ sha256 = "04ckdz80paj1dz1q659cgm7hkdh828ckxlch6iq18abr1ijzl8vm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a1bb884a0299408daa716eba42cb39f79622766c/recipes/package-utils";
sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r";
name = "package-utils";
};
- packageRequires = [ async epl ];
+ packageRequires = [ async ];
meta = {
homepage = "https://melpa.org/#/package-utils";
license = lib.licenses.free;
@@ -48985,8 +49559,8 @@
src = fetchFromGitHub {
owner = "onurtemizkan";
repo = "paganini";
- rev = "506e35c9cecfae0f9ccbb7da24d48b9d082a7901";
- sha256 = "16g4crpgskhgfzw8fx2j4ibvpdf8qi7brxbp2nhwijdag12i4wwn";
+ rev = "44e3ae4c451f3b380956fea8aef8cca75279746b";
+ sha256 = "0p5sml4djwr92s36nx4hd0pjwkfws4px01g0dzip34zabkm3dx4b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d6fbb609b411df4fe6f66a7afe27eda7d297f140/recipes/paganini-theme";
@@ -49002,12 +49576,12 @@
page-break-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "page-break-lines";
- version = "20161015.1709";
+ version = "20161205.2251";
src = fetchFromGitHub {
owner = "purcell";
repo = "page-break-lines";
- rev = "65fc27e4c89eb0b37dd3a8e87c32ceba78f37f42";
- sha256 = "0lxfjryq13zg0ikbn1ydqghs57z6yxqwb5wvzkn98mf98iq6nlsp";
+ rev = "c133848345ceef91e257aab8804c61f31c31b264";
+ sha256 = "1d0b2pb2s04l7nkcn7yhrbcm927bsinyiayxn59in7p3mqlcmsnb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/22b6035987994c11d5e2564862efb1e56848c3b6/recipes/page-break-lines";
@@ -49125,12 +49699,12 @@
pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pandoc";
- version = "20160607.1010";
+ version = "20161128.357";
src = fetchFromGitHub {
owner = "zonuexe";
repo = "pandoc.el";
- rev = "5f96efe8804cf949de2896fcb3015513275b9118";
- sha256 = "1r1rzaidg3pd8q5alv76drv843hwj9yzkn5hsaf4qnqrkkqwly8y";
+ rev = "198d262d09e30448f1672338b0b5a81cf75e1eaa";
+ sha256 = "0njc6xlwa8hihyqrk0hs12sb6rs7jma2wpjfr8xsj9p8jld4y359";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c21ff09d67fad2658e0de08bc2edb7588c504a/recipes/pandoc";
@@ -49209,12 +49783,12 @@
paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }:
melpaBuild {
pname = "paradox";
- version = "20161102.1351";
+ version = "20161117.502";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "paradox";
- rev = "b693226ad827409fc1d6243a5a949d1c87c53104";
- sha256 = "050ygdhlxd7785h262vg8pdv2w0sgq36jh0wsjv9q64qmrndrklf";
+ rev = "17a6690d42a1e854ec270ed930c7494077570fc8";
+ sha256 = "1vg5i4cxgn4a8cgx43i75w3cf0d8sb6ig6xxxdj3pvpzc81i53bc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox";
@@ -49354,12 +49928,12 @@
parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "parinfer";
- version = "20161101.932";
+ version = "20161119.2133";
src = fetchFromGitHub {
owner = "DogLooksGood";
repo = "parinfer-mode";
- rev = "fb9e9f94a8010d2167a03ea6b58a320b0925af10";
- sha256 = "0zwv0r8jzb27gnv0j4n9xxylzk42sg6w6ljvdkx9nm2qgrfq3nsv";
+ rev = "9e1ce1dfb5e0958d5fbff62ed09357db14082a38";
+ sha256 = "1nq99i2piyd06yc0vsxkrfxsnj0yza3i9rdglvfaic9vnpf5riz3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
@@ -49438,12 +50012,12 @@
pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
melpaBuild {
pname = "pass";
- version = "20161014.255";
+ version = "20161111.1320";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "pass";
- rev = "beadbd50c60492248e950a7d61e22f2c3e5a2bd4";
- sha256 = "06wjq0nmxdjay0jrs5jc6j02xbqvhxbz2v529zych7llyvkbyf9r";
+ rev = "b4c3bd9130044c4e106bac5ba73a50822865e258";
+ sha256 = "0na895x91a37wmdpqp545qvjh34d0vfq4dyxji7casdrdhx3bg16";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass";
@@ -49814,12 +50388,12 @@
pcmpl-homebrew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pcmpl-homebrew";
- version = "20160725.1939";
+ version = "20161122.1843";
src = fetchFromGitHub {
owner = "hiddenlotus";
repo = "pcmpl-homebrew";
- rev = "c202e7ba1e17661b659292f5382831c9ce40939e";
- sha256 = "00mj94jmp5izh6fqnp2g35ksjcr0r7fzjf9xnhglk1yfllg668rj";
+ rev = "eaa725fd86a6ea641f78893021d23a426d62e715";
+ sha256 = "0yhy6k71sd00kxadladnkpmragpn1l7j3xl6p6385x1whh58vqph";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/pcmpl-homebrew";
@@ -49877,12 +50451,12 @@
pcre2el = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pcre2el";
- version = "20151213.234";
+ version = "20161120.1303";
src = fetchFromGitHub {
owner = "joddie";
repo = "pcre2el";
- rev = "166a10472002010692dbc35f323ffb8110a294c5";
- sha256 = "1dpfhrxbaqpgjzac3m9hclbzlnrxq9b8bx6za53aqvml72yzxc6i";
+ rev = "0b5b2a2c173aab3fd14aac6cf5e90ad3bf58fa7d";
+ sha256 = "14br6ad138qx1z822wqssswqiihxiynz1k69p6mcdisr2q8yyi1z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f04a25e467cc4c7d9a263330a7a1a53d67c6eb9b/recipes/pcre2el";
@@ -49940,12 +50514,12 @@
pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
melpaBuild {
pname = "pdf-tools";
- version = "20161026.1557";
+ version = "20161207.521";
src = fetchFromGitHub {
owner = "politza";
repo = "pdf-tools";
- rev = "9696abb82e427670b8283599365a234ddaa170b4";
- sha256 = "0jmpvwar5hks2qbqkfabqw16zj9iyl99c79h6vm2z7jypsmzc8mp";
+ rev = "3ecbbaf1606d23fb1abbefb6d359f47aaf153f84";
+ sha256 = "1jn118f3mdz7wb1a58myahj4ir29rwxbfx1595gjcxkkpw0cyw11";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools";
@@ -50107,12 +50681,12 @@
perlbrew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "perlbrew";
- version = "20130127.324";
+ version = "20161108.2309";
src = fetchFromGitHub {
owner = "kentaro";
repo = "perlbrew.el";
- rev = "30e14a606a08948fde5eafda2cbe1cd4eb83b3f3";
- sha256 = "0wg0cpqxzfgln6xdngzspsbfirn9a5jxpgk66m0fpi33215z9q26";
+ rev = "3a3406c3307c92aa30f9400d430925c434a3b6f0";
+ sha256 = "0kxz8ljc7w69ywp0bb15010sgrr13i1p05hcvhfr9c35l0n62r6p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/24bd9c2cd848f5003a244a7127e8fc5ef46bdca4/recipes/perlbrew";
@@ -50128,12 +50702,12 @@
persistent-overlays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "persistent-overlays";
- version = "20160426.1221";
+ version = "20161127.2300";
src = fetchFromGitHub {
owner = "mneilly";
repo = "Emacs-Persistent-Overlays";
- rev = "e89a04643dc4532882352888755d9d5e26c46ae4";
- sha256 = "0iw9qsqy1aszwfzfslyxz31zav4xq8pbrx0mwxqix5lvy7768ppp";
+ rev = "f563c8b966edc78c9d806661c4eb80e4781c4eab";
+ sha256 = "0csllpkpjf4csw3zfaw8k05jg078najfmjz6pz1jcl6b4sxjdfqa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d3673c87c5ca883b4f713efeae912c3ad991c667/recipes/persistent-overlays";
@@ -50191,12 +50765,12 @@
persp-fr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }:
melpaBuild {
pname = "persp-fr";
- version = "20161030.159";
+ version = "20161108.1138";
src = fetchFromGitHub {
owner = "rocher";
repo = "persp-fr";
- rev = "00db4a17977b4e9c5c3212ce94fbc106f24d9d81";
- sha256 = "0m70wawbxm0kg641qj6sdsij5d2icmmad2p977c8qpcc8qh91gs7";
+ rev = "0b2a021be802d5a39f1551c0ad1d8bceaa136afa";
+ sha256 = "1m1k6i1h7smfmn68k29bq3w301bwf76l0r8qhq5drd51nk0vp0dc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8e09213dddf003a1275eafb767431a507ecf7639/recipes/persp-fr";
@@ -50212,12 +50786,12 @@
persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "persp-mode";
- version = "20161025.507";
+ version = "20161214.243";
src = fetchFromGitHub {
owner = "Bad-ptr";
repo = "persp-mode.el";
- rev = "8200c8753513b14ebc1a8b40b917d7c0a6f5ac6a";
- sha256 = "13pcdy18pqanjhkacl5rbfmyw3y52d9ll0b6w0w4ffc2lhqpi7nd";
+ rev = "28eaf5e56e18be4bab1639ce2c31b64bd2828746";
+ sha256 = "1y4l21f81xc1bz9w0jm7vyab00k402zjlbdgki618sas9bk4rfdk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -50527,12 +51101,12 @@
phoenix-dark-pink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "phoenix-dark-pink-theme";
- version = "20150406.2002";
+ version = "20161206.1519";
src = fetchFromGitHub {
owner = "j0ni";
repo = "phoenix-dark-pink";
- rev = "314602b2e68c4054159ab3f0f6f6b658f232ada5";
- sha256 = "042yw44d5pwykl177sdh209drc5f17yzhq0mxrf7qhycbjs4h8cg";
+ rev = "024a1dae5e12d9c62c67c6ba0bc56d2f8a109c15";
+ sha256 = "1sfsf4ds6qvdj5hzzla31s1pvp5acbyxqqpncim2kvgim6sxyrac";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87e3b036fbcc96b047bbb141345a7b51f19d6951/recipes/phoenix-dark-pink-theme";
@@ -50632,12 +51206,12 @@
php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "php-mode";
- version = "20160910.1801";
+ version = "20161213.806";
src = fetchFromGitHub {
owner = "ejmr";
repo = "php-mode";
- rev = "7337424d83aa77fbb5d12ba2a54293744ab30d36";
- sha256 = "1zn9c9ja36yf22mbfsfa32zrd5mwx2kqsnf740l4qnn9gwpvi5mg";
+ rev = "cca3fe0fdbabb9f8256fef948972e5d5d823dd69";
+ sha256 = "11xdjdlvld9xnvwbaglc57n17v56p8jqd2qb6cqz3i1cvqhpfm8y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -50930,8 +51504,8 @@
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "pinyinlib.el";
- rev = "238f27746dafac576f0aa686b37dacfdd2327127";
- sha256 = "0wbdhd3wqha3ahyakdjj4ki3998l0fafi86l26gkir1bq2qpkmcs";
+ rev = "457b5ac6611d0f35ff2444e62008c798b45ae368";
+ sha256 = "0kxsam8zb1rdw82d4jpa2n9kcdk05iscymgan39izgaa0w422s0r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f4aa27985dcfaf24f1863667b89e13df4710546f/recipes/pinyinlib";
@@ -51136,12 +51710,12 @@
plantuml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "plantuml-mode";
- version = "20161018.1025";
+ version = "20161111.205";
src = fetchFromGitHub {
owner = "skuro";
repo = "plantuml-mode";
- rev = "2b7d79688608a5f328b95610edcdd871278fbd29";
- sha256 = "1pmnz01k3n4jjkl1p31lcfh8j6g3zpr78p8f2wazdlgcl14g7pjz";
+ rev = "87417ad75b215ababf153cba533575ac0273a5db";
+ sha256 = "1jrck9wybpm2p2imjn0x6g3ybasiqkfzxc1halm3rq6xvc4zvrsm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a658eb8085f2bf413c276af19c77597132cf569b/recipes/plantuml-mode";
@@ -51157,12 +51731,12 @@
platformio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "platformio-mode";
- version = "20160327.1820";
+ version = "20161210.539";
src = fetchFromGitHub {
owner = "ZachMassia";
repo = "PlatformIO-Mode";
- rev = "4b514ea9c82c95cbe8756cbbcac4638b4e2790aa";
- sha256 = "0xiss3c6inz27yf08974mm4wg9dx8rcqqj77zp4rxhyhiqxzv338";
+ rev = "1466aed132a77f48fcb31938d64abb1a1e58ec42";
+ sha256 = "1lfkp7df8as9gspynkyhz4dbm95kbngyba1ymg6ql67adyv79v1i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/platformio-mode";
@@ -51343,8 +51917,8 @@
version = "20160827.857";
src = fetchgit {
url = "git://git.savannah.gnu.org/gettext.git";
- rev = "f837369264c119d0e96c9ba6e5960deba59eee73";
- sha256 = "12mxyg47hsgzzvqv19qlq9yhhryam62k7adll1i9n39xi6as13py";
+ rev = "89b77b3e3229c3df9c67de17fdef1086422fe6cc";
+ sha256 = "1sbdk6ijak2p1wkm9cbgvvml2hx1kc7ny9p0z9zfw9lz9mrwckdi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode";
@@ -51483,12 +52057,12 @@
polymode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "polymode";
- version = "20160805.448";
+ version = "20161205.46";
src = fetchFromGitHub {
owner = "vspinu";
repo = "polymode";
- rev = "8a39ed6817298508c71f28effb0354a00f2235b4";
- sha256 = "1knms39cd97hkwi3ya6asnzri15fbskqq8zb4ly9ax8a358ryaz3";
+ rev = "ef56a732cbfe86e982d5c982c0c7bd3909c7f840";
+ sha256 = "13pj6hxz5018qyv08xh9q3bmng9qrikpnv55a3c1y8v0z68ppmkr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/polymode";
@@ -51714,12 +52288,12 @@
popup-switcher = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
melpaBuild {
pname = "popup-switcher";
- version = "20160622.1024";
+ version = "20161130.656";
src = fetchFromGitHub {
owner = "kostafey";
repo = "popup-switcher";
- rev = "a17ac13a08119f4164f25514f08556f7ce660ae4";
- sha256 = "1vymgdyzvx0d5i4da9q0x29x8d0lxi084rq68i6gi686x5nhglil";
+ rev = "86809fbd3c3c3d566043043b6577ccf8133ac855";
+ sha256 = "1r8g3wxyklkck9af1x7rg7hyj8fnf28fd34p12vv17mhnqzb4x4y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7d1897c4c4a6f4b4527279e6dad976219d7b78/recipes/popup-switcher";
@@ -51798,12 +52372,12 @@
pov-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pov-mode";
- version = "20120825.716";
+ version = "20161114.2343";
src = fetchFromGitHub {
owner = "melmothx";
repo = "pov-mode";
- rev = "e60e497f84a310814ccf97b056da77dd0f42394f";
- sha256 = "14silfng5rbdc8hnzswjmqk705pncjlk8iphjcxcm799h44pnlcr";
+ rev = "9fc1db3aab7c27155674dd1a87ec62606035d074";
+ sha256 = "1399fxivy15y2k4vp7vqqgsi8l1mzxc8aa2mf2x1hksgiyq60acp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/89d6b4a3d7a5f3cc93e9d13d4c174b5d7de7bad1/recipes/pov-mode";
@@ -51840,12 +52414,12 @@
powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "powerline";
- version = "20160702.1931";
+ version = "20161121.2320";
src = fetchFromGitHub {
owner = "milkypostman";
repo = "powerline";
- rev = "d3dcfc57a36111d8e0b037d90c6ffce85ce071b2";
- sha256 = "1hp3xp18943n0rlggz55150020ivw8gvi1vyxkr4z8xhpwq4gaar";
+ rev = "67538e4dbc2f1d2f270142481eb0b0d24e8cde36";
+ sha256 = "0jjv6wszsnrdi5l5qz4d50nj6p6zzyvqmn1j31zlhypbvi05isls";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline";
@@ -51920,10 +52494,10 @@
}) {};
pp-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "pp-plus";
- version = "20160523.1439";
+ version = "20161114.1346";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/pp+.el";
- sha256 = "0yvls8sw5rvka20xlqazl46crpkw91cy9qmj6p6y53sps1rj5wzp";
+ sha256 = "1fc2ii689f92255817cv0aiz0h83z1iyrgxmywpayiv58r8j3k4f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp+";
@@ -52395,12 +52969,12 @@
projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "projectile";
- version = "20161105.834";
+ version = "20161215.443";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "projectile";
- rev = "b573b0656f9fc4c1afa1275c3e3d9ca9badda7f6";
- sha256 = "1frirasi53apys8jhff6ywlbl8h77nd5z2z9ir3jjb9ysrsk7kmq";
+ rev = "7717fb86c1959e936f13cf2407f1ffd1c9c18e7f";
+ sha256 = "1ycz38bgdgcb57i4l52lqza3ffy9pva8lxicz6adk8vfx2bl85rc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -52455,6 +53029,27 @@
license = lib.licenses.free;
};
}) {};
+ projectile-git-autofetch = callPackage ({ alert, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+ melpaBuild {
+ pname = "projectile-git-autofetch";
+ version = "20161109.1429";
+ src = fetchFromGitHub {
+ owner = "andrmuel";
+ repo = "projectile-git-autofetch";
+ rev = "3d4eae6493607b9a0461c5161d195659c268184b";
+ sha256 = "1db4jq4vn9mk8c9ma7yma7q00hwhwba25w2hy8jyagyb83lk2zgj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7fdfdeb69fd78fc1bb2c62392f860a8c434f1762/recipes/projectile-git-autofetch";
+ sha256 = "0m0raddsw5yvjrw2v6bdaswffmva8y9hxksdgf9axpvrd3rzlk9n";
+ name = "projectile-git-autofetch";
+ };
+ packageRequires = [ alert projectile ];
+ meta = {
+ homepage = "https://melpa.org/#/projectile-git-autofetch";
+ license = lib.licenses.free;
+ };
+ }) {};
projectile-hanami = callPackage ({ emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild, projectile, rake }:
melpaBuild {
pname = "projectile-hanami";
@@ -52479,12 +53074,12 @@
projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
melpaBuild {
pname = "projectile-rails";
- version = "20161024.1043";
+ version = "20161130.1025";
src = fetchFromGitHub {
owner = "asok";
repo = "projectile-rails";
- rev = "168ab64262d5927520a838bb659ab38b4f001eee";
- sha256 = "1lkzl5svc2xff3ln2bcj9jxrvn8l00yyvd8nwjsad7ns44lfw5g2";
+ rev = "fe0cb5597d9e87ceebfadd1815beadfc04a194f1";
+ sha256 = "0yg7xbv0mnrcc6kgh8ci6pxzfjiq1qkrw6hx2zs5m4ryfrrfclz2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -52497,6 +53092,27 @@
license = lib.licenses.free;
};
}) {};
+ projectile-ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, ripgrep }:
+ melpaBuild {
+ pname = "projectile-ripgrep";
+ version = "20161119.59";
+ src = fetchFromGitHub {
+ owner = "nlamirault";
+ repo = "ripgrep.el";
+ rev = "ddb7dcadf8980b9f458343aa853e4b6c3febaee0";
+ sha256 = "0ln81fgvp8sk7f01icrjz8nyicd71kp7fg2rsh9hxjr948jx5ncd";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep";
+ sha256 = "1iczizyayql40wcljvpc1mvfvn9r28b1dkrkcmdxif732gd01jjg";
+ name = "projectile-ripgrep";
+ };
+ packageRequires = [ projectile ripgrep ];
+ meta = {
+ homepage = "https://melpa.org/#/projectile-ripgrep";
+ license = lib.licenses.free;
+ };
+ }) {};
projectile-sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, sift }:
melpaBuild {
pname = "projectile-sift";
@@ -52542,12 +53158,12 @@
projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "projectile-variable";
- version = "20160910.1005";
+ version = "20161109.625";
src = fetchFromGitHub {
owner = "zonuexe";
repo = "projectile-variable";
- rev = "810394eabf330325a86ec6f60c69e160eb837ac3";
- sha256 = "183azck3bi4qwpprcc07kvwm3piwqgql7ryy1czvmw3kbdmk1rpj";
+ rev = "dedd0f1669d9498d59231912c4ee80a1080ac93b";
+ sha256 = "1wmwy5iamc2g5grhshss0cmxjspz83kl8iclkv42c4vc1l1nsgfw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ff603b43235f546cd47f72e675aee88d5f41e855/recipes/projectile-variable";
@@ -52735,8 +53351,8 @@
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
- rev = "0d7199edc802299bdba39400c04f119c7db82667";
- sha256 = "11jvsdkbxlpdvli557d3rydn8hiyvrpxa0cc4k02yi2pf2hmqkdb";
+ rev = "83d681ee2caef1feb009656417830f846382d8ba";
+ sha256 = "12a94bxkg18mfv9a4pkqzyjiinm1b9wflbk9ib3ialmdadrmjdda";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -52749,22 +53365,22 @@
license = lib.licenses.free;
};
}) {};
- psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "psc-ide";
- version = "20161012.143";
+ version = "20161212.1626";
src = fetchFromGitHub {
owner = "epost";
repo = "psc-ide-emacs";
- rev = "756bead9d5153a6ed47e4f86f42be0c49c95cace";
- sha256 = "0mkvnhyl5lxbzjks8769pgzzafhi9z1sr768c67zmgbzz6fl0rmi";
+ rev = "30ec730fdf887579df7bed9f43b2fc25be2c9307";
+ sha256 = "1znprm47539g5jbygqr9ln1m7y37vgx46rhax13fm4cxgsm657vc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide";
sha256 = "1f8bphrbksz7si9flyhz54brb7w1lcz19pmn92hjwx7kd4nl18i9";
name = "psc-ide";
};
- packageRequires = [ cl-lib company dash dash-functional s ];
+ packageRequires = [ cl-lib company dash dash-functional emacs s ];
meta = {
homepage = "https://melpa.org/#/psc-ide";
license = lib.licenses.free;
@@ -52794,12 +53410,12 @@
psession = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "psession";
- version = "20160514.2359";
+ version = "20161119.2248";
src = fetchFromGitHub {
owner = "thierryvolpiatto";
repo = "psession";
- rev = "324c68a1f809f6c2a37c9e4753dd00796236ec56";
- sha256 = "1fpcb4qpd11mbv733iklnbjg7g4ka05mf5wpa2k6kr3fbvndkx37";
+ rev = "33f9020e87732e14473c5fc4d986e572fd95c5f3";
+ sha256 = "0ag57g4w44w90gh09w774jmwplpqn7h1lni1kwldwi7b7n3mhli7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession";
@@ -52878,12 +53494,12 @@
pug-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pug-mode";
- version = "20160915.252";
+ version = "20161208.2016";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-pug-mode";
- rev = "bff32a818ccc9e400210b942bd5e67fa21551148";
- sha256 = "1ad5n8v40acj17qficbzrnixbmg5wplmbd8h1z9hdxhbrkwy5323";
+ rev = "e8099627829aef2d382d9a5df4a24881086879dd";
+ sha256 = "1w9lb3r92l0rcflkivd0k9gz2gy33xpmyxd1ikjbsr2mf7h0r1i7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode";
@@ -52962,12 +53578,12 @@
puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "puppet-mode";
- version = "20161020.309";
+ version = "20161204.713";
src = fetchFromGitHub {
owner = "voxpupuli";
repo = "puppet-mode";
- rev = "efb67ed6e1c528d4fd76d7eb7e9cff2e0b819383";
- sha256 = "0r0j8fzpmd33jskyz577ry6w0ld0dbpwpwfkp3z97akjl97kgzp6";
+ rev = "bfa9512bcaa91cc2068d280d646d7a794da82905";
+ sha256 = "09jfb9xldpcg7z9hh7yka1pcrm008h6sx209lhnwmg2qn5dj4rsb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
@@ -53399,15 +54015,36 @@
license = lib.licenses.free;
};
}) {};
+ pygen = callPackage ({ dash, elpy, fetchFromGitHub, fetchurl, lib, melpaBuild, python-mode }:
+ melpaBuild {
+ pname = "pygen";
+ version = "20161120.2106";
+ src = fetchFromGitHub {
+ owner = "JackCrawley";
+ repo = "pygen";
+ rev = "3a5d1d1a0640865b15be05cd1eeb33bb4793b622";
+ sha256 = "0fzpvdwb7hhmfmjxzvap8413bc81lrx8r3ij3yasqaxyqw3a6vy1";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e761724e52de6fa4d92950751953645dd439d340/recipes/pygen";
+ sha256 = "1ivg7a1ghg0bvz3idz7dzy5yb0ln3b2j7dfizg2g0fi4iwvc4czz";
+ name = "pygen";
+ };
+ packageRequires = [ dash elpy python-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/pygen";
+ license = lib.licenses.free;
+ };
+ }) {};
pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "pyimport";
- version = "20160705.1444";
+ version = "20161209.557";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "pyimport";
- rev = "f5e56b683eed07bfbcc2fe7256b59a8e8c09a492";
- sha256 = "08b0bmky35wfzy2ax7llvw19clkh5gb5if5k46s1js5a193l2qd1";
+ rev = "c0c12b64a189f99d3b1477d2dea35528a856c860";
+ sha256 = "1kn38j9fgn0ja2xhvj69jdw5h6j5dqnnqk0zzd6ypk5zbwhxncp6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport";
@@ -53448,8 +54085,8 @@
src = fetchFromGitHub {
owner = "PyCQA";
repo = "pylint";
- rev = "21ecaa744484218be5c89c7108771465425542bc";
- sha256 = "1l41hyc17vlpfdnjp2bvkirfk12paabs1qwvc03x29ibylw86a23";
+ rev = "ea4273cdff22cb5c0bc5fd8a408cd03b454c43bf";
+ sha256 = "18kb7ia9wm9j3iyfhklvb56x0kw1zawa5q80z3vmmfx381v33wj6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -53591,12 +54228,12 @@
python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "python-mode";
- version = "20161105.1431";
+ version = "20161124.930";
src = fetchFromGitLab {
owner = "python-mode-devs";
repo = "python-mode";
- rev = "fdd052ab2d70e0acf2dcb25a5a94cf52f4c4123d";
- sha256 = "1pdva6a7jdi8aw1q2k32n0kagkldjh8fkapjdmn65rs362nqj7iq";
+ rev = "d30c9033fde2f4ce03b4f4792792a9603cd26bab";
+ sha256 = "1bgzkbhl00cc60y0d34cx7i6y560wf9jx9fb3d4wz06vh3322mb4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -53612,12 +54249,12 @@
python-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "python-test";
- version = "20161020.1139";
+ version = "20161107.1048";
src = fetchFromGitHub {
owner = "emacs-pe";
repo = "python-test.el";
- rev = "6f1881dc2a79873713fdd854e1af8157035a4278";
- sha256 = "1zf3k6g6jddah9dfxv0vv388xfrw1pp785zk80gyczxx1912s7f5";
+ rev = "f1d24e53c2a9a77812aa10f8cc6d5a5b49b57615";
+ sha256 = "0al1s7fh2l0vhcsz261aaxsn3xkrp451zynym11ifhppf1wwlp04";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0ea68b3aa9c057e81a3e90a359a38ac16cb26c2f/recipes/python-test";
@@ -53801,12 +54438,12 @@
quelpa-use-package = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, quelpa, use-package }:
melpaBuild {
pname = "quelpa-use-package";
- version = "20150805.328";
+ version = "20161212.1038";
src = fetchFromGitHub {
owner = "quelpa";
repo = "quelpa-use-package";
- rev = "d18b55508ceaeb894f5db3d775f5c1b27e4be81b";
- sha256 = "00wnvyw2daiwwd1jyq1ag5jsws8k8jxs3lsj73dagbvqnlywmkm6";
+ rev = "f276555d6bead02a0d869149f03a545d4d4265ad";
+ sha256 = "0cmpfjkwx5mpiyssyglfnrfkfg7c4qr01b598z50vc1lyg6198i1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b581e411ef5ea3954acc2cd997c87b3b86777333/recipes/quelpa-use-package";
@@ -53948,12 +54585,12 @@
racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }:
melpaBuild {
pname = "racer";
- version = "20161105.1637";
+ version = "20161209.1533";
src = fetchFromGitHub {
owner = "racer-rust";
repo = "emacs-racer";
- rev = "4d5c6332d24ba302913606fde3feda6abaef2ea9";
- sha256 = "1qnkb9z23diyvkkhl2q00yvb8sybpvphlfchdyzsrhylixnkq83n";
+ rev = "485b827cfaca5e4e204e5529912d7999bc29bde7";
+ sha256 = "0xjv8pi8rc0dbmllkv8gchp05j1k20pgqdi97h7s0xwjkwcpbqym";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer";
@@ -54053,12 +54690,12 @@
railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "railscasts-reloaded-theme";
- version = "20161104.550";
+ version = "20161115.2210";
src = fetchFromGitHub {
owner = "thegeorgeous";
repo = "railscasts-reloaded-theme";
- rev = "b33640716d0d9930b09e671d2c62c5839fbce210";
- sha256 = "17n1fd9hjqalxffhjfzr08psarcc7ahsi0ns6clx9mwaq3fycg5g";
+ rev = "cce0e4ae6527e84e2ae3deb8b3c7770dda225853";
+ sha256 = "1li86qpbjg8sm9q4sl8cffc0fni6mwx8180x8zlmsxdnhqic5nvd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme";
@@ -54158,12 +54795,12 @@
rake = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rake";
- version = "20160830.245";
+ version = "20161114.605";
src = fetchFromGitHub {
owner = "asok";
repo = "rake";
- rev = "14ff370e867302d7f55d7cc02dd42ac82179af6a";
- sha256 = "0mk5zsm081sdz06mf1jvvbvhsqbl11jh17csyg5wqjyx6vs0bzla";
+ rev = "e680f1a8f2591af7c80cad188340601b101b5ddc";
+ sha256 = "1dk2clsnmjy3bfv6laxf8sslvdajjbwpk83ss8v9xm55dcxjvd7n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bf0f84698dda02a5b84a244ee29a23a6faa9de68/recipes/rake";
@@ -54179,12 +54816,12 @@
rally-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }:
melpaBuild {
pname = "rally-mode";
- version = "20160326.902";
+ version = "20161113.1954";
src = fetchFromGitHub {
owner = "seanleblanc";
repo = "rally-mode";
- rev = "722b9a8e6d8a6aee5c4c4b16be0194f7bb4bfa5b";
- sha256 = "13pkp80cv1v3pjff1588cgyx18a31i668lwywll5dk4fxl4zdjvb";
+ rev = "0f5e09a6abe2de7613f174b4f54863df93343134";
+ sha256 = "1vrsv8ph1v853ii0i3q889xlwxnjdqz4bs3ipi502rjx6g7y5gdz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0914825c6d5ad26d2a8035fc33ad98df42df3c53/recipes/rally-mode";
@@ -54326,12 +54963,12 @@
rbt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rbt";
- version = "20160129.1051";
+ version = "20161109.1506";
src = fetchFromGitHub {
owner = "joeheyming";
repo = "rbt.el";
- rev = "865c619f200afe877c56a44046f706361b676d0e";
- sha256 = "0q5giixk6pv82cf34a0mxmnzh2gdiyq6dzv4ypkkdpz6wsm2ffhx";
+ rev = "402d7465f68706d051e8117b6f00ecdc18134f15";
+ sha256 = "12kqw7cxv54agy7k8y550cixnv4zjpy8rhamwp36bf6nqch4ly2j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7241985be1e8a26a454b8136a537040b7ae801/recipes/rbt";
@@ -54641,12 +55278,12 @@
realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
melpaBuild {
pname = "realgud";
- version = "20160829.1821";
+ version = "20161209.1829";
src = fetchFromGitHub {
owner = "rocky";
repo = "emacs-dbgr";
- rev = "4246e34d7a6f668f5d9d403de054ef68e6d89548";
- sha256 = "0rnqs09q30rshp3lyslwh3rxgn7ay370y9ain1bhf2p2ww9j3m5i";
+ rev = "7689f4910ce081dcecdcc8a7c534af037c65295e";
+ sha256 = "1aq8r2yqwspil9l4jxprkknnj2cl9x9srx4qd8fw07ad7razcf99";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
@@ -54772,10 +55409,10 @@
}) {};
recentf-ext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "recentf-ext";
- version = "20130130.1350";
+ version = "20161210.840";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/recentf-ext.el";
- sha256 = "15kwkphrlxq6nbmqm95sxv4rykl1d35sjm59ncy07ncqm706h33l";
+ sha256 = "0pzimhqkrdg2s9zw7ysir740cmaycf6fjs08bmlfjads7vdbjfpg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5a36ac5e0fc3599d50d7926cacf16b7a315f0e76/recipes/recentf-ext";
@@ -54960,8 +55597,8 @@
src = fetchFromGitHub {
owner = "RedPRL";
repo = "sml-redprl";
- rev = "bd962668615abcc48b4797168e948dde62b3f197";
- sha256 = "1xz82h933dxl2bj90l24h50qji4h1ivmnf657yp89dbyc42fz7zf";
+ rev = "1a1df16146118d3e4cdfa1730eb7616550b2c4a4";
+ sha256 = "1qvbi0iwbvkyc1wq5kv5jh1lkvmmq56bh53ww921z3fhsvrgkqmj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -55039,12 +55676,12 @@
refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
melpaBuild {
pname = "refine";
- version = "20161104.804";
+ version = "20161205.549";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "refine";
- rev = "a83ddbf79abb65f5cfc98d9b19815727e2395b91";
- sha256 = "1kciixx40pdd9vlzd54hxy43adk9bhcga23m2lim5q2fdj9qbyir";
+ rev = "3609642fc83f344783e7c8229edb529264ca1eea";
+ sha256 = "01qc7qsyhcm3i0ix4zhzwiq770mf2z0831gz1ybjaa6f5lwqslx5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine";
@@ -55120,6 +55757,27 @@
license = lib.licenses.free;
};
}) {};
+ region-convert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "region-convert";
+ version = "20161118.1859";
+ src = fetchFromGitHub {
+ owner = "zonuexe";
+ repo = "right-click-context";
+ rev = "10578576f6cb2945aed00fdcd585fc65cd2c5c31";
+ sha256 = "07bhw6ll2ad5725rq6jlvp2v8aqhlrbsywjng5ypmcvds5dhgbsk";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ddcf4612cccb9a53425c5f0324206d70549d9d9e/recipes/region-convert";
+ sha256 = "0daghvxc6gxgric1aa1gw036gbpbzilqz72gr1inqy92hz7xrxfm";
+ name = "region-convert";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/region-convert";
+ license = lib.licenses.free;
+ };
+ }) {};
region-state = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "region-state";
@@ -55206,12 +55864,12 @@
relative-line-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "relative-line-numbers";
- version = "20151006.1446";
+ version = "20161112.2151";
src = fetchFromGitHub {
owner = "Fanael";
repo = "relative-line-numbers";
- rev = "64157db08b0c2f5fada3209fc8d3e4b4c7429978";
- sha256 = "1r8fhs7d2vkrbv15ic2bm79i9a8swbc38vk566vnxkhl3rfd5a0a";
+ rev = "38b5f9065aec008d9ad94fe5597338463aa1aa63";
+ sha256 = "00ixh7siyc8m7j6hfaxnnl3ynfhzkccpjfc89v8bp3z83m4v269w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2901c841d221bd782dae9059a070ae8130e1ae/recipes/relative-line-numbers";
@@ -55290,12 +55948,12 @@
repl-toggle = callPackage ({ fetchFromGitHub, fetchurl, fullframe, lib, melpaBuild }:
melpaBuild {
pname = "repl-toggle";
- version = "20160119.421";
+ version = "20161203.414";
src = fetchFromGitHub {
owner = "tomterl";
repo = "repl-toggle";
- rev = "0249c2a72e6bf782c2c15b0cb1d925410543184f";
- sha256 = "12wylmyz54n1f3kaw9clhvs66dg43xvcvll4pl5ii0ibfv6pls1b";
+ rev = "50044030969d68e9f78a6db4e0a9229f5f3eaec3";
+ sha256 = "0gi4pdfgyhl2lss5p71p0jxifni6zl0fv7n4cj42hbalgfyxfv79";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/da4be8c67584ea0ae35c7c9ee33334db5061a538/recipes/repl-toggle";
@@ -55311,12 +55969,12 @@
replace-from-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "replace-from-region";
- version = "20150406.1729";
+ version = "20161203.1306";
src = fetchFromGitHub {
owner = "rubikitch";
repo = "replace-from-region";
- rev = "cff9fdf4ca351f8c5848e3516ccd76cc9be6ffa8";
- sha256 = "0w9ry16crcgc6aiq0xwzf7b301kkw6i44jc0dhfj621bhgmf30aj";
+ rev = "959ab7b2e2f19f3b559fd1228597530ce0694d7c";
+ sha256 = "0xmslc7r0lsi7566ajrr9sqvzmfp7qjgfg13pf6n63rb3rsk72ny";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/replace-from-region";
@@ -55352,10 +56010,10 @@
}) {};
replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "replace-plus";
- version = "20160508.843";
+ version = "20161209.738";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/replace+.el";
- sha256 = "1a59nqrs62xzdpi7as00byf3jamr1zsz8jmf0w4mqag4bp79cd40";
+ sha256 = "1898bwn0slhvkqcriwipa8d25554npj9b1hkz7rxz1pw7s8hgmck";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/replace+";
@@ -55434,12 +56092,12 @@
request = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "request";
- version = "20160822.1659";
+ version = "20161121.600";
src = fetchFromGitHub {
owner = "tkf";
repo = "emacs-request";
- rev = "12450136785fe6ff8df940f9c0601406a9fd8bc9";
- sha256 = "0kpb2fhj617kh7xzcls7i911pj61bmjfb7hr0vc1a2pgwpgrpd4y";
+ rev = "4f5dd0aa8b788fe825461dbcccfd5a3fb2750f9b";
+ sha256 = "1d3xz5hgb1cpaf1ijk05l1ffr99i621wa0192qiipc6fxxy0gpl6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request";
@@ -55459,8 +56117,8 @@
src = fetchFromGitHub {
owner = "tkf";
repo = "emacs-request";
- rev = "12450136785fe6ff8df940f9c0601406a9fd8bc9";
- sha256 = "0kpb2fhj617kh7xzcls7i911pj61bmjfb7hr0vc1a2pgwpgrpd4y";
+ rev = "4f5dd0aa8b788fe825461dbcccfd5a3fb2750f9b";
+ sha256 = "1d3xz5hgb1cpaf1ijk05l1ffr99i621wa0192qiipc6fxxy0gpl6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred";
@@ -55539,12 +56197,12 @@
restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "restart-emacs";
- version = "20160530.622";
+ version = "20161108.2239";
src = fetchFromGitHub {
owner = "iqbalansari";
repo = "restart-emacs";
- rev = "0dc6d689cd7fa080fe7c19431863bf7186f910e9";
- sha256 = "082izk2wmsdspyizfbvqw34rigvbfwq2963zf4iqlniqv05p88pd";
+ rev = "dc28874f47fe47e6891803fd3a483f9577b65ee9";
+ sha256 = "029y18bzk9ld2ig9666idsrig1wmnswavcj8rilxw5f8wkrh38wg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs";
@@ -55890,12 +56548,12 @@
ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ripgrep";
- version = "20161008.51";
+ version = "20161116.211";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "ripgrep.el";
- rev = "47f4451c497588de4a198f271f4121572e7db1af";
- sha256 = "0nrn60nr30a0dqvd1aiwm9mwlkcn21qz62ziq25n5ixjy1hv8p5j";
+ rev = "ddb7dcadf8980b9f458343aa853e4b6c3febaee0";
+ sha256 = "0ln81fgvp8sk7f01icrjz8nyicd71kp7fg2rsh9hxjr948jx5ncd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep";
@@ -55932,12 +56590,12 @@
rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "rjsx-mode";
- version = "20161105.833";
+ version = "20161115.456";
src = fetchFromGitHub {
owner = "felipeochoa";
repo = "rjsx-mode";
- rev = "66086b6557fcafacf9bfdd80140e7dde4daac266";
- sha256 = "1y9inxk3kr8cygi8rnj4dns7azq1ka1yvvj7wsm6hnmm1i3wk3lx";
+ rev = "20c7bd0e704dfc1c391edf78765c8b0ec4f5b3c0";
+ sha256 = "142zihjqgdq4bfy1hp0pz6k109ngii4kyc8xrdvd9yvzc0y5vp8a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -56142,12 +56800,12 @@
rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
melpaBuild {
pname = "rspec-mode";
- version = "20160715.509";
+ version = "20161129.1525";
src = fetchFromGitHub {
owner = "pezra";
repo = "rspec-mode";
- rev = "9e254cef81dc5533739efab2d81a575df0334629";
- sha256 = "1wcdq3hyb0q7l6nj6qbaf32m3mhfiph4kdd6frxf0fb93b8rpciz";
+ rev = "8e05e95548da58c63d8b805d4516eb892621f8e3";
+ sha256 = "1n93vjzjmbs7yna74rpn57ckps903fdam2ljh6jm5a9ivsxnc2mn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode";
@@ -56163,12 +56821,12 @@
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rtags";
- version = "20161028.1136";
+ version = "20161214.1014";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "129cc5dece4a22fb0d786d1309bcba523252e744";
- sha256 = "0xwiqcv1xgv9ma2k8zjv2v10h4sm2m5xng7k3g9n5fafrd7j0lwp";
+ rev = "66e1d804e53ccbc5bcdcd9d67c77566a08de4b4f";
+ sha256 = "1761658vaav6x6b7j2izbprjm3rs3b8jvqkanwjcmhhhfp4ymwxw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -56226,11 +56884,11 @@
ruby-additional = callPackage ({ emacs, fetchsvn, fetchurl, lib, melpaBuild, ruby-mode ? null }:
melpaBuild {
pname = "ruby-additional";
- version = "20160911.333";
+ version = "20161115.2259";
src = fetchsvn {
url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
- rev = "56665";
- sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8";
+ rev = "57085";
+ sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/17cc8e84dd68f280c23f77510f58f21e7e7cbaae/recipes/ruby-additional";
@@ -56309,8 +56967,8 @@
version = "20150424.752";
src = fetchsvn {
url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
- rev = "56665";
- sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8";
+ rev = "57085";
+ sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d67431327845171f0e50d28e9276cbabecf6cb0/recipes/ruby-electric";
@@ -56729,8 +57387,8 @@
src = fetchFromGitHub {
owner = "adamrt";
repo = "sane-term";
- rev = "034033141b2eb467e2d0b79c8ce1da1f8ff2f013";
- sha256 = "0nhs916h52hxbp479ma01p6i0zfap26n4fvyx83822pisbcd3krb";
+ rev = "ef6fd08078f49f2bb3be60855d2d002bb6a5e0d2";
+ sha256 = "0aazzq1yqn5mal75hxa6ifx2hnyv0lh800klqvzn26xd7i8xcfrd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5df85d24ee7ed41aab983626df72641bb04dadd5/recipes/sane-term";
@@ -56872,12 +57530,12 @@
sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sbt-mode";
- version = "20161026.350";
+ version = "20161202.227";
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-sbt-mode";
- rev = "dbca1e2ae1b91ccb2bd10c4231fd01b47c0c6801";
- sha256 = "1216lmx6rwm61kcv7mfp6k1vgln4bbibx77swxr66d0a2qil8rv1";
+ rev = "035af95164f7bce342d4663aa7da00852dfec500";
+ sha256 = "06j16hgvzbbp9d4bvn3fdsmw3isaw017dydjyiqmjpfzbaxg9yac";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
@@ -56897,8 +57555,8 @@
src = fetchFromGitHub {
owner = "openscad";
repo = "openscad";
- rev = "54dd1b77ac33ade3efe7aa8c78f9915d850f12c3";
- sha256 = "12m86z76a157sfg3y4grizxii0747w3wxv1szlfnghqdkgc1qx69";
+ rev = "51923888a39137f2c46bf3a650fef66206e81b2c";
+ sha256 = "18vf195fd2p8wiw4qag1pq1vrv6ria8j76lgzf3ghkqj0s7bd5rb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -56935,12 +57593,12 @@
scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "scala-mode";
- version = "20160902.525";
+ version = "20161122.2325";
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-scala-mode";
- rev = "387e93c70a3703e55f717d3285912ad12cfee947";
- sha256 = "0xwwarla3m9cr1mpnlhsknfvxw1xyf85cxjkzg42q12k7i0yad5w";
+ rev = "4b492b9fa5f97521426f50c8dcfb6c0a251840ea";
+ sha256 = "01d907ph36yzfxgchqvk102ld1mvlb84sjxhmmq5xrzj4zbb0khm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@@ -57019,11 +57677,11 @@
schrute = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "schrute";
- version = "20161024.54";
+ version = "20161124.1227";
src = fetchgit {
url = "https://bitbucket.org/shackra/dwight-k.-schrute";
- rev = "1bfcd4a24ac833448355facc82255344d61d8fa2";
- sha256 = "157jkf810dd954l5zv49w8ajwkfjwqx0mwga0s4jdrq2ial797f4";
+ rev = "08ab6565fa94f3a8016163fe6f7be1932af1156b";
+ sha256 = "0l1k6wjjr569lk5k8ydwq13041kn889g20qbzf79qj1ws96rim4m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/505fc4d26049d4e2973a54b24117ccaf4f2fb7e7/recipes/schrute";
@@ -57369,6 +58027,27 @@
license = lib.licenses.free;
};
}) {};
+ sdlang-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "sdlang-mode";
+ version = "20161130.2311";
+ src = fetchFromGitHub {
+ owner = "CyberShadow";
+ repo = "sdlang-mode";
+ rev = "d42a6eedefeb44919fbacf58d302b6df18f05bbc";
+ sha256 = "0r6sm7b15scmjcpdcqvm55hdsvyw5d2g7mrfhsx2hs8sqz64gkwc";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/691af79137015f15a3d383439e534e255ba4b36d/recipes/sdlang-mode";
+ sha256 = "1z6n374z55dr2c6xdwgvmpznd5gk9y23k136zmy29b68j2kswj6l";
+ name = "sdlang-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/sdlang-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
search-web = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "search-web";
@@ -57434,10 +58113,10 @@
}) {};
second-sel = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "second-sel";
- version = "20160918.1024";
+ version = "20161210.820";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/second-sel.el";
- sha256 = "0kc3fmg92blqbx85ykxrd4n0rcjfjhxxig4xjw3ah3cpp39zcsxx";
+ sha256 = "0c9j1lbharzyvhvb6whcymra76y0nyqfnaw1s5qzd3xdq5c9sf7c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/second-sel";
@@ -57519,8 +58198,8 @@
src = fetchFromGitHub {
owner = "kiyoka";
repo = "sekka";
- rev = "2768b2c16dd15dcd35fcfd123c4d56f2ffd1b362";
- sha256 = "1as3llcs7jgcw9pafz4mbfml1cqd1fw8yl64bb4467nmhq2p18p7";
+ rev = "8f256be87564653aeef702b3c09f235f0bcb6ae8";
+ sha256 = "031aiypx1n8hq613zq4j6gh61ajzja2j60df9mwy50a0qma34awr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
@@ -57578,12 +58257,12 @@
selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "selectric-mode";
- version = "20160824.1522";
+ version = "20161125.429";
src = fetchFromGitHub {
owner = "rbanffy";
repo = "selectric-mode";
- rev = "dcbfc60658ab698e7c43baa5871af7aff2e35823";
- sha256 = "1fd3liqdhd0dw1kkgjz3qvajnlr8k60gbcgfzy3s858q2x6ranfl";
+ rev = "a8e8c8899c749bd36bdd161e161cdc51301defc6";
+ sha256 = "1dj8vccdk1s0ynl5znpg02xp182srn3s8cqcxqrxjllp7wbgab31";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08922071b9854142eab726302e75f1db2d326ec5/recipes/selectric-mode";
@@ -57702,12 +58381,12 @@
seoul256-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "seoul256-theme";
- version = "20161025.2120";
+ version = "20161121.1247";
src = fetchFromGitHub {
owner = "anandpiyer";
repo = "seoul256-emacs";
- rev = "2ae4dcbbc62a3befe63d6294b0132cf28076bf80";
- sha256 = "1cchzy8vclwi8fcic54i6hqklwd57l6j6604lii8a4gcr4mhixdx";
+ rev = "4ec545214b137bd0062d53108b8a523250bda875";
+ sha256 = "0hwvsxq7cba2bqanjmlln8cx63nhsq3rlg9p12lwbqrfppmlfj18";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/664fc68d7b0eb92940fc188f5b9bee7ac7e0c674/recipes/seoul256-theme";
@@ -57826,12 +58505,12 @@
seti-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "seti-theme";
- version = "20161028.816";
+ version = "20161208.836";
src = fetchFromGitHub {
owner = "caisah";
repo = "seti-theme";
- rev = "8d9031db5cf357b4ce920dd77ad9aeb97e037ad8";
- sha256 = "18c8k0g30392ly7nlzfz2pzgszmxi7cyrxmxcff9qvzpxxpl9q4h";
+ rev = "cbfef2fc15d19ce4c8326e65fafdd61737077132";
+ sha256 = "191mvz6d6j764q1sj2496i6lq0q42b5qh5zfdvf0yl39pzbwx8jx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/088924b78575359996cf30745497b287cfb11f37/recipes/seti-theme";
@@ -58072,12 +58751,12 @@
shell-pop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shell-pop";
- version = "20160611.540";
+ version = "20161127.623";
src = fetchFromGitHub {
owner = "kyagi";
repo = "shell-pop-el";
- rev = "38e702f6980f4ac9d8a836cb8b7fe3b406aa52bd";
- sha256 = "02ga9h8s5lh1z6nqgi4d6icsdc1z46hk713vzfr3q1sdir1nbf58";
+ rev = "788250f22a4e652407eef117f19d6f4b56d7f919";
+ sha256 = "0dd4hxbw6q9fazdjqdlfvv2g7fggmfhfmmy9ncipy4v8yd2d74pn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/44150bddc9b276ab9fb2ab6a92a11383a3ed03b0/recipes/shell-pop";
@@ -58198,12 +58877,12 @@
shen-elisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shen-elisp";
- version = "20161030.1115";
+ version = "20161113.1611";
src = fetchFromGitHub {
owner = "deech";
repo = "shen-elisp";
- rev = "e7c3da5d817c90588ebc276bd8defa9d497baf69";
- sha256 = "00isccj80g0qdjd15bl2dnlxqvmz2p3nih6v9ljx3vs2jb43pibx";
+ rev = "1828dbd81ced737a7b0bc6e3c8caf9380d5f8fdd";
+ sha256 = "1paf9lyk552kl3lmfsfw9r45ab9s8iypvg20jwdw6y6p1fjcykmk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ed9f0577c6828236582df1781e751b8b81746492/recipes/shen-elisp";
@@ -58223,8 +58902,8 @@
src = fetchFromGitHub {
owner = "alezost";
repo = "shift-number.el";
- rev = "e59840cb7fb142b21e8b1e30b95dc3b4688dca65";
- sha256 = "0dlwcifw5mlski0mbvqqgmpb0jgf5i67x04s8yab1sq9rr07is57";
+ rev = "4ea4c2a2ece26e208980e6d2f0939271bca751aa";
+ sha256 = "1fqrsr4j2axmxnvznz9zyy8giywnia23i6a8xi1f8lx924xg3cr6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b06be6b25078ddfabc1ef1145c817552f679c41c/recipes/shift-number";
@@ -58265,8 +58944,8 @@
src = fetchFromGitHub {
owner = "chrisdone";
repo = "structured-haskell-mode";
- rev = "dde5104ee28e1c63ca9fbc37c969f8e319b4b903";
- sha256 = "0g5qpnxzr9qmgzvsld5mg94rb28xb8kd1a02q045r6zlmv1zx7lp";
+ rev = "39b1070cf52b3f134f386b40cc7dfc2d0d30d5b8";
+ sha256 = "067s1zwgr5kzxshcnyh96y8jz2j93bqp2fr0a5460fi27pnhyyl0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68a2fddb7e000487f022b3827a7de9808ae73e2a/recipes/shm";
@@ -58465,12 +59144,12 @@
sicp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sicp";
- version = "20151130.757";
+ version = "20161215.428";
src = fetchFromGitHub {
owner = "webframp";
repo = "sicp-info";
- rev = "7d060136bf4582fa74e4aa7cb924d856eea270f4";
- sha256 = "102ssiz4sp7y816s1iy8i98c314jbn3sy0v87b0qgpgjiq913ffq";
+ rev = "c1a6af5719fc8872d40bcf8b41e02745eefd9808";
+ sha256 = "0vq8mkdh7bk5vbf74dln86a3dmlba2iiaxiim8n553qnpm4ln0ay";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/sicp";
@@ -58570,12 +59249,12 @@
simp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "simp";
- version = "20160315.924";
+ version = "20161206.2151";
src = fetchFromGitHub {
owner = "re5et";
repo = "simp";
- rev = "f74467507983a3c8a8b61268e07219fbaa628ae5";
- sha256 = "177bhvynqsdfwwqhhlh1v0pqvscy3xv6hhxi7fb42l5dmsw5b97z";
+ rev = "13959cabdc7a10d8878592ef4333b3e6df2f1483";
+ sha256 = "1wph7r7r9s867wr6j17fqch8hmj20fksrhl80bw2k4vyscaj0f22";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/45ff5b788e12218f8e2df7e53444796ca4b929fc/recipes/simp";
@@ -58778,12 +59457,12 @@
simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }:
melpaBuild {
pname = "simplenote2";
- version = "20160922.801";
+ version = "20161212.642";
src = fetchFromGitHub {
owner = "alpha22jp";
repo = "simplenote2.el";
- rev = "ea82d5e3e1226605e7b04054a77cca7431fe4709";
- sha256 = "0p6zlm46pq9id74bqpgscqczpkk991mzh8d6264g5qxj0az22iia";
+ rev = "d005d6567cc484b61f2d233f4bf828a2365223c2";
+ sha256 = "1fp1pz6qsb3yg7wdp680i12909bv00m64102cq4pwl29cz9cgpv1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2";
@@ -58862,12 +59541,12 @@
skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }:
melpaBuild {
pname = "skewer-mode";
- version = "20150914.1304";
+ version = "20161205.419";
src = fetchFromGitHub {
owner = "skeeto";
repo = "skewer-mode";
- rev = "92e13cf9540128b2bbab28ac1a0a7a4c00771270";
- sha256 = "0dwc3qaqnzjsccvr3gapip4yr17fzgv4w33ydq8hjqn8rs9rqq6l";
+ rev = "3417b6f306dfcddde17b86f29a336b76420cce89";
+ sha256 = "05bz5bsj3vkfjp1wh477fzjlkv5hbhr4anfxlx2a1r7wimmlrmbd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode";
@@ -58922,22 +59601,22 @@
license = lib.licenses.free;
};
}) {};
- sl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ sl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sl";
- version = "20160729.2101";
+ version = "20161206.730";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "sl.el";
- rev = "76a8eae2b3fc449ed81b2a577c53939434851635";
- sha256 = "1nkgqva4l4nwpixavky8gm38371z7mrkpqdkgrya4j5mrx4kiw86";
+ rev = "be3ef1bad689ce9f7e20a15728a07d75eb9066a9";
+ sha256 = "18xdny9da1vr79jlnhm34kvjrm0wy82ir7885a64z77pjbnxxs2k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7188a93d33e38f360930b5090c6ef872116f8a7c/recipes/sl";
sha256 = "0h90ajikr6kclsy73vs9f50jg8z3d6kqbpanm9ryh2pw3sd4rnii";
name = "sl";
};
- packageRequires = [ cl-lib emacs ];
+ packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/sl";
license = lib.licenses.free;
@@ -58946,12 +59625,12 @@
slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
melpaBuild {
pname = "slack";
- version = "20161104.633";
+ version = "20161212.300";
src = fetchFromGitHub {
owner = "yuya373";
repo = "emacs-slack";
- rev = "c87637c799b19e878d65f1a6906c93b74ad1e3cc";
- sha256 = "0qqp19dwz4vbz83pkhhc5xlwqhq482v2dpmqgq1i6lh42m1xkk5k";
+ rev = "6eb6b336dd65ecac2b07553fdab8b190b1fcdaf0";
+ sha256 = "1xcvhhcl58g3prl7dxhg69dm005fwnn0bp9knp281xi73fpfrqly";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -59030,12 +59709,12 @@
slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
melpaBuild {
pname = "slime";
- version = "20161102.711";
+ version = "20161109.640";
src = fetchFromGitHub {
owner = "slime";
repo = "slime";
- rev = "14f2502cae166ea5dfbab82a04f9fbae429a211b";
- sha256 = "17f40bam7v1p5ypw2vd6gbzgbmz9jswy7sqgs8xac46ijn4n62w3";
+ rev = "786c032a95cc78d3e294abe1b12e09880381efe2";
+ sha256 = "1sv3x7q5b8ablzv0wf7g8sg4vk4gjggylfh0zigx9bpxk0dvj5jj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -59407,10 +60086,10 @@
}) {};
smart-compile = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "smart-compile";
- version = "20150519.947";
+ version = "20161118.403";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/smart-compile.el";
- sha256 = "0sm4nxynwhwypzw008fz56axai9lrphjczwzfdy7da3akan18rbd";
+ sha256 = "163s97h1a9pjz3pqyn2mhh4mf05b7yycp29k5wnk3c9zc71pafvp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2e6c3dd7b8e19193d070fd41c2be4bcd61f1022/recipes/smart-compile";
@@ -59698,12 +60377,12 @@
smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smartparens";
- version = "20161105.1503";
+ version = "20161203.436";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "smartparens";
- rev = "5c680283c9af6d2726bbc107508cbe85a978b39f";
- sha256 = "0fwmjqgcj5q5g035zf4sf36r1ghgb8zb3xqx3a4xvb6bzmzrqa5f";
+ rev = "f55a741c9e54b271c7fd9c213937fb668e6771d6";
+ sha256 = "0rx8wgpxfc31ynm2lzqnnbqzx8c308hv9flxv2qs1ajj4c55wrpz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -59842,22 +60521,22 @@
license = lib.licenses.free;
};
}) {};
- smeargle = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ smeargle = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smeargle";
- version = "20151013.2242";
+ version = "20161212.1558";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-smeargle";
- rev = "67466d5214a681430db8cb59a2a1bca771ff0024";
- sha256 = "1smv91ggvaw37597ilvhra8cnj4p71n6v5pfazii8k85kvs6x460";
+ rev = "0665b1ff5109731898bc4a0ca6d939933b804777";
+ sha256 = "0p0kxmjdr02l9injlyyrnnzqdbb7mirz1xx79c3lw1rgpalf0jnf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c5b985b24a23499454dc61bf071073df325de571/recipes/smeargle";
sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd";
name = "smeargle";
};
- packageRequires = [ cl-lib emacs ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/smeargle";
license = lib.licenses.free;
@@ -60054,12 +60733,12 @@
snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "snakemake-mode";
- version = "20161101.1909";
+ version = "20161123.2130";
src = fetchFromGitHub {
owner = "kyleam";
repo = "snakemake-mode";
- rev = "9a474fd2c8c17c330d02ba2ee32b543c80d55e2e";
- sha256 = "0dig58in7hlr2mq1j0lrpszj9y1amgwgnq99znd2zjkw80cpvv7c";
+ rev = "e4a0916d3b60dc4b7e98db59a2c2e2db4bb71fea";
+ sha256 = "1463949imwyg3kd4988fz38i472lppvphga0qinn27ddwkrf0v0s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
@@ -60201,12 +60880,12 @@
solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "solarized-theme";
- version = "20161009.838";
+ version = "20161203.301";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "solarized-emacs";
- rev = "43d25005f8c06cd145b9fe55c7f9c4b626293b1b";
- sha256 = "19hl3pfr04l3pli0dnall9gbymh0k17m9r5dzm36dx3a7m5v3j4l";
+ rev = "f4840394caba81909eacc8807cab904a0af87419";
+ sha256 = "0s6zs2mmwwq6df8yiwp8ykz3qqfn7scwkz35rj7bzdnbls8rwaaq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme";
@@ -60544,12 +61223,12 @@
spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
melpaBuild {
pname = "spaceline";
- version = "20161018.1249";
+ version = "20161209.1140";
src = fetchFromGitHub {
owner = "TheBB";
repo = "spaceline";
- rev = "3da3396fea7f1dd178e8b807775ef92e46939be9";
- sha256 = "0y3d4s10yri78pkpwra0c7jnkq8hmps486kz8jldsyj84iw21anl";
+ rev = "d40f4b972e307a043963f2262e66d43b6eaf7803";
+ sha256 = "0k51sm7qrhvda3gbj35gx3svvlvdvpcch76d20lnvh6y035ymmkg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline";
@@ -60565,12 +61244,12 @@
spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "spacemacs-theme";
- version = "20161024.1259";
+ version = "20161205.1104";
src = fetchFromGitHub {
owner = "nashamri";
repo = "spacemacs-theme";
- rev = "30068e248b9db11a2eb37dd20b96cbf8ac574326";
- sha256 = "0c9w02vkbd70wx4ddv5q2qk7agigllh6aabw6y80ph1fdvyadnzy";
+ rev = "069cb4c14e33270a6316fa7e60a1cee20eb7f13e";
+ sha256 = "18xr5vy1va2ppd8fbrmrjgm0izly9fzjznp6mp3b85qfczv1wz4k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -60649,12 +61328,12 @@
sparql-mode = callPackage ({ async, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sparql-mode";
- version = "20161029.531";
+ version = "20161127.955";
src = fetchFromGitHub {
owner = "ljos";
repo = "sparql-mode";
- rev = "74b901d5689ee4864c4d552d7052b8f128f77339";
- sha256 = "0dr42d0grgbmvfiw7v6lpxfgiqkhx8srkyql196gd2yrixmndrzx";
+ rev = "1a806aabb8d9405c3d09248f6cd9905883c05b71";
+ sha256 = "07fg44skbkkwwjd3173ilf0p6fp6sp0bwz1s1ccqjcsb7p21mrvn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -61044,12 +61723,12 @@
spu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, signal, timp }:
melpaBuild {
pname = "spu";
- version = "20160515.157";
+ version = "20161213.1924";
src = fetchFromGitHub {
owner = "mola-T";
repo = "SPU";
- rev = "a7dadda5566f5f8d785e8f9540cfcbbfb58eb47d";
- sha256 = "0ng8q1k5kwqk01h4yzqnqgv2q7hb6qvh7rdhlvncwdh68y6bdgbl";
+ rev = "41eec86b595816e3852e8ad1a8e07e51a27fd065";
+ sha256 = "1j77h761vf74y9sfjpidgaznail95hsg9akjs55sz1xiyy7hkgyw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2ef1e83c924d5411b47a931432f129db95ff2c/recipes/spu";
@@ -61148,10 +61827,10 @@
}) {};
sqlplus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "sqlplus";
- version = "20141009.739";
+ version = "20161110.758";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/sqlplus.el";
- sha256 = "0xixdddcrzx6k0s8w9rp6q7b9qjpdb4l888gmcis42yvawb1i53d";
+ sha256 = "04wqy4ss6499rpn0rnczmn39yi78xkqslblyq4xb700xzmzn7sg3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/41b1fc299cf8eeba1916a58ad8f50eb4560f0252/recipes/sqlplus";
@@ -61167,12 +61846,12 @@
sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sqlup-mode";
- version = "20160911.1911";
+ version = "20161207.2044";
src = fetchFromGitHub {
owner = "Trevoke";
repo = "sqlup-mode.el";
- rev = "da9273d9da8f84827b840776f398d24ea4c46b76";
- sha256 = "17pw9275disv1cgcila3r9fshh0ca7mcszri709v0gk0p7f8z70z";
+ rev = "81ad4ec3ca58172a3c261acf4973ec767693d0ef";
+ sha256 = "02438pr144952ragf1ph4qd43kpzalbp6c5qpl725rwqxjh7bf8s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode";
@@ -61206,12 +61885,12 @@
srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "srefactor";
- version = "20161008.238";
+ version = "20161130.2112";
src = fetchFromGitHub {
owner = "tuhdo";
repo = "semantic-refactor";
- rev = "88e8ad5af2b9da89947aa75c9252163dbc917b35";
- sha256 = "0sqy1w1sda2n116xrfnblysjykg914ax9yqsj5vh40q9wdmyqjaw";
+ rev = "8707d93ede4b45c6173641d3482b0d8ffbbeb860";
+ sha256 = "1k4jsklaqmzg6lmrb1sgkwrqpl3qvycqxqdfc129vrg4gybhsavz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e23115ab231ab108678608f2ad0a864f896cd0f2/recipes/srefactor";
@@ -61290,12 +61969,12 @@
ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ssh-deploy";
- version = "20161031.2219";
+ version = "20161206.2115";
src = fetchFromGitHub {
owner = "cjohansson";
repo = "emacs-ssh-deploy";
- rev = "e94c9e70ba64d231ff538db54acd4b5ecade3ed7";
- sha256 = "1igw97v0779gnk9ymk4inqmz92kkxdim5hkdhm52qk03kn7766zs";
+ rev = "740c27df2a6cfc688267e97ee8017b8fb3ac624c";
+ sha256 = "0qy02zifxfwvvy12jfx83lrkdjlglfb6m5ifm4b8waa6nbmfpvy2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy";
@@ -61544,8 +62223,8 @@
version = "20140213.348";
src = fetchgit {
url = "git://repo.or.cz/stgit.git";
- rev = "ef93c20469c08feef7fd915bb773b53e0673679b";
- sha256 = "08xjp9r2cx9jp4gvnadm1x72mqicwkj6rzmzgm976xrndi47cakm";
+ rev = "0accbea79b9cae8dae68ff64d35fd342792c15dc";
+ sha256 = "13ab7k0c5az712ph2a879da84mwijvb1mxzn59cv3xkriabndk4p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ed7cc025d22d8e1e63464e43f733c78421c91c7/recipes/stgit";
@@ -61684,12 +62363,12 @@
string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "string-inflection";
- version = "20150805.256";
+ version = "20161213.1737";
src = fetchFromGitHub {
owner = "akicho8";
repo = "string-inflection";
- rev = "147990de9d07d8e603ade92a23ef27a71e52b850";
- sha256 = "06qs8v2pai3pyg0spmarssmrq06xg9q60wjj46s5xxichlw9pgcf";
+ rev = "af1fb965784eff308d6b4031dc2ef5f6961cd38a";
+ sha256 = "017rq1vll53i4xs1l24insjkfvr7nlq6l9g7gjmgnd8g9ck6jqg0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection";
@@ -61931,12 +62610,12 @@
sublimity = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sublimity";
- version = "20160822.1856";
+ version = "20161214.2032";
src = fetchFromGitHub {
owner = "zk-phi";
repo = "sublimity";
- rev = "f692af1ba045146f568ee36009a78b79e9cfe21f";
- sha256 = "035cb27a5i5ixlrqbh4a0srw3z9k054z32dzls851775rz91dks5";
+ rev = "02a477004b8807984b5f752fa225f1e7bb6f90ab";
+ sha256 = "1dc3kkq931nwa7p26dgrdgqhi110h6ilmch00300gh0m0wx9031d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c1e78cd1e5366a9b6d04237e9bf6a7e73424be52/recipes/sublimity";
@@ -62051,15 +62730,36 @@
license = lib.licenses.free;
};
}) {};
+ sudoku = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "sudoku";
+ version = "20161110.2306";
+ src = fetchFromGitHub {
+ owner = "zevlg";
+ repo = "sudoku.el";
+ rev = "77c11b5041b58fc943cf1668b44b40bae039cb5b";
+ sha256 = "18nbs980y6cj6my208i80cb928rnkk5rn3zwc63prk5whjw4y77v";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f9861d5d4cf18466b17ac8e53f3874df5312d3f3/recipes/sudoku";
+ sha256 = "14nbidjnsm9lwknmqgfr721b484z5156j723kr1wbfv70j8h9kys";
+ name = "sudoku";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/sudoku";
+ license = lib.licenses.free;
+ };
+ }) {};
suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
melpaBuild {
pname = "suggest";
- version = "20161104.1314";
+ version = "20161205.450";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "suggest.el";
- rev = "fd78622bf70cf70c344513587805538c259ea45d";
- sha256 = "1bjybkvydazanwvyp5hmlrpbcyhw8bmw808ym1gavb64qzsswp2l";
+ rev = "19bfa7d6c2356a62647c7fe85876a88ab3b6475f";
+ sha256 = "0sh3nryhcr2spxjh7p0jsjyfhvmqnwjayzz2zrwv3xi2vdgg8gb8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -62219,12 +62919,12 @@
suscolors-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "suscolors-theme";
- version = "20160605.206";
+ version = "20161109.1215";
src = fetchFromGitHub {
owner = "TheSuspiciousWombat";
repo = "suscolors-emacs";
- rev = "15931dac6ece2a42d7be78e4d448d25d55990d54";
- sha256 = "1av0ysw3l56sf8f0fg3mldx9ifw1rd74mw92cyvqvqx1k7na5pmz";
+ rev = "8f5cdf8de5e58db838ef0e803b60b7d74fc2a889";
+ sha256 = "1wc4l7zvb8zmh48cgrl7bkbyfj0sflzq28sc8jssghkcl2735cbg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/100c3244cfce8691240b11bc8a1d95ede3aae4fe/recipes/suscolors-theme";
@@ -62426,12 +63126,12 @@
swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "swiper";
- version = "20161011.747";
+ version = "20161213.719";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "c8be3973a4841a3ee7d05e59666724965ecc8dd8";
- sha256 = "010hrxabaf9pj9dyj6x12sx6m9y8bk8nzdz1xsha2jq3fcglw2mc";
+ rev = "2bc1d7bd8d0f12d5b6b821a0ffa698e6564d865a";
+ sha256 = "0z5hdhb6bgqk2qax59xin8vig2kksmrxf6vyk412kbpa17sm71zm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -62552,12 +63252,12 @@
sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }:
melpaBuild {
pname = "sx";
- version = "20161104.1755";
+ version = "20161109.1903";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "sx.el";
- rev = "87dfd1e2ce093d53c0919dac7899bbf06bd96224";
- sha256 = "1ln75xg05waxahbaxlvb6vj7yi3svnni2247dzc9khi99dnwlbhf";
+ rev = "cb338d7e314f4d29333f59a947ef27c9d22c6958";
+ sha256 = "1sfvgk61cm0idmviadjsni9gy1kfjcdi455zynjc2181q0ax3qy9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx";
@@ -62735,6 +63435,27 @@
license = lib.licenses.free;
};
}) {};
+ syntactic-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "syntactic-close";
+ version = "20161213.735";
+ src = fetchFromGitHub {
+ owner = "emacs-berlin";
+ repo = "syntactic-close";
+ rev = "e03d1c8d09825377fcb6ae271c60a554f4d7a000";
+ sha256 = "0l1ymn6ld15rvpkrz1pyq79c72y4rpc9wz99wfc791r30dqgvj2d";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close";
+ sha256 = "19lrzxxyzdj1nrzdgzandjz3b8b4pw7akbv86yf0mdf023d9as1f";
+ name = "syntactic-close";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/syntactic-close";
+ license = lib.licenses.free;
+ };
+ }) {};
syntactic-sugar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "syntactic-sugar";
@@ -62779,12 +63500,12 @@
syslog-mode = callPackage ({ fetchFromGitHub, fetchurl, hide-lines, lib, melpaBuild }:
melpaBuild {
pname = "syslog-mode";
- version = "20161106.1611";
+ version = "20161124.910";
src = fetchFromGitHub {
owner = "vapniks";
repo = "syslog-mode";
- rev = "d30f58d713fad72e8e8bfa92d6b2ed5300dbf022";
- sha256 = "011n5285c2gwc3i0cxnhk5g867d1jvga6ck92y787xjxm2k688kr";
+ rev = "b2582df8f6c1125636f113100a77edcde0879c22";
+ sha256 = "0am4dfaxflhyn4f0vx79w3p302fi0rr1zh7cx07s9id5q4ws7ddm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/478b307f885a06d9ced43758d8c117370152baae/recipes/syslog-mode";
@@ -62842,12 +63563,12 @@
systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "systemd";
- version = "20160928.1956";
+ version = "20161201.2217";
src = fetchFromGitHub {
owner = "holomorph";
repo = "systemd-mode";
- rev = "7769000ba6b395dfaa2c6b0fce48ae5d5cd9a035";
- sha256 = "1vqcqrq8qk9n512rbwi2lcvjiy0wqmybwa2lmrkv49yshqjhm5ld";
+ rev = "fa1277d1cd955b031a943d52d370e97aec3f2cac";
+ sha256 = "1j1q60hjfx6ma82j6dil0a16jrablzskh76l0gcdq0c8rjdqb4i4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd";
@@ -63031,12 +63752,12 @@
tagedit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "tagedit";
- version = "20160516.754";
+ version = "20161121.55";
src = fetchFromGitHub {
owner = "magnars";
repo = "tagedit";
- rev = "0c72466783d7f85475df672284f93942e76c30ea";
- sha256 = "104n6dmiis6w2psm2rxah9hg5jwaqzna6973ijr5a5rxyp4rcsz7";
+ rev = "b3a70101a0dcf85498c92b7fcfa7fdbac869746c";
+ sha256 = "0xq9i3axlq9wgsr27nbhi5k9hxr1wahygkb73xkvxlgmvkmikcrw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8968e2cd0bd49d54a5479b2467bd4f0a97d7a969/recipes/tagedit";
@@ -63135,12 +63856,12 @@
tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tao-theme";
- version = "20160915.2124";
+ version = "20161213.739";
src = fetchFromGitHub {
owner = "11111000000";
repo = "tao-theme-emacs";
- rev = "85ee42a8e19b913865387d6662d41177fb0803ce";
- sha256 = "1d98rjbgw99ai0dg67xyf1dycqb7pbdj9pwv0d45fflyjnrlrcgq";
+ rev = "2e66c3045e46621d4e01959628c398283b423c72";
+ sha256 = "0abs0h9xhjv1bnpdv4r3ki4cgwak56v92c8lzcj879rqwskpvssy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -63160,8 +63881,8 @@
src = fetchFromGitHub {
owner = "phillord";
repo = "tawny-owl";
- rev = "6eb5781af166bb8850e83fe7bb9be74f274f2b99";
- sha256 = "1yzx5ijjpg7dn6vnp66qq8fazb389wkpki4kpn3jvwc2462i2z6r";
+ rev = "d5b75f52d9ffdbc5cc391fedc3f81d86091839b3";
+ sha256 = "12nnyqg1lqa858c35b8z44wrbrznga8bwsnhm0hqcazy9bjin84v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode";
@@ -63342,15 +64063,36 @@
license = lib.licenses.free;
};
}) {};
+ temporary-persistent = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }:
+ melpaBuild {
+ pname = "temporary-persistent";
+ version = "20161210.333";
+ src = fetchFromGitHub {
+ owner = "kostafey";
+ repo = "temporary-persistent";
+ rev = "ac66f3054fc701d53f11ada9d2d9ab18ea481dc0";
+ sha256 = "15mjcr9gwf1ijppvcxwddnxj84y9idwz7s3lcqr910xb4d3ai8nb";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0f89e65ce7b302a0330f0110564320c724acc254/recipes/temporary-persistent";
+ sha256 = "1q141cdnwchfra6gp6fs0nlkxv6fdf8rx5ry04kcpr9a1y56z362";
+ name = "temporary-persistent";
+ };
+ packageRequires = [ dash emacs names s ];
+ meta = {
+ homepage = "https://melpa.org/#/temporary-persistent";
+ license = lib.licenses.free;
+ };
+ }) {};
ten-hundred-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ten-hundred-mode";
- version = "20160409.551";
+ version = "20161028.1536";
src = fetchFromGitHub {
owner = "aaron-em";
repo = "ten-hundred-mode.el";
- rev = "fc1d7cdb72c21dc1953ed2e2ecf28233b8b3e305";
- sha256 = "17633jachcgnibmvx433ygcfmz3j6hzli5mqbqg83r27chiq5mjx";
+ rev = "bdcfda49b1819e82d61fe90947e50bb948cf7933";
+ sha256 = "11nsh6dkd3i489lrqpd9xhr4c0ai51364rlrd6slm54720by9jql";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4a0534044ff9ce0740414bf5dc3b104bbdbdacce/recipes/ten-hundred-mode";
@@ -63366,12 +64108,12 @@
term-alert = callPackage ({ alert, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, term-cmd }:
melpaBuild {
pname = "term-alert";
- version = "20161022.428";
+ version = "20161119.145";
src = fetchFromGitHub {
owner = "CallumCameron";
repo = "term-alert";
- rev = "8a0842a614aa005f97536142c14279abf0562690";
- sha256 = "11n8sna82gnnfpp4l0gbkqb16afvhydddm8kqa66ln620k8nlw1l";
+ rev = "47af9e6fe483ef0d393098c145f499362a33292a";
+ sha256 = "1nv8ma8x9xkgsl95z7yysy8q1lb3xr0pd8a5sb01nlx8ks3clad4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0d77aee0b1b2eb7834436bdfa339f95cb97da140/recipes/term-alert";
@@ -63408,12 +64150,12 @@
term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "term-manager";
- version = "20161106.1419";
+ version = "20161110.1707";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "term-manager";
- rev = "5272c03ddde3557838796c9b64139ef7c676091e";
- sha256 = "11b4zgx6sjnblbb08dclgrljnkg98w6dy5i9dqrwqgkmhhgsd387";
+ rev = "f29bced3ecdf23d999f55573894b1ec1e2a94fc9";
+ sha256 = "1nkahsnwvmg1fv3qsdc49k5xick6wji3j6qffwfnpw1prx2n2a45";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager";
@@ -63496,8 +64238,8 @@
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "term-manager";
- rev = "5272c03ddde3557838796c9b64139ef7c676091e";
- sha256 = "11b4zgx6sjnblbb08dclgrljnkg98w6dy5i9dqrwqgkmhhgsd387";
+ rev = "f29bced3ecdf23d999f55573894b1ec1e2a94fc9";
+ sha256 = "1nkahsnwvmg1fv3qsdc49k5xick6wji3j6qffwfnpw1prx2n2a45";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile";
@@ -63559,8 +64301,8 @@
src = fetchFromGitHub {
owner = "ternjs";
repo = "tern";
- rev = "0c5c1d2b2f4a7514a03d8e869e74f501965f011e";
- sha256 = "1nsn90zslnv6i6mdgjryznh520rzlknfbvmri5zpqnjnahmaif36";
+ rev = "de94445e6c4bea4a1342bdf5a093f9104f0884b6";
+ sha256 = "1q5i30lqfr0ah0rj581mn4qhi3ap45wsdfczggwyydscdaxzv8wi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -63580,8 +64322,8 @@
src = fetchFromGitHub {
owner = "ternjs";
repo = "tern";
- rev = "0c5c1d2b2f4a7514a03d8e869e74f501965f011e";
- sha256 = "1nsn90zslnv6i6mdgjryznh520rzlknfbvmri5zpqnjnahmaif36";
+ rev = "de94445e6c4bea4a1342bdf5a093f9104f0884b6";
+ sha256 = "1q5i30lqfr0ah0rj581mn4qhi3ap45wsdfczggwyydscdaxzv8wi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -63681,12 +64423,12 @@
test-kitchen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "test-kitchen";
- version = "20161021.844";
+ version = "20161115.1418";
src = fetchFromGitHub {
owner = "jjasghar";
repo = "test-kitchen-el";
- rev = "139bddc527d0165db14d52973635f2e8c4ff2212";
- sha256 = "0x9yggqb4ibi6yzr50a09h6yi28f2b81ykx3wq0bi99mqy3qn9jb";
+ rev = "9213e55e0334c2a3bb31f8cebf9b40022ca12db8";
+ sha256 = "11nnc6s3ryfdrlvkf9rfya9m66l4x1d0zm4p9w1gf0vnyb5x7mfq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/420d18c76f593338fb28807fcbe3b884be5b1634/recipes/test-kitchen";
@@ -63790,8 +64532,8 @@
src = fetchFromGitHub {
owner = "novakboskov";
repo = "textx-mode";
- rev = "1f9ae651508176b4cb1ae9a03aec06049f333c61";
- sha256 = "00hdnfa27rb9inqq4dn51v8jrbsl4scql0cngp6fxdaf93j1p5gk";
+ rev = "74b701ec2d31b228a8e1e9c993edd00f5c324dca";
+ sha256 = "1i4bd17kymdc9w2xd83549f0dva2asnvqcppgsg3svyab8x1aa7z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dada0378af342e0798c418032a8dcc7dfd80d600/recipes/textx-mode";
@@ -63804,6 +64546,27 @@
license = lib.licenses.free;
};
}) {};
+ tf2-conf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "tf2-conf-mode";
+ version = "20161209.820";
+ src = fetchFromGitHub {
+ owner = "wynro";
+ repo = "emacs-tf2-conf-mode";
+ rev = "536950f64c071ffd8495fb2c7ac7c63a11e25f93";
+ sha256 = "0vga7kgzp9wiiji1w47llbb3gp9qgwk8v0f6s8b6jng2gmdg25bk";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c43c53dca64cf0c7d59ffd0b17e9fe60f4aa90d3/recipes/tf2-conf-mode";
+ sha256 = "09kvb3ya1dx5pc146a6r9386fg9n9nfpcxm5mmhmyf75h9c6a25g";
+ name = "tf2-conf-mode";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/tf2-conf-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
tfs = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "tfs";
version = "20120508.1120";
@@ -63825,12 +64588,12 @@
theme-changer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "theme-changer";
- version = "20130725.1919";
+ version = "20161130.1440";
src = fetchFromGitHub {
owner = "hadronzoo";
repo = "theme-changer";
- rev = "c28ea477e8277c03e14657f167695e3c4bf3c11f";
- sha256 = "0njmn5dy773v9kmwclw1m79rh52xnxl8mswcaagni2z3dvlvw4m8";
+ rev = "60e3dd7cbd237225fef34179168006501a27b06b";
+ sha256 = "06y36i3h5m85d6b47cr0hghhbkd8kv23lm6ipc9swkmq0hl3pxfg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d08b24a2aec1012751054c68f7d55bac1bd1fd11/recipes/theme-changer";
@@ -63924,10 +64687,10 @@
}) {};
thingatpt-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "thingatpt-plus";
- version = "20161104.1310";
+ version = "20161121.1523";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/thingatpt+.el";
- sha256 = "0n738nry3iska0121xzwvnlmvzpvmzds7xg3fxh4vk3z3czpb5rq";
+ sha256 = "0xxd6qi6xw9zn0yykyl1ys8ckpfngxkbswy00s6hf7gd9jbknkm3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+";
@@ -64010,8 +64773,8 @@
src = fetchFromGitHub {
owner = "apache";
repo = "thrift";
- rev = "74c99ba38b02288daf05229cdf34e60261d2d01e";
- sha256 = "0l0ffczgpsvp6znlnnc89nxcmw6yzmxn4dbsr0px3pqz1mffgyp1";
+ rev = "0d9b713b173f35ce02552b2f4372899440a99b25";
+ sha256 = "0rld7j1j5i3f5y9yarg9liabmf597c8yz9bw3jax0azfi5ls6lvm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -64067,12 +64830,12 @@
tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
melpaBuild {
pname = "tide";
- version = "20161103.1005";
+ version = "20161205.2257";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "tide";
- rev = "74c8be8c72cb7fdbdcbfda430d4d283bc32e16dc";
- sha256 = "1p6nc2rjggvf3jfsffk9danm4ah9lxhj2z61p267pb2mjs0ywkvf";
+ rev = "2351b8240faaf7fc7785516c0480d54e78e0d3e3";
+ sha256 = "14wfh3siwsxdicb382w9ygjmz6xxqm1724xypxva4n26666fc2da";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -64274,12 +65037,12 @@
tiny-menu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tiny-menu";
- version = "20160606.1711";
+ version = "20161213.435";
src = fetchFromGitHub {
owner = "aaronbieber";
repo = "tiny-menu.el";
- rev = "9820cff69d3b605813f609a0db8e6c860bfb9c72";
- sha256 = "1l3cz16lnq5rw57m4j0x29j6nkrcxnz2ppar5xnpwlcaf600wqki";
+ rev = "f1fc844f514f57fd93602ff5e00c6125b0e93254";
+ sha256 = "125ckmfsvzacd5icsnldcbfl4rkxpfal6qfindy80i84vk0qw47g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82700c97ca40130e7508c151f60220d3f23bf23c/recipes/tiny-menu";
@@ -64604,22 +65367,22 @@
license = lib.licenses.free;
};
}) {};
- toml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ toml-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "toml-mode";
- version = "20160910.1810";
+ version = "20161107.1000";
src = fetchFromGitHub {
owner = "dryman";
repo = "toml-mode.el";
- rev = "0bbf0618fde844cd2e12765c8ca566df09066445";
- sha256 = "129yws71h5wy2y4z2ayl9kys22xa4hhxkybb7hhp2b3y8wq0717z";
+ rev = "f6c61817b00f9c4a3cab1bae9c309e0fc45cdd06";
+ sha256 = "05b4ksay85c8y5ncax0qsvnmplwsfiw24z16a58gkarjz938hb57";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f8157d7d11f1e1848f0ba384249b4b8c6354830b/recipes/toml-mode";
sha256 = "0yghf2ixl3dkcaxnkr4qzxfa9k1rrac7w5qpw1jx2bvic0cfs40l";
name = "toml-mode";
};
- packageRequires = [];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/toml-mode";
license = lib.licenses.free;
@@ -64799,8 +65562,8 @@
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "8a42bf93e38b6437f1da5bf4d0f6de8ad9a85fef";
- sha256 = "1rrc440hqxl7fi8f437clz169n6vacqfs5pmc7ni5m65k9kqm1fa";
+ rev = "e549f0a7f8c6a39cc3129581b85682e3977d2bdd";
+ sha256 = "16c45hb216b3r214p8v7zzlpz26s39lc9fmjl6ll3jwvqpq19kb1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -65108,8 +65871,8 @@
src = fetchFromGitHub {
owner = "josteink";
repo = "ts-comint";
- rev = "2e71708dcd6f3af62501912904c85075d70edc7c";
- sha256 = "1m8rcz6yj8j49jxyjg330bgw3d6mqmzf3f1ja1ngjsfhpkl27v99";
+ rev = "53e0326149d74ac13850f052dcdae4a070d63480";
+ sha256 = "0jrl161lkjdk9appn42g8nybj7sdrpvr0h7c48kj4vvsfmlmrikp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/84e7004395083b66fce7ff4676af818bc798058a/recipes/ts-comint";
@@ -65207,12 +65970,12 @@
tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tuareg";
- version = "20160710.1045";
+ version = "20161207.1239";
src = fetchFromGitHub {
owner = "ocaml";
repo = "tuareg";
- rev = "1e68a0addca6165b8f1cadfcd15c0b7ef5184e9a";
- sha256 = "11g1gimcp4w59pd316my8zmi4y78zf9avxhck829f817a97kf5fn";
+ rev = "18596179aa3da630e544ecb3ad02bcfde8c3a845";
+ sha256 = "1clx74wpb3bp5njy95clvz14zcipf8mcldnp6xsv39x8xwsvgi26";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -65459,12 +66222,12 @@
typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "typescript-mode";
- version = "20160923.9";
+ version = "20161130.1944";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "typescript.el";
- rev = "588d5f3d63b77f40951630d01fd3ecb0f3672c5b";
- sha256 = "1gq4vza69ffqhjls905agsshk0mj2gfg6cmhia0d75lf6r8h6nzf";
+ rev = "f72826e564dc9d7b60dd9df3c6337f33b02560bf";
+ sha256 = "1mhsznkg7hnhb7ypbx0ljg3scawz6dsa5l2vaapb51akaf87a267";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -65519,12 +66282,12 @@
typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }:
melpaBuild {
pname = "typit";
- version = "20160531.931";
+ version = "20161125.1205";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "typit";
- rev = "0e5b374830e85a32b51a4cc8206df8e494378cb2";
- sha256 = "1jv5qmp3xs37py7d9aln4jn85j65h9pp5vb2dcmd8rlszhplsrng";
+ rev = "0ec57775db48d3a2d73998d569626cc720618786";
+ sha256 = "15wl6vymbdc3fzsk4fn12j7nzdg9iqzfi3lnw68bl0p00s3i37pg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit";
@@ -65565,8 +66328,8 @@
src = fetchFromGitHub {
owner = "ksjogo";
repo = "typoscript-mode";
- rev = "0d414e15c8217b5ed42080c84f1c4cc39fdb18ab";
- sha256 = "1i6667dn8avk2lm37lq2ga3d716d34yqz5zqd8j1lq4xyjaq3qj6";
+ rev = "478070b6946cbc6b73249bb6e5f35366aabe9f99";
+ sha256 = "13lawwhn2asr20213h1ijy827kfxs9qzhizkwzsa2sm2s0262rja";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/701de09cb97cbfa49a3a81aaeb9577817566efa2/recipes/typoscript-mode";
@@ -65602,10 +66365,10 @@
}) {};
ucs-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "ucs-cmds";
- version = "20151231.1616";
+ version = "20161118.1423";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/ucs-cmds.el";
- sha256 = "0qy211rxrmzhwl9qfrcmfnwayysvb5rghjginbvx3wf2s6hrbpya";
+ sha256 = "08yfz2mhhfqmx2icwpwizcaqkzngddhgp4ya3ga77fziyb6xjrdv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/ucs-cmds";
@@ -65744,12 +66507,12 @@
undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }:
melpaBuild {
pname = "undercover";
- version = "20161016.2358";
+ version = "20161114.819";
src = fetchFromGitHub {
owner = "sviridov";
repo = "undercover.el";
- rev = "6026118ea2030fa69688dfff294843a865ddf3a3";
- sha256 = "0slml92b2i3cphjmqm738rbwk0brsxg22a8wpz6cdgm62hhxr1zd";
+ rev = "465e339749f924606df71e250ae10d1f910f71a9";
+ sha256 = "0p75m1v9hvdlmlpg9zk09q9zyxf1ld6njfqir6hx83lidgvs5wsm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d58ad9eb863494f609114e3c6af8c14c891b83a5/recipes/undercover";
@@ -66259,8 +67022,8 @@
src = fetchFromGitHub {
owner = "diml";
repo = "utop";
- rev = "a7e716dd7e9778268337f2f9142f7d658f985511";
- sha256 = "0x2ag7amkqq8bgiz5ma31fpcwfpzx0qqs7cr6ia8rxzwiwnyb06k";
+ rev = "f2015062fa5f8ff5a39d3f2db9475862f433b2d0";
+ sha256 = "1l00rhh9l4b9ww5sx1vm87qnydcr59ka4w2n2faifglnsv3awzn6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -66549,12 +67312,12 @@
vc-osc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vc-osc";
- version = "20120910.211";
+ version = "20161119.1155";
src = fetchFromGitHub {
owner = "aspiers";
repo = "vc-osc";
- rev = "fb01a35107be50ebb126c3573e0374e5e7d78331";
- sha256 = "0whzfzg0m03wbmqsxml8hislnbfvawcniq83hj66lbrnbivxsqj4";
+ rev = "8c09a0d5f69237285101554261b77d76b546a24b";
+ sha256 = "153zwhljkjl0dajd1l6p5icva0bnpa2rj8byjblb3xv8rq7p1fzc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/70a1fa5fdfdfa9ec5607524be62eb44fe82e91b0/recipes/vc-osc";
@@ -67032,12 +67795,12 @@
visual-fill-column = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "visual-fill-column";
- version = "20160804.1452";
+ version = "20161109.337";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "visual-fill-column";
- rev = "d3f64e72062cdb74e698bbda8c44d47eb3133099";
- sha256 = "0g6x97d8l11zgcfqdbm5p2bxb9x4c9c7hlypbr6vl6zy1dqixaiw";
+ rev = "159dcee48e7311ee816686d62e7ce36619127462";
+ sha256 = "0bij20a8f9pd4307m2qslcx8p3j59hkr14sm18aw0bric65him8b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column";
@@ -67402,12 +68165,12 @@
wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
melpaBuild {
pname = "wanderlust";
- version = "20161029.2147";
+ version = "20161212.1531";
src = fetchFromGitHub {
owner = "wanderlust";
repo = "wanderlust";
- rev = "8cd89d439515331a96facdcf3eb3eb424819c2e8";
- sha256 = "107p0yrfp4lpm1clzls78f8ylmr6fpjjz467pf0vyygnd5xhxf4r";
+ rev = "dda6c57fa58ef19cfd1be199a791a3e35096b5cf";
+ sha256 = "0cdplbyglzfd62j12dmjsxywsx5w22v6x05rvqrvjljm2n9jpz95";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust";
@@ -67591,12 +68354,12 @@
web-beautify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "web-beautify";
- version = "20160410.1005";
+ version = "20161115.1447";
src = fetchFromGitHub {
owner = "yasuyk";
repo = "web-beautify";
- rev = "9c6a09969c04cb07f5f56ac6f6c3abba5f06c871";
- sha256 = "0vzd0bmm53a0bhdbyvrqgswy453pnsfcnr71piwwhw4dp2zx32hd";
+ rev = "e1b45321d8c11b404b12c8e55afe55eaa7c84ee9";
+ sha256 = "03b5pj58m00lkazyvvasa4qndrkh2kjzv2y7qhxljfg5mngyg3zg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0d528d3e20b1656dff40860cac0e0fa9dc1a3e87/recipes/web-beautify";
@@ -67633,12 +68396,12 @@
web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "web-mode";
- version = "20161106.132";
+ version = "20161210.243";
src = fetchFromGitHub {
owner = "fxbois";
repo = "web-mode";
- rev = "bae44d506af5d4f548f1b992229e369890f2a8a4";
- sha256 = "1ygsvcsf3pddcwyaw0m19z5j8is982ypxmz96qs2h0krfq9l6vl9";
+ rev = "98be3285362a512d28a96ce4220c6dc295d5fee8";
+ sha256 = "1mylmz3xl4yj80i1n8xv8jiszrqywhiavd7db0qxx04lrl71n02b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -67651,6 +68414,27 @@
license = lib.licenses.free;
};
}) {};
+ web-mode-edit-element = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }:
+ melpaBuild {
+ pname = "web-mode-edit-element";
+ version = "20161114.954";
+ src = fetchFromGitHub {
+ owner = "jtkDvlp";
+ repo = "web-mode-edit-element";
+ rev = "8b8ac07aa8c920dafd94c96a51effb0d6c0ed1ce";
+ sha256 = "0aj1ibmnrbaxrkwjf1fac2qzazrj39pql3prcibnchc2bmp191aa";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2658e8a80455ad5ae1ceb69deddab89ebc6b6871/recipes/web-mode-edit-element";
+ sha256 = "09m2jzsb3zz1wr396jrhcwskfm1m0a4hvxlxhq5p1w5fzfcdb8md";
+ name = "web-mode-edit-element";
+ };
+ packageRequires = [ emacs web-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/web-mode-edit-element";
+ license = lib.licenses.free;
+ };
+ }) {};
web-server = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "web-server";
@@ -67700,8 +68484,8 @@
src = fetchFromGitHub {
owner = "etu";
repo = "webpaste.el";
- rev = "c57cd53b6036e8f9d128ffb1d80cdd898d52c2e8";
- sha256 = "1sjczh4z4fd6mlpqvd8qbkyc1pphkx1s7d953msqqfy1lvwd2v6j";
+ rev = "6e34759f77b94318f079e178f7551fb16317b661";
+ sha256 = "1lw4jf4jnch5c57vv5dyiwgkmqmxisbm1wx269p6nkkvb9y49qm7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -67717,12 +68501,12 @@
websocket = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "websocket";
- version = "20161022.2054";
+ version = "20161113.1736";
src = fetchFromGitHub {
owner = "ahyatt";
repo = "emacs-websocket";
- rev = "f7d3fb5409aed9f5cdb745f0e61a0c43c097588c";
- sha256 = "1dl6yirbrqhsci3wvigvcghx645slh7bb2q3hb66rcdp5j5m41zf";
+ rev = "fbd9e2263d2d7168aae31d4f8bde38f511e9d2ec";
+ sha256 = "04kg6njw5frp9xafjyqff57m0a2r15r7c57mnb6dw6lgazxlscgb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket";
@@ -67759,12 +68543,12 @@
weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }:
melpaBuild {
pname = "weechat";
- version = "20161003.1201";
+ version = "20161211.259";
src = fetchFromGitHub {
owner = "the-kenny";
repo = "weechat.el";
- rev = "9efd3468bca81d74adfe5f63a17c64b9a7df2f0f";
- sha256 = "15r2gv0d0nyyrww9nvvh1mvsy1gdn0cm92bgrg6izmvs32fm8q85";
+ rev = "a0d81074088d313dd596af6602e51d4253a55ca5";
+ sha256 = "08ibyabvdlmp74xa950al3axmzsqpcal30313ab5wgb746sh3dvm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat";
@@ -67948,12 +68732,12 @@
which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "which-key";
- version = "20161106.950";
+ version = "20161207.714";
src = fetchFromGitHub {
owner = "justbur";
repo = "emacs-which-key";
- rev = "17f4b0069273f9c9877dc079e5cf49ed9cb4d278";
- sha256 = "1h673yjl0hp6p244pkk6hmazgfrj2sbz9cvd1r6rnrp1lpn8z1dl";
+ rev = "f0eb183af6ce87344af40813a20fbe81bf98c80a";
+ sha256 = "0p1hzhcqy17cb90hsii1xiy9bw5129q847wpdbz8i58345svzm83";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -68050,6 +68834,27 @@
license = lib.licenses.free;
};
}) {};
+ whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "whizzml-mode";
+ version = "20161115.1720";
+ src = fetchFromGitHub {
+ owner = "whizzml";
+ repo = "whizzml-mode";
+ rev = "b5804004fb35c603468054cf179f4dd6936c8882";
+ sha256 = "0x0cxwifqb8pv6j55iwxy7hdk0cvjz0zygayi494y4nhabcyp3kf";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode";
+ sha256 = "0gas9xfpz5v9fbhjxhd4msihwz9w4a05l5icsaclxvh06f92wcyk";
+ name = "whizzml-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/whizzml-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
whole-line-or-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "whole-line-or-region";
@@ -68217,10 +69022,10 @@
}) {};
wimpy-del = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "wimpy-del";
- version = "20151231.1623";
+ version = "20161209.736";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/wimpy-del.el";
- sha256 = "142ql6886h418f73h3wjblhnd16qvbap7mfr4g2yv4xybh88d4x2";
+ sha256 = "19dsmchrgmrqnn0v81k3q6z0h3vnxx0wjyqzz27wc7ll1qrvjfyg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/wimpy-del";
@@ -68485,8 +69290,8 @@
version = "20160419.1232";
src = fetchhg {
url = "https://bitbucket.com/ArneBab/wisp";
- rev = "9f38303df3b7";
- sha256 = "10bcyzaj4ramas2vwjnsl9pk82gnnvfrwdxn6g217xbjjjlylwds";
+ rev = "a67adbf5fc75";
+ sha256 = "1av071s0s6x0idbklfnps8j7vgjqxapk9y23prk6jrdbbwhfzb8n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -68523,12 +69328,12 @@
with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "with-editor";
- version = "20161009.917";
+ version = "20161201.925";
src = fetchFromGitHub {
owner = "magit";
repo = "with-editor";
- rev = "b2d9d6b38cbb3993d4c100b098fc7efc9274b9b4";
- sha256 = "1l42a5d7hdpa1nyvhqzas9smbgkrscylj58av7gsky6kndps89dk";
+ rev = "ee41302fea917eb113182bc1eb8d44de882233f8";
+ sha256 = "165shk1bi5lhbx06mavvlpcqvdjpnwdp29l9gqnyxclc7nm0i05b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -68712,12 +69517,12 @@
worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }:
melpaBuild {
pname = "worf";
- version = "20161107.535";
+ version = "20161206.201";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "worf";
- rev = "997b7e02ab4684166162eb1bdf4b711e18017952";
- sha256 = "0nhh10rhn17a4iscl2y3c1v7axvc154s7j1cfpidjk9xc52vwz9d";
+ rev = "c1a5e644320b98467a31b0c363edc8229927ed78";
+ sha256 = "11pb3sd1jn5jfhx0q4pwpiszaadbyag9zjb6iy6sl1nhs2z22acn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf";
@@ -69006,12 +69811,12 @@
x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "x86-lookup";
- version = "20161030.1736";
+ version = "20161215.448";
src = fetchFromGitHub {
owner = "skeeto";
repo = "x86-lookup";
- rev = "208810ea93214491e6e2329cdbf81de85437939a";
- sha256 = "0whhi05mg7xirzfcz7fzn4hkqq0qbrhqi77myrgdhwgs123cd9bj";
+ rev = "544a1ad4e8551c60e58e6c431470b6ef4ce7c5cb";
+ sha256 = "1w2fhi5x0amjyzzdndp9lvm6i279pcjjs6zfhssly2lbxw4dpaky";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/27757b9b5673f5581e678e8cad719138db654415/recipes/x86-lookup";
@@ -69027,12 +69832,12 @@
xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-css-mode";
- version = "20161025.341";
+ version = "20161210.2152";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-css-mode";
- rev = "0dc80c428cc48dfbb411b77588db7030903705b6";
- sha256 = "0rmyd6wa540k41zidzp0wi773ycn6kj1wiwbb3kxfam38ds705y3";
+ rev = "c2ca5a4422e8c05ff1428c76b3b9c20d38bcfcb7";
+ sha256 = "1wkibjznxg1khvgnabgh8808hp31i2zrkzq9crjc37xv65vkb3v1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode";
@@ -69048,12 +69853,12 @@
xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-elisp-mode";
- version = "20161105.1325";
+ version = "20161210.2135";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-elisp-mode";
- rev = "79e004ee10d7f1d67200140f18e8a720be177273";
- sha256 = "17f5n23sp31manf58mvvyrixygza6plc0sl6n5k7lqfnlcas27d8";
+ rev = "d541d7940a078c7cec64578bf51fa1023df7d931";
+ sha256 = "0l3jadf5zlkva7lcrd7z7gfhb71p8dccsbn5mwwwhcfv449z0a5x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode";
@@ -69069,12 +69874,12 @@
xah-find = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-find";
- version = "20160721.2030";
+ version = "20161116.1515";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-find";
- rev = "fce0404fb46d9ead40f4ba02e684a48310bfb8ea";
- sha256 = "1d4116c1xviljr7qznab865fy8y0rq3pgwwybxq9wybbj14r74ms";
+ rev = "44a8ccf067e86bf9db7c7e73016b23ddcb212254";
+ sha256 = "02zx485l9ilfblz2ma5wqb97prbnvph9a7ija66sac2aklw19i8w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d94ffd9c3380cd56770f253e43d566a95083e37/recipes/xah-find";
@@ -69090,12 +69895,12 @@
xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-fly-keys";
- version = "20161102.1328";
+ version = "20161210.2112";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-fly-keys";
- rev = "40b0818411a77d496418f30a55f5ad4616350f35";
- sha256 = "1p0kc5viia17l4mls9ql2486cpnj2l2rp6nxlxij8ilw901q18d7";
+ rev = "a6c454132d00f7140f8130b55981c343b4c1b7a6";
+ sha256 = "07h9x74g66z3nw6d07sa0pkjsb1ddnyrs2pmka9ly9n35irix2ms";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -69111,12 +69916,12 @@
xah-get-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-get-thing";
- version = "20161019.2018";
+ version = "20161210.2058";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-get-thing-or-selection";
- rev = "4a831ad9e5d1c96a045ba505424c041fb4361413";
- sha256 = "12bgj8b3haldc6ixpm86cq6xwb75gbq81dfpy1xyid6x29a7rail";
+ rev = "1604ebb340b31eae31596716489b99043c237ccc";
+ sha256 = "19wjiwdlmpj9yax0zv401ah0zp80dvr2mhxwyhqsnfd802yp1n00";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9e8dc32a5317f0ff0e72fa87220243dd742eb1ef/recipes/xah-get-thing";
@@ -69150,15 +69955,36 @@
license = lib.licenses.free;
};
}) {};
+ xah-math-input = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "xah-math-input";
+ version = "20161206.1107";
+ src = fetchFromGitHub {
+ owner = "xahlee";
+ repo = "xah-math-input";
+ rev = "4f36d0d949ec8d930aa5e3a0cdaa9fb136244436";
+ sha256 = "184kciyvs9qgzlf33y11y8x4rixfg1sx067qh67yjwgl2wzwbwfm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/95d57e33e6d60dc20d6452b407ea1486604ba23a/recipes/xah-math-input";
+ sha256 = "1afikjk46sjf97fb5fc8h63h7b9af010wxhsbpnmabsb4j72rx5a";
+ name = "xah-math-input";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/xah-math-input";
+ license = lib.licenses.free;
+ };
+ }) {};
xah-replace-pairs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-replace-pairs";
- version = "20161005.1847";
+ version = "20161210.2059";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-replace-pairs";
- rev = "9b518378fe204737301a8c206d915ce19f2b9b5d";
- sha256 = "1289ylz3dmyjv4z6yssb9c84a3wa794kd10xf5gwqlpmdlp7x1yc";
+ rev = "2cf602c6d8136a44799e8799f17c3b12e2bec5c8";
+ sha256 = "09bb516srdjkdibv5p2gsmwhqahwnlka0wbpcx4064w54afgh5a6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs";
@@ -69262,8 +70088,8 @@
src = fetchFromGitHub {
owner = "vibhavp";
repo = "emacs-xkcd";
- rev = "2c538d41a9728939cc5e8292faa78ed50997877d";
- sha256 = "0p9p3w8i5w1pzh3y3yxz0rg5gywfq4m5anbiyrdn84vdd42jij4x";
+ rev = "66e928706fd660cfdab204c98a347b49c4267bdf";
+ sha256 = "0znhjwlpgg05g39b16ddgw3a71a93fn2dicfsxjkziffn2a95m0s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ac99eee00b76501d830373a13369f6a2a1239b5/recipes/xkcd";
@@ -69451,8 +70277,8 @@
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "xref-js2";
- rev = "7e2bc6a8dad08a493d11d3554f6374584846b9e6";
- sha256 = "1mmd27miv32sl8cj7qhy09yfh7v1zgw7rv4fdwk96msvd4qfdkqd";
+ rev = "031def02271fdbe2e0ab30515c7291a239fea4e6";
+ sha256 = "1i3gsv7npf6lg7hakky6yxn96aqjdlridj74l0vhj55j2w7ia6f8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b5dab444ead98210b4ab3a6f9a61d013aed6d5b7/recipes/xref-js2";
@@ -69489,12 +70315,12 @@
xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xterm-color";
- version = "20161104.1949";
+ version = "20161128.1657";
src = fetchFromGitHub {
owner = "atomontage";
repo = "xterm-color";
- rev = "77e058710b20cb222647151e70416ef597929518";
- sha256 = "179nkk5hi6ylckjgxi536r78fvzv39kdnlbcdi0sscfn44q1ng6k";
+ rev = "67860d31c4a4e8e8781bf2c8888f40001614f54a";
+ sha256 = "01if8ggkpli7md0yg4c3gv8nn0di3drs2frcfm9cd4d4jc7wc7l5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color";
@@ -69510,12 +70336,12 @@
xterm-frobs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xterm-frobs";
- version = "20091211.1555";
+ version = "20161207.1609";
src = fetchFromGitHub {
owner = "emacsmirror";
repo = "xterm-frobs";
- rev = "58fb0de21e4d1963d1398a38e1b803446fb41320";
- sha256 = "10dsf2lgjjqvjzzyc5kwggfk511v8ypmx173bixry3djcc15dsf3";
+ rev = "0832d588598dbf6bd8aa8e05c611d7c098c3f9d8";
+ sha256 = "0snrylgv2d6r3d6nv05vqs6ng3sgrxkvqpx7m4ga2y7a1m5lmxkw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b7bb3be63b798967f5525cf118579a1cc756ee1a/recipes/xterm-frobs";
@@ -69780,6 +70606,27 @@
license = lib.licenses.free;
};
}) {};
+ yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "yang-mode";
+ version = "20161213.1247";
+ src = fetchFromGitHub {
+ owner = "mbj4668";
+ repo = "yang-mode";
+ rev = "351a17bfd4b78616cf740fc1c7148bc1d85b63a4";
+ sha256 = "14hrr4ix77g795b4xhdwwqkgpbbb3axpim1r4yl1bv9jbbkqllx5";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";
+ sha256 = "0rl90xbcf3383ls95g1dixh2dr02kc4g60d324cqbb4h59wffp40";
+ name = "yang-mode";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/yang-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
yankpad = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yankpad";
@@ -69822,12 +70669,12 @@
yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yapfify";
- version = "20160822.1207";
+ version = "20161202.1055";
src = fetchFromGitHub {
owner = "JorisE";
repo = "yapfify";
- rev = "0931e0f4ee3ed060be87f529cac4950af534ffac";
- sha256 = "1dzhxldakjqnnihvggwbmi48l0dim49l463bahb3kr8493rd8c9x";
+ rev = "c22db3683133ed4aff78e280983ec0621ca1cf1f";
+ sha256 = "05nilm9adpymx1gs1qvcrrgyv13vf5lm13rp12ljbndk0gx4n8x6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify";
@@ -69927,12 +70774,12 @@
yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yasnippet";
- version = "20161026.1601";
+ version = "20161211.1918";
src = fetchFromGitHub {
owner = "joaotavora";
repo = "yasnippet";
- rev = "e6b865127783f498b61fa99ad0f5413200ac09d0";
- sha256 = "0djj2gi0s0jyxpqgfk2818xnj5ykwhzy5k9yi65klsw2nanhh8y9";
+ rev = "e878afb8832ecf05d654d99cd7ecb3406f7a425e";
+ sha256 = "0nlw4c9cfcg04zfjfv1z097yn8cqv1l6dsbdcmf34ccgmncr076y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -69945,27 +70792,46 @@
license = lib.licenses.free;
};
}) {};
- yatemplate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+ yatemplate = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "yatemplate";
- version = "20160719.1228";
+ version = "20161108.1305";
src = fetchFromGitHub {
owner = "mineo";
repo = "yatemplate";
- rev = "da42cb16c4534eb31c5946bf7f5a5710ef57256d";
- sha256 = "09ag32gbmidp12w3pay5iid6b75zwdm317hsz2kdvslik18j7r66";
+ rev = "b58d17e176f77ded83860d33f4f43fcb5f7d2c9c";
+ sha256 = "13as073yw6wphcs7w62zicqgva0lh4xx4f1c9sph8ip1wydkr9pg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate";
sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q";
name = "yatemplate";
};
- packageRequires = [ yasnippet ];
+ packageRequires = [ emacs yasnippet ];
meta = {
homepage = "https://melpa.org/#/yatemplate";
license = lib.licenses.free;
};
}) {};
+ yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+ pname = "yatex";
+ version = "20161214.2131";
+ src = fetchhg {
+ url = "https://www.yatex.org/hgrepos/yatex/";
+ rev = "5428250c886a";
+ sha256 = "0q1b0wpdfdghp6hchc59jgkyra5qqqdam47q7g2ni4ym8nlhwd3c";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
+ sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
+ name = "yatex";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/yatex";
+ license = lib.licenses.free;
+ };
+ }) {};
yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yaxception";
@@ -70008,15 +70874,15 @@
license = lib.licenses.free;
};
}) {};
- ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request, request-deferred, s }:
+ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
melpaBuild {
pname = "ycmd";
- version = "20161106.705";
+ version = "20161128.358";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "d116b167bf776dbeba6a822c0b3c19a2c97f68d4";
- sha256 = "192qiwpkc5a0bxsiqj6zyvlblvixq24m845dgpcsqzwpjcm7qq9l";
+ rev = "5bff8525adbe01a9af905c92f0834902ac3c1c73";
+ sha256 = "15sg07dvvmmfhcp83b388zy43wgyq2qcns4qqcm2jaqq9hpvqxf9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -70029,6 +70895,7 @@
deferred
emacs
let-alist
+ pkg-info
request
request-deferred
s
@@ -70062,12 +70929,12 @@
yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yoshi-theme";
- version = "20161006.1632";
+ version = "20161115.1258";
src = fetchFromGitHub {
owner = "ryuslash";
repo = "yoshi-theme";
- rev = "09ce91530896f6443b5b45409bd67b5a449651c9";
- sha256 = "19kfjaqd1p1v777zgr76zpyc33i8rn7v7f5wq59cnnnswi01m8m9";
+ rev = "278dba2c6846c6898ced9948505775ef71812586";
+ sha256 = "03fibd99wihg811c72cn6q8w89pdivjn3305lyhzlbs69ylafz0f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a549e31c4097ee24b4bff12ec5d20d3beac68/recipes/yoshi-theme";
@@ -70125,12 +70992,12 @@
zeal-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zeal-at-point";
- version = "20161027.2344";
+ version = "20161114.1811";
src = fetchFromGitHub {
owner = "jinzhu";
repo = "zeal-at-point";
- rev = "2ca9f1070197bd6af7807bca6a1f2099c7b3ed1c";
- sha256 = "1l7kzmhkjnfy32l0kw3xnqs3dipmsad2ckcx7plvfwfh75yrddq9";
+ rev = "bc71e4ecb154e140fa688add55d26d01b5a52dea";
+ sha256 = "15ymggp3j7bxwp5q4ng8g2hnym8psgjyvx5baxh4d0yc54jiq1gx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4bcb472b6b18b75acd9c68e1fc7ecce4c2a40d8f/recipes/zeal-at-point";
@@ -70187,12 +71054,12 @@
zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zenburn-theme";
- version = "20161018.437";
+ version = "20161213.324";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "zenburn-emacs";
- rev = "8715e379b00a788bfb6a1025e7ebc69e3aeca0d6";
- sha256 = "02hkrisv2lk0ncq84rciq4l6az9yvk9wpd2617nvfijws4avgh02";
+ rev = "f63e357ee845d95a26f48b1001c9168a0e3fefa1";
+ sha256 = "1jhl9bi9qvkrdfvnrcfjims2gf11jlhp0pnxb3l9xxn2ys344lj8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";
@@ -70246,22 +71113,22 @@
license = lib.licenses.free;
};
}) {};
- zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline }:
+ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
melpaBuild {
pname = "zerodark-theme";
- version = "20161106.1246";
+ version = "20161212.1151";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "zerodark-theme";
- rev = "62773d94e975cafeca26b93679aaa04adfc36882";
- sha256 = "0ayxrz3n1ca4kgby09crrwdxii4py5v5icnclys6wmnigvmb4jsw";
+ rev = "e2e58a4aabb2b8973b318f5ad1013150f8d06678";
+ sha256 = "1jnjiypm2zarfws1w5ql1c9d6zgl47cjnr8zq5lk0raxwx968lqc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9";
name = "zerodark-theme";
};
- packageRequires = [ all-the-icons flycheck magit powerline ];
+ packageRequires = [ all-the-icons flycheck magit ];
meta = {
homepage = "https://melpa.org/#/zerodark-theme";
license = lib.licenses.free;
@@ -70437,10 +71304,10 @@
}) {};
zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "zones";
- version = "20160819.1426";
+ version = "20161127.1801";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/zones.el";
- sha256 = "1dmcslyf9wm6hmyj8lshs97s3pn6y5m5q4i75p4gzrsgqgyc0h5f";
+ sha256 = "09lwqkfcz97jpzfr4q5ir6m8zxligkkf70b2ppnnchhmdghs0yx8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f768556f3fbe2537d6ebb08a5285d040e851e85d/recipes/zones";
@@ -70493,22 +71360,22 @@
license = lib.licenses.free;
};
}) {};
- zoom-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ zoom-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zoom-window";
- version = "20160918.2110";
+ version = "20161123.405";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-zoom-window";
- rev = "1c39773c69b9833382c26101c6ff60bfa218cc09";
- sha256 = "08yw2ibn5zc40f8l3bnpp87w3nf5zzlzhi0f61a6px4ix2mqlsv4";
+ rev = "eefe36d26e04a9f89aad27671d1f06e9d4736ac6";
+ sha256 = "08splg49ncgfsap3ivpc974wmg22ikshwv33l0i6advjjv9cskhm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55cc66cc0deb1c24023f638b8e920c9d975859/recipes/zoom-window";
sha256 = "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3";
name = "zoom-window";
};
- packageRequires = [ cl-lib emacs ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/zoom-window";
license = lib.licenses.free;
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index c7d7c5b5ed1..6d3ec36277c 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -191,12 +191,12 @@
ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }:
melpaBuild {
pname = "ac-clang";
- version = "1.6.0";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "yaruopooner";
repo = "ac-clang";
- rev = "610ff778697eb5499394be3fc3652756d0bfb772";
- sha256 = "1sdgpyq5p824dnxv6r7djwvhyhdmnis8k6992klr8iz7anhxzdam";
+ rev = "ad75d193bb8962136e1ecac04d33352dd70fb72e";
+ sha256 = "0pchbhcs3bjf8r6f24lcf29in011502ncr2gi72faww6iz0pb285";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang";
@@ -1052,12 +1052,12 @@
amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }:
melpaBuild {
pname = "amd-mode";
- version = "2.5";
+ version = "2.8";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "amd-mode.el";
- rev = "c610c1a85728d161d28854d7373fc13b3dec311b";
- sha256 = "1ghs3gh410c9w2v17zb93wk184lwl5izpkzrm0qn37qz8i87jqcr";
+ rev = "977b53e28b3141408fff4814be8b67ee23650cac";
+ sha256 = "0m80bwar80qsga735cqrn6rbvfz4w9a036zh8inhsigylv3vwqjv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode";
@@ -1292,12 +1292,12 @@
ansible-vault = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ansible-vault";
- version = "0.3.2";
+ version = "0.3.3";
src = fetchFromGitHub {
owner = "zellio";
repo = "ansible-vault-mode";
- rev = "57fd8017ab93cc6a1f9bbc795d494a069557a1cb";
- sha256 = "04sdgg98z9gydgx8sf4nfmkwazm799gyvywssfa0mkcvza2z7s21";
+ rev = "f4d9b3a77490071b8c59caa473bb54df86e90362";
+ sha256 = "0f6dmj3b57sy6xl6d50982lnsin0lzyjwk0q1blpz0h2imadr8qm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault";
@@ -1456,6 +1456,27 @@
license = lib.licenses.free;
};
}) {};
+ apib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
+ melpaBuild {
+ pname = "apib-mode";
+ version = "0.6";
+ src = fetchFromGitHub {
+ owner = "w-vi";
+ repo = "apib-mode";
+ rev = "18aebab7cd61b9d296b7d5d2de0c828e2058c906";
+ sha256 = "0sj948j4s26sxxandjzjjzmjqma7vf86msyyi23gsljy1q28vwlf";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ebb04f975d8226a76260895399c937d6a1940/recipes/apib-mode";
+ sha256 = "0y3n0xmyc4gkypq07v4sp0i6291qaj2m13zkg6mxp61zm669v2fb";
+ name = "apib-mode";
+ };
+ packageRequires = [ emacs markdown-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/apib-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
apples-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "apples-mode";
@@ -1627,12 +1648,12 @@
atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }:
melpaBuild {
pname = "atomic-chrome";
- version = "1.0.1";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "alpha22jp";
repo = "atomic-chrome";
- rev = "439b669b10b671f5795fd5557abfbc30e0d6fbb4";
- sha256 = "1bwng9qdys5wx0x9rn4nak92qpspfsb04xrl0p3szl5izz427cb6";
+ rev = "38ce9127285e1ff45f0f39b9da36a682103bdb96";
+ sha256 = "01zwpdmq13iy3hsgijnqsg0yahjxngfbrnn1dd2x1bzpmr8hpxnz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome";
@@ -2452,12 +2473,12 @@
bind-map = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bind-map";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "justbur";
repo = "emacs-bind-map";
- rev = "ffe5e636178ab9878fa8213fd1a1d4862ccb3d5f";
- sha256 = "1h07s8g4vpq6c8sl5m6vxvd598iks160bksv0wn51680gh05f0pa";
+ rev = "bf4181e3a41463684adfffc6c5c305b30480e30f";
+ sha256 = "0vrk17yg3jbww92p433p64ijmjf7cjg2wmzi9w418235w1xdfzz8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f58800af5965a6e7c9314aa00e971196ea0d036e/recipes/bind-map";
@@ -2557,12 +2578,12 @@
bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bog";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "kyleam";
repo = "bog";
- rev = "ee403848c65c6141888344144958bc979596f5d4";
- sha256 = "0414kdwgvmz0bmbaaz7zxf83rdjzmzcvvk5b332c679hk0b9kxg7";
+ rev = "cf7817de3f37ce2404ee637a655f1a511b829585";
+ sha256 = "0h166w8bg864ppwg64m0vhg649mmkclld85zcd0lmbqa9wfml5j5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog";
@@ -2788,12 +2809,12 @@
bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bui";
- version = "1.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "alezost";
repo = "bui.el";
- rev = "c08d91b2d314b52c9ca5c2d5be7a7b2367b68162";
- sha256 = "104q089cyy0m0hkdnvblss884npc4bv5xf03qr35x3s3573lxh4a";
+ rev = "70ea295ec04cb34e383dc7d62927452410876999";
+ sha256 = "1whpln3zibqxnszvrm9chsaaxxxfb0kg3vvfy6j4drrjy5ah2vky";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui";
@@ -3807,12 +3828,12 @@
clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clojure-mode";
- version = "5.5.2";
+ version = "5.6.0";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
- rev = "464c9de6734cb4b426137674041d695c2a7c7ef9";
- sha256 = "0xg85x5lrh1d8vlnkzrxpdrcqsqngjy6xp7p509wnhx7k8j85vpm";
+ rev = "2ee4ca6c3a156afac4565ef250b6a3b99e0e8d3d";
+ sha256 = "1n77d6mn2z7v6w52kx6y4d6sqpbx21mnx0s37kkj0zwwj3b9rk2y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -3828,12 +3849,12 @@
clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clojure-mode-extra-font-locking";
- version = "5.5.2";
+ version = "5.6.0";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
- rev = "464c9de6734cb4b426137674041d695c2a7c7ef9";
- sha256 = "0xg85x5lrh1d8vlnkzrxpdrcqsqngjy6xp7p509wnhx7k8j85vpm";
+ rev = "2ee4ca6c3a156afac4565ef250b6a3b99e0e8d3d";
+ sha256 = "1n77d6mn2z7v6w52kx6y4d6sqpbx21mnx0s37kkj0zwwj3b9rk2y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -3888,6 +3909,48 @@
license = lib.licenses.free;
};
}) {};
+ closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "closql";
+ version = "0.3.2";
+ src = fetchFromGitHub {
+ owner = "emacscollective";
+ repo = "closql";
+ rev = "5e9d64288863d6d33fac73ccf356427215daa9fb";
+ sha256 = "0snhwix51bfs6gsg2knklkg791k2mvn3ydyk388k3k9xmn5sr7xj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql";
+ sha256 = "13ybna20w2d1b3n0y5p1ybhkw0j0zh5nd43p1yvf8h1haj983l87";
+ name = "closql";
+ };
+ packageRequires = [ emacs emacsql-sqlite ];
+ meta = {
+ homepage = "https://melpa.org/#/closql";
+ license = lib.licenses.free;
+ };
+ }) {};
+ clues-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "clues-theme";
+ version = "1.0.1";
+ src = fetchFromGitHub {
+ owner = "jasonm23";
+ repo = "emacs-clues-theme";
+ rev = "abd61f2b7f3e98de58ca26e6d1230e70c6406cc7";
+ sha256 = "118k5bnlk9sc2n04saaxjncmc1a4m1wlf2y7xyklpffkazbd0m72";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/bf43125306df445ac829c2edb98dd608bc1407de/recipes/clues-theme";
+ sha256 = "12g7373js5a2fa0m396k9kjhxvx3qws7n1r435nr9zgwaw7xvciy";
+ name = "clues-theme";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/clues-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cm-mode";
@@ -3933,12 +3996,12 @@
cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cmake-mode";
- version = "3.7.0pre3";
+ version = "3.7.1";
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
- rev = "adf5f253ec029aec4ee7aadb95c6f908030fb98b";
- sha256 = "1dbpxhs3ss91b9q4cvx8fl60zf7w8jad4cbm5cqpzhi6jfac5gxn";
+ rev = "db3499df5d06ab2cacc61e9f7720a33456aeafe4";
+ sha256 = "17ab5xln94z2ybvn8s9pivyd6xvi9h448fxjc8yk7605zsjmr9i0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -4080,12 +4143,12 @@
color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "color-theme-sanityinc-tomorrow";
- version = "1.16";
+ version = "1.17";
src = fetchFromGitHub {
owner = "purcell";
repo = "color-theme-sanityinc-tomorrow";
- rev = "55db9979397bd66446eb1927e08c5a22df9f0eea";
- sha256 = "0w99ypq048xldl1mrgc7qr4n2770dm48aknhp7q0176l43nvxnqf";
+ rev = "81d8990085960824f700520d08027e6aca58feaa";
+ sha256 = "1x3aq6hadp158vh8mf9hmj5rikq0qz7a1frv7vbl39xr3wcnjj23";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -4185,12 +4248,12 @@
company = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company";
- version = "0.9.0";
+ version = "0.9.2";
src = fetchFromGitHub {
owner = "company-mode";
repo = "company-mode";
- rev = "212c8fc3101781a2f1c55ca61772eb75a2046e87";
- sha256 = "04ffjwhk9y6slmxgmir08ilppy3q86qzhqg7v9kp0fzkwaap5fyf";
+ rev = "c9912e9ba7ef441677c1a9de7e14f78cb2da5e0e";
+ sha256 = "1jc9mnqj38lnn3yxkcixlwgqkxb7lsyzqybakk74mh3l3gr9cv8k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -4227,12 +4290,12 @@
company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-ansible";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "krzysztof-magosa";
repo = "company-ansible";
- rev = "9f22c09009734bd281fcbb89d8903a04b8a72b74";
- sha256 = "0z6ix3sihzzkk4jgi1qg5ma9wczzdl55kc0y93jnfn69yk3l0ikn";
+ rev = "2e3264670c861ecbe862f7618241367ab497b5ff";
+ sha256 = "0a0pb3amsxj6m8ka12ny1w9qjy3dg7vsxdsy1wg3qzanj2pdsk4l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible";
@@ -4353,12 +4416,12 @@
company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-emoji";
- version = "2.4.0";
+ version = "2.4.1";
src = fetchFromGitHub {
owner = "dunn";
repo = "company-emoji";
- rev = "3dad255d6928e28e7a700d8cbac060f87d43d25e";
- sha256 = "1g4dxps5s93ivs0ca6blia8spchdykny12c1gygm6jh9m6k7kfvh";
+ rev = "b971ab0a66126f0d1410254ba1e21f17c2270101";
+ sha256 = "1c9r1j7xpq6c27y6akfarrcg87idww3c10rkhm26m1vprqk73vr3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5733dccdffe97911a30352fbcda2900c33d79810/recipes/company-emoji";
@@ -4629,6 +4692,27 @@
license = lib.licenses.free;
};
}) {};
+ company-statistics = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "company-statistics";
+ version = "0.2.2";
+ src = fetchFromGitHub {
+ owner = "company-mode";
+ repo = "company-statistics";
+ rev = "906d8137224c1a5bd1dc913940e0d32ffecf5523";
+ sha256 = "0c98kfg7gimjx9cf8dmbk9mdsrybhphshrdl8dhif3zqvn6gxyd7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/89d05b43f31ec157ce8e7bfba4b7c9119bda6dd2/recipes/company-statistics";
+ sha256 = "1fl4ldj17m3xhi6xbw3bp9c2jir34xv3jh9daiw8g912fv2l5dcj";
+ name = "company-statistics";
+ };
+ packageRequires = [ company emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/company-statistics";
+ license = lib.licenses.free;
+ };
+ }) {};
company-tern = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tern }:
melpaBuild {
pname = "company-tern";
@@ -4671,22 +4755,22 @@
license = lib.licenses.free;
};
}) {};
- company-ycmd = callPackage ({ company, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, s, ycmd }:
+ company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }:
melpaBuild {
pname = "company-ycmd";
- version = "0.9";
+ version = "1.0";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "8fb29b84d42c0aea71fe7db088b0b7a5a0c6b34c";
- sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia";
+ rev = "be21ca7f807e70812b6fc0e0a4ea83b41723d815";
+ sha256 = "1q30k8rhk3plknkk544h2dk48yqmxwh4xp3rq1lz8isc3580qwxx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd";
sha256 = "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk";
name = "company-ycmd";
};
- packageRequires = [ company deferred s ycmd ];
+ packageRequires = [ company dash deferred f let-alist s ycmd ];
meta = {
homepage = "https://melpa.org/#/company-ycmd";
license = lib.licenses.free;
@@ -4839,6 +4923,27 @@
license = lib.licenses.free;
};
}) {};
+ copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "copy-as-format";
+ version = "0.0.1";
+ src = fetchFromGitHub {
+ owner = "sshaw";
+ repo = "copy-as-format";
+ rev = "e3e130a34d70deaa1ff81fe1e3b3898c1121c107";
+ sha256 = "1llkzvbw7ci4x20pqaacri82qplsfzxb20xw7v373i5jc83wjv9z";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
+ sha256 = "1yij5mqm0dg6326yms0a2w8gs42kdxq0ih8dhkpdar54r0bk3m8k";
+ name = "copy-as-format";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/copy-as-format";
+ license = lib.licenses.free;
+ };
+ }) {};
copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "copyit";
@@ -4923,6 +5028,27 @@
license = lib.licenses.free;
};
}) {};
+ counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+ melpaBuild {
+ pname = "counsel-bbdb";
+ version = "0.0.1";
+ src = fetchFromGitHub {
+ owner = "redguardtoo";
+ repo = "counsel-bbdb";
+ rev = "297d0c7e6e1eaafcd5e188724fea8e8f26b95555";
+ sha256 = "14gw4d855v2nvqh06vs9rzs816pn1hp4rhfikb0wzg1ay6gdrwi7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb";
+ sha256 = "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp";
+ name = "counsel-bbdb";
+ };
+ packageRequires = [ emacs ivy ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-bbdb";
+ license = lib.licenses.free;
+ };
+ }) {};
counsel-dash = callPackage ({ counsel, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, helm-dash, lib, melpaBuild }:
melpaBuild {
pname = "counsel-dash";
@@ -4944,6 +5070,27 @@
license = lib.licenses.free;
};
}) {};
+ counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "counsel-gtags";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "syohex";
+ repo = "emacs-counsel-gtags";
+ rev = "8066dd4cd6eb157345fb43788bacf2c5d746b497";
+ sha256 = "07kxv56p340a913673h30q65814ji7lwc6gsn9vcr18rsdaj7qwi";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags";
+ sha256 = "12qyb1lnzyd2rr4ankpqi30h0bj66ap5qw87y4605k0j44vhnsax";
+ name = "counsel-gtags";
+ };
+ packageRequires = [ counsel emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-gtags";
+ license = lib.licenses.free;
+ };
+ }) {};
coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }:
melpaBuild {
pname = "coverage";
@@ -5049,22 +5196,22 @@
license = lib.licenses.free;
};
}) {};
- cricbuzz = callPackage ({ enlive, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "cricbuzz";
- version = "0.2.3";
+ version = "0.2.8";
src = fetchFromGitHub {
owner = "lepisma";
repo = "cricbuzz.el";
- rev = "7c0c495312c18bc6c8db9ddad94efbd4b6328a9b";
- sha256 = "0jvr6ya40qq9q064k2gzkrqw00xffjmslfjxa2xz2vi25m6jyv92";
+ rev = "5fe51347f5d6e7636ece5e904e4bdec0be21db45";
+ sha256 = "1x29garhp1x5h1mwbamwjnfw52w45b39aqxsvcdxmcf730w9pq63";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/906b144e01aed96d62efbc34a8af2973135f6194/recipes/cricbuzz";
sha256 = "1ad2afyn3xny3rgb8yy6w87f33idlrmis1vx0b6s8ppafv9z74j0";
name = "cricbuzz";
};
- packageRequires = [ enlive ];
+ packageRequires = [ dash enlive s ];
meta = {
homepage = "https://melpa.org/#/cricbuzz";
license = lib.licenses.free;
@@ -5154,6 +5301,27 @@
license = lib.licenses.free;
};
}) {};
+ csv = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "csv";
+ version = "2.1";
+ src = fetchFromGitLab {
+ owner = "u11";
+ repo = "csv.el";
+ rev = "aa1dfa1263565d5fac3879c21d8ddf5f8915e411";
+ sha256 = "1vmazjrfcsa9aa9aw8bq5sazdhqvhxyj837dyw5lmh8gk7z0xdaa";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/233f9de5f65fd8374f2c1912503c30905aa6691d/recipes/csv";
+ sha256 = "1rvi5p27lsb284zqgv4cdqkbqc9r92axmvg7sv52rm7qcj8njwqd";
+ name = "csv";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/csv";
+ license = lib.licenses.free;
+ };
+ }) {};
ctable = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ctable";
@@ -5302,12 +5470,12 @@
cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cython-mode";
- version = "0.25.1";
+ version = "0.25.2";
src = fetchFromGitHub {
owner = "cython";
repo = "cython";
- rev = "278a567621d586af74a1c845de0a1426b686c72e";
- sha256 = "0wqnjcspdysn0fd4ckd49wbvi4x2gbl91asgrmijac1lq6k9vj2j";
+ rev = "c9bcf1bed3acf367d6deb0c273cf22db0f18dab2";
+ sha256 = "16yd296n0nh96pnkjpdbdz4i7ga4j961pkzm3cbnika26xwndx03";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -5323,12 +5491,12 @@
d-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "d-mode";
- version = "2.0.8";
+ version = "2.0.9";
src = fetchFromGitHub {
owner = "Emacs-D-Mode-Maintainers";
repo = "Emacs-D-Mode";
- rev = "71ab5eb661851dd4bfa8a589b1001991ee6c3f31";
- sha256 = "0kbncsaxj93jd79sd6dkap29fz8z100wi1nk0njd568glm8q4k5g";
+ rev = "98af62e67026fee1dda9155e1a463917fc83802e";
+ sha256 = "0fzplvi1sm8k2sabfdvrd7j2xypwqh0g9v1mxa75dajdmcd85zpj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3c13e9ccc358743de660b1f0e89d6bb709c42bff/recipes/d-mode";
@@ -5446,6 +5614,27 @@
license = lib.licenses.free;
};
}) {};
+ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }:
+ melpaBuild {
+ pname = "dashboard";
+ version = "1.0.3";
+ src = fetchFromGitHub {
+ owner = "rakanalh";
+ repo = "emacs-dashboard";
+ rev = "cd9899342bc94e59aa42275554810e50d045aaa4";
+ sha256 = "1klmjdym4w3cbarabzvkxddjdcisfk62wkpys3z4nclp4g91p8as";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b047625aebdbf7b5d644b55afbdccfc6c4ac14a8/recipes/dashboard";
+ sha256 = "04lp8ylfnbdj65s8z0m5kyj4rwxcsdwinlkpj00j1my0m74y5i0p";
+ name = "dashboard";
+ };
+ packageRequires = [ emacs page-break-lines ];
+ meta = {
+ homepage = "https://melpa.org/#/dashboard";
+ license = lib.licenses.free;
+ };
+ }) {};
date-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "date-at-point";
@@ -5509,6 +5698,27 @@
license = lib.licenses.free;
};
}) {};
+ debpaste = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
+ melpaBuild {
+ pname = "debpaste";
+ version = "0.1.5";
+ src = fetchFromGitHub {
+ owner = "alezost";
+ repo = "debpaste.el";
+ rev = "6f2a400665062468ebd03a2ce1de2a73d9084958";
+ sha256 = "1wi70r56pd5z0x4dp4m58p9asq03j74kdm4fi9vai83vsl2z9amq";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/13098bae76a3386689a9bf9c12f25b9a9b15145c/recipes/debpaste";
+ sha256 = "1vgirfy4vdqkhllnnmcplhwmzqqwca3la5jfvvansykqriwbq9lw";
+ name = "debpaste";
+ };
+ packageRequires = [ xml-rpc ];
+ meta = {
+ homepage = "https://melpa.org/#/debpaste";
+ license = lib.licenses.free;
+ };
+ }) {};
decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "decide";
@@ -5951,12 +6161,12 @@
dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-icon";
- version = "0.3";
+ version = "0.4";
src = fetchFromGitLab {
owner = "xuhdev";
repo = "dired-icon";
- rev = "7fc95de6d7722b304124a890e4fb577e16897b1f";
- sha256 = "079vcbdgn4fgbi1kkcf3na3cwmkm41mx43f4gkbzk8hv4vzgr4kb";
+ rev = "bd10690402aa451e65cbadb192356386cd855abd";
+ sha256 = "1millrv2rgiswnh9hrprqx2lmbi9h8fasgin5clhixafhmp9l6sf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d0947148441ed48f92f4cfaaf39c2a9aadda48/recipes/dired-icon";
@@ -5990,22 +6200,22 @@
license = lib.licenses.free;
};
}) {};
- dired-k = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ dired-k = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-k";
- version = "0.18";
+ version = "0.19";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-dired-k";
- rev = "57f263b42ea83c6a1cf391fcccffd0f36d213f35";
- sha256 = "1w2grc91m71k9mr4n423vbnakkqg6vc10bham869xs3yr8fs7nay";
+ rev = "3f0b9315f87b0f930d51089e311d41282d5f8b15";
+ sha256 = "09xh097v3fd0mjxqlmbfwjlr1v4a99mj4rvwdb6kqgajmlhgi9hx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7/recipes/dired-k";
sha256 = "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8";
name = "dired-k";
};
- packageRequires = [ cl-lib emacs ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/dired-k";
license = lib.licenses.free;
@@ -6312,6 +6522,27 @@
license = lib.licenses.free;
};
}) {};
+ docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "docker-tramp";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "emacs-pe";
+ repo = "docker-tramp.el";
+ rev = "d8b510365d8e65551f4f792f251e7212411708c3";
+ sha256 = "0lxvzmfg52fhxrhbvp92zwp7cv4i1rlxnkyyzgngj3sjm7y60yvg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker-tramp";
+ sha256 = "19kky80qm68n2izpjfyiy4gjywav7ljcmp101kmziklpqdldgh1w";
+ name = "docker-tramp";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/docker-tramp";
+ license = lib.licenses.free;
+ };
+ }) {};
dockerfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dockerfile-mode";
@@ -6462,12 +6693,12 @@
drag-stuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "drag-stuff";
- version = "0.2.0";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "rejeep";
repo = "drag-stuff.el";
- rev = "07332b9f4725ad11d123e0fc5593c0c1c37db381";
- sha256 = "131ww26pb97q2gyjhfrsf7nw2pi5b1kba0cgl97qc017sfhg92v6";
+ rev = "d49fe376d24f0f8ac5ade67b6d7fccc2487c81db";
+ sha256 = "1jrr59iazih3imkl9ja1lbni9v3xv6b8gmqs015g2mxhlql35jka";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/drag-stuff";
@@ -6564,35 +6795,14 @@
license = lib.licenses.free;
};
}) {};
- dummy-h-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "dummy-h-mode";
- version = "1.0.1";
- src = fetchFromGitHub {
- owner = "yascentur";
- repo = "dummy-h-mode-el";
- rev = "27ad0991abb53e65d0402ef6c378075e4be0ed2d";
- sha256 = "033yqc19xxirbva65lz8hnwxj7pn7fx7dlnf70kq71iqclqa4v25";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/dummy-h-mode";
- sha256 = "10lzfzq7md6s28w2zzlhswn3d6765g4vqzyjn2q5ms8pd2i4b4in";
- name = "dummy-h-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/dummy-h-mode";
- license = lib.licenses.free;
- };
- }) {};
dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dyalog-mode";
- version = "0.3";
+ version = "0.7";
src = fetchhg {
url = "https://bitbucket.com/harsman/dyalog-mode";
- rev = "18cd7ba257ca";
- sha256 = "0lf6na6yvdk5n9viy08cdwbgphlcxksynbkvi2f02saxdzdy368v";
+ rev = "20a2166c8210";
+ sha256 = "0gz0aiks3f53lqvnrnb33a1clq52ipd3i3miymvkkgspnz3vl12p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -7175,12 +7385,12 @@
egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "egison-mode";
- version = "3.6.1";
+ version = "3.6.3";
src = fetchFromGitHub {
owner = "egisatoshi";
repo = "egison3";
- rev = "80aaf63ffa357df2106a192ee04eef54a8dae2fd";
- sha256 = "0wnyyl70jssdwgcd9im5jwxnpn7l07d0v6dx9y8546d254xdwpwx";
+ rev = "4cf38946096c185ac794d594a791da23675297aa";
+ sha256 = "0k6qh99jbzirgsa3qkhcxsivncbvk5wr4yag2s9c2y9akipxivrq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -7401,27 +7611,6 @@
license = lib.licenses.free;
};
}) {};
- elang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
- melpaBuild {
- pname = "elang";
- version = "0.0.1";
- src = fetchFromGitHub {
- owner = "vkazanov";
- repo = "elang";
- rev = "ae42437603d6dc84d3850bc45496a82b8583703e";
- sha256 = "0hlj6jn9gmi00sqghxswkxpgk65c4gy2k7010vpkr2257rd4f3gq";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1cb66c2a6272a804d7a81fc506643e80f11da306/recipes/elang";
- sha256 = "0frhn3hm8351qzljicpzars28af1fghgv45717ml79rwb4vi6yiy";
- name = "elang";
- };
- packageRequires = [ names ];
- meta = {
- homepage = "https://melpa.org/#/elang";
- license = lib.licenses.free;
- };
- }) {};
eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eldoc-eval";
@@ -7527,6 +7716,27 @@
license = lib.licenses.free;
};
}) {};
+ elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
+ melpaBuild {
+ pname = "elisp-refs";
+ version = "1.1";
+ src = fetchFromGitHub {
+ owner = "Wilfred";
+ repo = "refs.el";
+ rev = "e309c87a91012305ecb37124a758609c64e0ca4a";
+ sha256 = "0wvz5ysaj2dnqhkp5xdqsm45fxwlhym5j8rn4g0h7g7zwdi3c6c6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
+ sha256 = "16h7dccmzvmap3knnwhjq79wm82xm3whria70vq5msl2y252f6cx";
+ name = "elisp-refs";
+ };
+ packageRequires = [ dash f list-utils loop s ];
+ meta = {
+ homepage = "https://melpa.org/#/elisp-refs";
+ license = lib.licenses.free;
+ };
+ }) {};
elisp-slime-nav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elisp-slime-nav";
@@ -7593,12 +7803,12 @@
elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
melpaBuild {
pname = "elm-mode";
- version = "0.19.9";
+ version = "0.20.3";
src = fetchFromGitHub {
owner = "jcollard";
repo = "elm-mode";
- rev = "a842d54348846746ef249a87ac7961a9a787947f";
- sha256 = "1ycbc2dz8qmdxpac6yz4dxp531r50nhzdxaknm5iwz6d94pcfgni";
+ rev = "29f50a940113d793a21998f3bb414fdd9b0c5daa";
+ sha256 = "02c7xl9w81140l7p9kywr5qwsdyv92nxdhzqcxjk0r09x7s0cvsk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -7727,8 +7937,8 @@
sha256 = "1h0k3nvxy84wjsiiwpxd8xnwnvbiqld26ndv6wmxqpwsjav186ik";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a36daf2b034653cd73ee2db2bc30df2a5be6f3d1/recipes/elpy";
- sha256 = "0n802bh7jj9zgz84xjrxvy33jl6s3hj5dqxafyfr87fank97hb6d";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
+ sha256 = "1ri3dwnkw005plj1g5grmmq9np41sqk4s2v18pwsvr18ysnq6nnr";
name = "elpy";
};
packageRequires = [
@@ -8016,22 +8226,22 @@
license = lib.licenses.free;
};
}) {};
- emamux = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ emamux = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emamux";
- version = "0.13";
+ version = "0.14";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-emamux";
- rev = "53177ca59ed2824cc0837677af5a13a580691a71";
- sha256 = "1a9925n0jcgxcgiz2kmh9zbb1rg9039rlrbr9fr80by9znfwmy67";
+ rev = "573dd1cf18584a1fd240efb16c7726b6fd790b73";
+ sha256 = "19y69qw79miim9cz5ji54gwspjkcp9g2c1xr5s7jj2fiabnxax6b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6de1ed3dfccb9f7e7b8586e8334af472a4988840/recipes/emamux";
sha256 = "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz";
name = "emamux";
};
- packageRequires = [ cl-lib emacs ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/emamux";
license = lib.licenses.free;
@@ -8122,12 +8332,12 @@
emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emms-player-mpv";
- version = "0.0.10";
+ version = "0.0.11";
src = fetchFromGitHub {
owner = "dochang";
repo = "emms-player-mpv";
- rev = "d3e3bace6b648f5b60d833a72a50603545102934";
- sha256 = "1kmkza1x1xajdswdmvxasglpr8fl9vr1pi3yhi7a9cqqa5s1y2ah";
+ rev = "ce142304d1fe6b096b9b984e40e55c8cc54217c1";
+ sha256 = "1s8jmkcr11fp93hmyxq7c781lx7krc5xsk99ar0h50v2hpnmzgbb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv";
@@ -8431,6 +8641,27 @@
license = lib.licenses.free;
};
}) {};
+ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "epkg";
+ version = "2.0.0";
+ src = fetchFromGitHub {
+ owner = "emacscollective";
+ repo = "epkg";
+ rev = "de33177656d8f48b65abbb71ab4d25b7bd799dee";
+ sha256 = "0lhb8b4i8r8a6pagwa0p3iqb1bk25as4nd4pjwbdjn0800ncv9nh";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
+ sha256 = "0vvkjjaffvwvsvld3c6hwd18icmp2lc7f9yqvclifpadi98dhpww";
+ name = "epkg";
+ };
+ packageRequires = [ closql dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/epkg";
+ license = lib.licenses.free;
+ };
+ }) {};
epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "epl";
@@ -8643,12 +8874,12 @@
erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erlang";
- version = "19.1.5";
+ version = "19.2";
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
- rev = "926391fbb8761d5833b3a6f5c9e523fcda373c6d";
- sha256 = "1bbwnpam05rcsivmrh13mkcyb04a08d1fyb4y5w0y0gdpbzn7jq9";
+ rev = "3473ecd83a7bbe7e0bebb865f25dddb93e3bf10f";
+ sha256 = "06pr4ydrqpp1skx85zjb1an4kvzv6vacb771vy71k54j7w6lh9hk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -8849,22 +9080,22 @@
license = lib.licenses.free;
};
}) {};
- eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eshell-git-prompt";
- version = "0.1";
+ version = "0.1.1";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "eshell-git-prompt";
- rev = "826d2ebdec0808493955a4544dc91b575f6c4ecf";
- sha256 = "00gaq8vz8vnhh0j2i66mp763hm3dfxkxz3j782nsfml81sngkww0";
+ rev = "fb56e851c1baac68249c34043bd5db9c9420141e";
+ sha256 = "08mhjps17w3kfmmbdws1lqzphr2ayl160i0ckd4552jdyzd28vvs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5272280b19579c302ba41b53c77e42bc5e8ccbda/recipes/eshell-git-prompt";
sha256 = "0a8pyppqvnavvb8rwsjxagb76hra9zhs5gwa0ylyznmql83f8w8s";
name = "eshell-git-prompt";
};
- packageRequires = [ cl-lib dash emacs s ];
+ packageRequires = [ cl-lib dash emacs ];
meta = {
homepage = "https://melpa.org/#/eshell-git-prompt";
license = lib.licenses.free;
@@ -8894,12 +9125,12 @@
eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eshell-z";
- version = "0.2.1";
+ version = "0.3.1";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "eshell-z";
- rev = "cc9a4b505953a9b56222896a6f973145aeb154b9";
- sha256 = "179xqh0rs8w3d03gygg9sy4qp5xqgfgl4c0ycrknip9zrnbmph4i";
+ rev = "033924f138f19f22a30c1845e728691e5615fa38";
+ sha256 = "0kp9yw56l8bl4zqganclnpf6x5g2rmcf23265n8cp24j6d7c7r4h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8079cecaa59ad2ef22812960838123effc46a9b3/recipes/eshell-z";
@@ -9208,12 +9439,12 @@
evil-colemak-basics = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-colemak-basics";
- version = "1.0.0";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "wbolster";
repo = "evil-colemak-basics";
- rev = "4be54df939035daa039e323a95c052f7c99b6f51";
- sha256 = "1n7nw5mzpwzp8r791qsis2f2ak5f0m2d129r0wmbyx9zykx5rm7v";
+ rev = "f976bda20098c43be1418c36520a57467c8c6c13";
+ sha256 = "18f1k4z7lkh237sz4p1xz4sxzs41ywmvd6dj7k9b6d9dscv3yxws";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics";
@@ -9373,22 +9604,22 @@
license = lib.licenses.free;
};
}) {};
- evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-matchit";
- version = "2.1.6";
+ version = "2.2.1";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "evil-matchit";
- rev = "51d46747e39dc247ea4b72839421b85f53d487be";
- sha256 = "15fr19gv2rf8pvns7r0jmy1z2f08bjprqxz3hj1fzn9wgc42iwg7";
+ rev = "e9f77f7d6a14434a8ca3280d721b96c0984fa7eb";
+ sha256 = "11mhgw0xa8kn73svgvzpmvvnkj2ja4mxs030vlzkh4scvlfa98dl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq";
name = "evil-matchit";
};
- packageRequires = [];
+ packageRequires = [ evil ];
meta = {
homepage = "https://melpa.org/#/evil-matchit";
license = lib.licenses.free;
@@ -9397,12 +9628,12 @@
evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-mc";
- version = "0.0.2";
+ version = "0.0.3";
src = fetchFromGitHub {
owner = "gabesoft";
repo = "evil-mc";
- rev = "ccda120de2fea505147a85232c9500285edd98e8";
- sha256 = "199wcxjqyr9grvw0kahzhkh8kcg53baxhahizrknwav8mpmrvj9z";
+ rev = "be2259b8cedd62011b25ddbcc1774bbbe9a66c61";
+ sha256 = "0p435ykkq41nksd40qczlhz6kvs2zpkxch661wy0w93wffwnq3b9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc";
@@ -9481,12 +9712,12 @@
evil-opener = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, opener }:
melpaBuild {
pname = "evil-opener";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchFromGitHub {
owner = "0robustus1";
repo = "opener.el";
- rev = "ad3c65a5a748230bf07c18f56b1998ac03e3807a";
- sha256 = "178h7sbpgsn0xl93j7375f2ahmqcszmbl3f7mfb6vgjmm791q03p";
+ rev = "c384f67278046fdcd220275fdd212ab85672cbeb";
+ sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/da8d4e5bf23985632f993336b9183fe9f480addc/recipes/evil-opener";
@@ -9880,12 +10111,12 @@
eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eyebrowse";
- version = "0.7.1";
+ version = "0.7.2";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "eyebrowse";
- rev = "41344e2aa2a919eae62ecedf80dcd41456084bcc";
- sha256 = "1b9341qqzr43sq0mjb2rkc5r9a2fyzwh1dm2qh27rcsb3vg219h2";
+ rev = "a009536514409fdf0a1745504a7d7e0e376cc2c9";
+ sha256 = "0kw13w3q1q4gb3ql728bk9m0rymkp21rrjmy4hyx8im84xh093ls";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse";
@@ -10153,12 +10384,12 @@
find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "find-file-in-project";
- version = "5.2.5";
+ version = "5.2.7";
src = fetchFromGitHub {
owner = "technomancy";
repo = "find-file-in-project";
- rev = "2b7e35e5121beba73309acd8e9586987e8e2b8a6";
- sha256 = "0wm2ddv1198wmgppigk68n3g6qcfcj446xcpf2fy7s29ck71scm1";
+ rev = "1ac2c0a717a1a0b70839625f2aaad2c18c21f729";
+ sha256 = "0vmigmbr4fc36sahpf0bj65isa4sf1xhn1v2qvnidbx8qg18hm2f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -10724,6 +10955,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-objc-clang";
+ version = "1.0.2";
+ src = fetchFromGitHub {
+ owner = "GyazSquare";
+ repo = "flycheck-objc-clang";
+ rev = "3140e4c74dbaa10e6f8edd794144d07399a8fda8";
+ sha256 = "0zzb03qxfs5wky40hzmldkzq5gn4c7qknkd5ra2lghzj0az6n9ld";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
+ sha256 = "07mzwd04a69d7xpkjmhfmf95j69h6accnf9bb9br7jb1hi9vdalp";
+ name = "flycheck-objc-clang";
+ };
+ packageRequires = [ emacs flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-objc-clang";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, merlin }:
melpaBuild {
pname = "flycheck-ocaml";
@@ -10787,22 +11039,22 @@
license = lib.licenses.free;
};
}) {};
- flycheck-pos-tip = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }:
+ flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }:
melpaBuild {
pname = "flycheck-pos-tip";
- version = "0.1";
+ version = "0.3";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck-pos-tip";
- rev = "0c2b31b615fa294f329f3cc387b464525ce3392d";
- sha256 = "0v23yc8znzjp44lrpfzqb4hc3psad14hsnvqcp8f1yyhgvdx35n8";
+ rev = "3f1d5297fdff44a14ee624160eefdc678e2bd0bd";
+ sha256 = "0qxx3xdgk5l793yg5ffbi5qhrxrf6akwdz93n2vibpkdjkvzyh2y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/698843f75e17b9e6160487c0153f9d6b4af288f6/recipes/flycheck-pos-tip";
sha256 = "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9";
name = "flycheck-pos-tip";
};
- packageRequires = [ dash flycheck pos-tip ];
+ packageRequires = [ emacs flycheck pos-tip ];
meta = {
homepage = "https://melpa.org/#/flycheck-pos-tip";
license = lib.licenses.free;
@@ -10871,6 +11123,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-swift3";
+ version = "1.0.5";
+ src = fetchFromGitHub {
+ owner = "GyazSquare";
+ repo = "flycheck-swift3";
+ rev = "846b3045d018a13cadb8a8bfde83587802d7e1a2";
+ sha256 = "06wzsi3lw938mc8sz06jxyclxpvrlyjgvs9998kpiyhz752sgfsw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
+ sha256 = "05yfrn42svcvdkr8mx16ii8llhzn33lxdawksjqiqg671s6fgdpa";
+ name = "flycheck-swift3";
+ };
+ packageRequires = [ emacs flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-swift3";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
melpaBuild {
pname = "flycheck-tip";
@@ -10892,22 +11165,22 @@
license = lib.licenses.free;
};
}) {};
- flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, ycmd }:
+ flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }:
melpaBuild {
pname = "flycheck-ycmd";
- version = "0.9";
+ version = "1.0";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "8fb29b84d42c0aea71fe7db088b0b7a5a0c6b34c";
- sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia";
+ rev = "be21ca7f807e70812b6fc0e0a4ea83b41723d815";
+ sha256 = "1q30k8rhk3plknkk544h2dk48yqmxwh4xp3rq1lz8isc3580qwxx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd";
sha256 = "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv";
name = "flycheck-ycmd";
};
- packageRequires = [ dash emacs flycheck ycmd ];
+ packageRequires = [ dash emacs flycheck let-alist ycmd ];
meta = {
homepage = "https://melpa.org/#/flycheck-ycmd";
license = lib.licenses.free;
@@ -11273,12 +11546,12 @@
flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flyspell-correct";
- version = "0.3";
+ version = "0.4";
src = fetchFromGitHub {
owner = "d12frosted";
repo = "flyspell-correct";
- rev = "d50f3661ad545b30acac4c8819eda2238ff375fc";
- sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig";
+ rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73";
+ sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct";
@@ -11294,12 +11567,12 @@
flyspell-correct-helm = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, helm, lib, melpaBuild }:
melpaBuild {
pname = "flyspell-correct-helm";
- version = "0.3";
+ version = "0.4";
src = fetchFromGitHub {
owner = "d12frosted";
repo = "flyspell-correct";
- rev = "d50f3661ad545b30acac4c8819eda2238ff375fc";
- sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig";
+ rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73";
+ sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm";
@@ -11315,12 +11588,12 @@
flyspell-correct-ivy = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, ivy, lib, melpaBuild }:
melpaBuild {
pname = "flyspell-correct-ivy";
- version = "0.3";
+ version = "0.4";
src = fetchFromGitHub {
owner = "d12frosted";
repo = "flyspell-correct";
- rev = "d50f3661ad545b30acac4c8819eda2238ff375fc";
- sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig";
+ rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73";
+ sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy";
@@ -11336,12 +11609,12 @@
flyspell-correct-popup = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, lib, melpaBuild, popup }:
melpaBuild {
pname = "flyspell-correct-popup";
- version = "0.3";
+ version = "0.4";
src = fetchFromGitHub {
owner = "d12frosted";
repo = "flyspell-correct";
- rev = "d50f3661ad545b30acac4c8819eda2238ff375fc";
- sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig";
+ rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73";
+ sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup";
@@ -11420,12 +11693,12 @@
focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "focus";
- version = "0.1.0";
+ version = "0.1.1";
src = fetchFromGitHub {
owner = "larstvei";
repo = "Focus";
- rev = "0a6e9624ea5607dadd0f2cd4d3eaa2b10b788eb9";
- sha256 = "0aj5qxzlfxxp7z27fiw9bvir5yi2zj0xzj5kbh17ix4wnhi03bhc";
+ rev = "75202c9445f52eab6fb82f00006f37cd20dae6b2";
+ sha256 = "1v9y3dp7sd4rsm31myp3l1jxpwjw3madajb6yz9rw0yhdirfwgbg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus";
@@ -11909,12 +12182,12 @@
gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gams-mode";
- version = "6.1";
+ version = "6.1.2";
src = fetchFromGitHub {
owner = "ShiroTakeda";
repo = "gams-mode";
- rev = "268ee8b4554446104d200de3ffbd2f067b20cb3f";
- sha256 = "16x3fz2ljrmqhjy7w96fhp3j9ja2gib042c363yfrzwa7q5rxzd2";
+ rev = "a803f9e4509b8f8fed17ef25737d941bbe846c96";
+ sha256 = "1avbdfw3hvwqnrlg3hv8p64m9gqgvwl9ggqzn6rhxh1zlr7i5cwy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode";
@@ -12287,12 +12560,12 @@
git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
melpaBuild {
pname = "git-commit";
- version = "2.8.0";
+ version = "2.9.0";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "570a0320bdd7437fc35a36d78a1c28e1ee19ce88";
- sha256 = "040wc4nj9r3vlma42sc24x4w25rm2kpzwyq44jw3njjk3b7q9avp";
+ rev = "acb8efe770b55ae23f24cf8d2dc4e62bc37c1b88";
+ sha256 = "11vhdz75yqp0c9vp64mv2c2bh4dwb8skvix5gbqhfykd5wa565ay";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -12704,6 +12977,27 @@
license = lib.licenses.free;
};
}) {};
+ gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
+ melpaBuild {
+ pname = "gitter";
+ version = "1";
+ src = fetchFromGitHub {
+ owner = "xuchunyang";
+ repo = "gitter.el";
+ rev = "bd2ba457109dd5d3e4b419e3ef5cbd3b5c9498d6";
+ sha256 = "1fzl40bwdfbcq55p3kvbzjqr5w0703imzgrmqcf4f6jhav127zk6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b8076c3b4d60e4c505bb6f4e426ecc4f69d74684/recipes/gitter";
+ sha256 = "1ad5abqgfh6x2fcqbbdvgbg8xin69j0h93z7bav1hs3jla7mgwnv";
+ name = "gitter";
+ };
+ packageRequires = [ emacs let-alist ];
+ meta = {
+ homepage = "https://melpa.org/#/gitter";
+ license = lib.licenses.free;
+ };
+ }) {};
glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "glab";
@@ -12788,27 +13082,6 @@
license = lib.licenses.free;
};
}) {};
- gnome-calendar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "gnome-calendar";
- version = "0.2";
- src = fetchFromGitHub {
- owner = "NicolasPetton";
- repo = "gnome-calendar.el";
- rev = "58c3a3c32aff9901c679bdf9091ed934897b84a0";
- sha256 = "160qm8xf0yghygb52p8cykhb5vpg9ww3gjprcdkcxplr4b230nnc";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8e497668d65f0eabd15e39b7492adb395a5a8e75/recipes/gnome-calendar";
- sha256 = "00clamlm5b42zqggxywdqrf6s2dnsxir5rpd8mjpyc502kqmsfn6";
- name = "gnome-calendar";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/gnome-calendar";
- license = lib.licenses.free;
- };
- }) {};
gntp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gntp";
@@ -12893,22 +13166,22 @@
license = lib.licenses.free;
};
}) {};
- go-add-tags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ go-add-tags = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "go-add-tags";
- version = "0.3";
+ version = "0.4";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-go-add-tags";
- rev = "facff8dbb65fb56874d63a63edfd072eceed7904";
- sha256 = "14bflgc9s9hslwisf4id0pc3asr5qvppwn1w14vvij3plal4mfhi";
+ rev = "54879945e46a0884c5f93d7fd6c866a9cdf401ac";
+ sha256 = "1gr65skrd41pk46ilfsbxfdng4br6h9c6blf1q1wx6i9ylhs0ak5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/55d3b893bd68d3d2d86ecdbb4ed442edd256516a/recipes/go-add-tags";
sha256 = "0nvas44rsvqzk2ay5bhzkbrnzql13vnxq9pk4lp4mvp86dda9qim";
name = "go-add-tags";
};
- packageRequires = [ cl-lib emacs s ];
+ packageRequires = [ emacs s ];
meta = {
homepage = "https://melpa.org/#/go-add-tags";
license = lib.licenses.free;
@@ -13001,12 +13274,12 @@
go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild {
pname = "go-impl";
- version = "0.12";
+ version = "0.13";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-go-impl";
- rev = "d4cd57e5d1769ffe3a8078572f0be73737184099";
- sha256 = "059y2gkvvjhjbaw31zlylr0zmbafcjif01zjq13hvvghjqd6r89b";
+ rev = "1827d2efe1f6023cf3954c0056aaa531124c41c1";
+ sha256 = "1rcqrsvw74lrzs03bg9zslmkf5ka4a3h06b5hhdgiv4iimapz5sq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl";
@@ -13040,6 +13313,27 @@
license = lib.licenses.free;
};
}) {};
+ go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }:
+ melpaBuild {
+ pname = "go-playground";
+ version = "1.0";
+ src = fetchFromGitHub {
+ owner = "grafov";
+ repo = "go-playground";
+ rev = "2e1497517d13d813768b3f8e25bb3cce7a449acd";
+ sha256 = "08ka2wlwq5v13ni8n5zd5vp4iynwcirsqdw0an20gqg0hrcvs1ba";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground";
+ sha256 = "1rabwc80qwkafq833m6a199zfiwwmf0hha89721gc7i0myk9pac6";
+ name = "go-playground";
+ };
+ packageRequires = [ emacs go-mode gotest ];
+ meta = {
+ homepage = "https://melpa.org/#/go-playground";
+ license = lib.licenses.free;
+ };
+ }) {};
go-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild {
pname = "go-scratch";
@@ -13064,12 +13358,12 @@
godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "godoctor";
- version = "0.0.7";
+ version = "0.0.9";
src = fetchFromGitHub {
owner = "microamp";
repo = "godoctor.el";
- rev = "3482c9b119aeb3d81c1a07876bde5cdafe933ede";
- sha256 = "1shcxjhkk3l4vn1v16p86cxs00w5v02nmx2ariid5qrq2636gv8z";
+ rev = "f892a4dbabe61186540d6035c5185fd929a6a543";
+ sha256 = "1cg09mihvqchgvdxwlrg9vcdj1kvmmy8zmlkscxi6smaxbi0yvjm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0e23e1362ff7d477ad9ce6cfff694db989dfb87b/recipes/godoctor";
@@ -13253,12 +13547,12 @@
govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
melpaBuild {
pname = "govc";
- version = "0.11.2";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "vmware";
repo = "govmomi";
- rev = "cd80b8e8a7075484941720e24faa3c9a98cfa2cc";
- sha256 = "0l6vlh8sszsxjs49xsiwfbzcbc55fmiry96g3h1p358nfrg20017";
+ rev = "ab40ac7324b5d45b8f1677d87ec0d26349448d41";
+ sha256 = "0rb55f4yx8wpqs93xy80wn6k8pyrhj8zh3q5lbi78afgscjrgjlr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -13292,6 +13586,27 @@
license = lib.licenses.free;
};
}) {};
+ grab-x-link = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "grab-x-link";
+ version = "0.4.1";
+ src = fetchFromGitHub {
+ owner = "xuchunyang";
+ repo = "grab-x-link";
+ rev = "d2ef886097f59e1facc5cb5d8cd1c77bf340be76";
+ sha256 = "1iny8ga9xb7pfd59l4ljlj6zvvxzr7bv468sibkhlaqvjljn2xq1";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/64d4d4e6f9d6a3ea670757f248afd355baf1d933/recipes/grab-x-link";
+ sha256 = "1kni49n1v716w4hjfm49mk25jshfc6idpby0k58qvngbfqk3kzy5";
+ name = "grab-x-link";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/grab-x-link";
+ license = lib.licenses.free;
+ };
+ }) {};
gradle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "gradle-mode";
@@ -13400,12 +13715,12 @@
graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-ubiquitous, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
melpaBuild {
pname = "graphene";
- version = "0.9.6";
+ version = "0.9.7";
src = fetchFromGitHub {
owner = "rdallasgray";
repo = "graphene";
- rev = "47c5a194f81796eface2e2f062144c17ee3cfdb7";
- sha256 = "0xx3cnwbbil6d7y15d61wkp777w4j5rsdm7gwd5gpcr8910405n2";
+ rev = "b25707ae82e286aefa5a66087b12c9cb3b7bf2ed";
+ sha256 = "1h21fv8plxydydm509immp0kpkf24ba6j3wrbpvp5w4nkx49mlkl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene";
@@ -13433,12 +13748,12 @@
graphene-meta-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "graphene-meta-theme";
- version = "0.0.4";
+ version = "0.0.5";
src = fetchFromGitHub {
owner = "rdallasgray";
repo = "graphene-meta-theme";
- rev = "ba3c197b6331668c4fcee4053594ba1bd34929b6";
- sha256 = "0qbk53r97h234f2vj8ndf57kardaz2g2dgf35i08j9b416aw6ck5";
+ rev = "62cc73fee31f1bd9474027b83a249feee050271e";
+ sha256 = "1ydl6dlg5z4infq8j09izwgs6n97yza6nbq5rs1xfv00zd9gr63c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/44af719ede73c9fe7787272d7868587ce8966e3d/recipes/graphene-meta-theme";
@@ -13499,8 +13814,8 @@
version = "0.1";
src = fetchhg {
url = "https://bitbucket.com/tws/grass-mode.el";
- rev = "fe70088c54b9";
- sha256 = "0prqgkbn0gm8g0fapkcd8192yyl2h3agn7qrlf5vrfx6780bsyw0";
+ rev = "c7e2817461c3";
+ sha256 = "095v1l46axada3vnhp1ypim6b789y39jlyy5466im02fjfjkcadg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode";
@@ -13742,6 +14057,27 @@
license = lib.licenses.free;
};
}) {};
+ gxref = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "gxref";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "dedi";
+ repo = "gxref";
+ rev = "15723a9d910d7dd9ea18cab0336332cf988aeceb";
+ sha256 = "1l5d1kh2dy3w42i8c3z63c7mzarxixxiby2g7ay2i809yxj10y1n";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/429b9150d4054fcadab8c5ca3b688921eeb19b78/recipes/gxref";
+ sha256 = "06qlfjclfx00m8pr7lk6baim3vjk5i0m75i1p4aihp2vflvgjaby";
+ name = "gxref";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/gxref";
+ license = lib.licenses.free;
+ };
+ }) {};
hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "hackernews";
@@ -14080,12 +14416,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "2.3.1";
+ version = "2.3.3";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "b8193725f2c3ab20f2907171374ee762e397739d";
- sha256 = "13hwwihiy05dszhwb2zxzjqsgf7589zdirdmfxqsw0l224p0hcdd";
+ rev = "2fca3400574e5f2666c942c674ce0f8e6ca6b232";
+ sha256 = "1qbvgp2pca0n5ahpc1gss8ldn07mgs96xxgb5dg62b08ch8ry2jf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -14182,6 +14518,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-bbdb = callPackage ({ bbdb, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+ melpaBuild {
+ pname = "helm-bbdb";
+ version = "1.0";
+ src = fetchFromGitHub {
+ owner = "emacs-helm";
+ repo = "helm-bbdb";
+ rev = "7be6ce17303422e9bc3ff1a7cb54361fcbcafc84";
+ sha256 = "1ccj9gqr407mfrvp71571w3l82v96zdr956qsdbxfdda7bm3s0j7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7025c319fcabc64576c0c6554d0d572cef697693/recipes/helm-bbdb";
+ sha256 = "1wlacbfs23shvyaq616r1p84h8321zz1k5nzir5qg8nr6lssi8vp";
+ name = "helm-bbdb";
+ };
+ packageRequires = [ bbdb helm ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-bbdb";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
melpaBuild {
pname = "helm-bibtex";
@@ -14311,12 +14668,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "2.3.1";
+ version = "2.3.3";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "b8193725f2c3ab20f2907171374ee762e397739d";
- sha256 = "13hwwihiy05dszhwb2zxzjqsgf7589zdirdmfxqsw0l224p0hcdd";
+ rev = "2fca3400574e5f2666c942c674ce0f8e6ca6b232";
+ sha256 = "1qbvgp2pca0n5ahpc1gss8ldn07mgs96xxgb5dg62b08ch8ry2jf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -14689,12 +15046,12 @@
helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-ls-git";
- version = "1.8.0";
+ version = "1.9.0";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-ls-git";
- rev = "c5e43f4083af3949c5d5afdfbbf26d01881cb0e2";
- sha256 = "0azs971d7pqd4ddxzy7bfs52cmrjbafwrcnf57afw39d772rzpdf";
+ rev = "742eeb6c33253b2be581e30b5d70113cd87a581d";
+ sha256 = "1dmmz6ghi21kmwprcv174pq5m198cmsphg297ll1bhqczk51j9h5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git";
@@ -14833,22 +15190,43 @@
license = lib.licenses.free;
};
}) {};
- helm-open-github = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, gh, helm-core, lib, melpaBuild }:
+ helm-notmuch = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, notmuch }:
+ melpaBuild {
+ pname = "helm-notmuch";
+ version = "1.0";
+ src = fetchFromGitHub {
+ owner = "xuchunyang";
+ repo = "helm-notmuch";
+ rev = "7d03cd9fed32b49a1f200c65ed38086c9f19cfaf";
+ sha256 = "10nx6wnd2vfqxv9zr8brml0l9mfx8rrid3lbqgs8wr9313ra3360";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/98667b3aa43d3e0f6174eeef82acaf71d7019aac/recipes/helm-notmuch";
+ sha256 = "1ixdc1ba4ygxl0lpg6ijk06dgj2hfv5p5k6ivq60ss0axyisnnv0";
+ name = "helm-notmuch";
+ };
+ packageRequires = [ helm notmuch ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-notmuch";
+ license = lib.licenses.free;
+ };
+ }) {};
+ helm-open-github = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, helm-core, lib, melpaBuild }:
melpaBuild {
pname = "helm-open-github";
- version = "0.14";
+ version = "0.15";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-helm-open-github";
- rev = "95140bbacc66320a032d3cdd9e1c31aeb47eb83d";
- sha256 = "1hq1nnmgkx0a8sv6g8k4v9f0102qg7jga0hcjnr8lcji51nqrcya";
+ rev = "553f3ab0fe0a028015e9b6cb7c35fb139ec222fc";
+ sha256 = "1xj5b44nkdvbxhk1bnllqm2qq393w22ccy708prrhiq8fmk53aa8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-open-github";
sha256 = "1wqlwg21s9pjgcrwr8kdrppinmjn235nadkp4003g0md1d64zxpx";
name = "helm-open-github";
};
- packageRequires = [ cl-lib gh helm-core ];
+ packageRequires = [ emacs gh helm-core ];
meta = {
homepage = "https://melpa.org/#/helm-open-github";
license = lib.licenses.free;
@@ -14857,12 +15235,12 @@
helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-org-rifle";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "helm-org-rifle";
- rev = "c3913b6e1d19e957c0b5a2d0243388e224a42a8a";
- sha256 = "02yjnag9wr9dk93z41f0i5mqij9bz57fxkv4nddabyc18k7zfrhj";
+ rev = "c8ad1d86dd375f1be433b95e2bc40876f663663f";
+ sha256 = "1ia960sqkbc5bqljjb0arw54q90x36lhp0230s75xcg6m47bxpw3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -15106,6 +15484,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-rdefs = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+ melpaBuild {
+ pname = "helm-rdefs";
+ version = "1.0.1";
+ src = fetchFromGitHub {
+ owner = "saidie";
+ repo = "emacs-helm-rdefs";
+ rev = "cd3a6b3af3015ee58ef30cb7c81c79ebe5fc867b";
+ sha256 = "0ji7ak9pkmw0wxzmw5a1amvn3pkj90v9jv1yi12w388njxn7qsvj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e1c7a20847513dc1153d54a3a700bc120f71dc6b/recipes/helm-rdefs";
+ sha256 = "0z3nrqrz63j9nxkbxdsjj3z8zhsqlik28iry3j1plgsxq1mhrn0y";
+ name = "helm-rdefs";
+ };
+ packageRequires = [ emacs helm ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-rdefs";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-recoll = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-recoll";
@@ -15190,6 +15589,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, smex }:
+ melpaBuild {
+ pname = "helm-smex";
+ version = "0.2";
+ src = fetchFromGitHub {
+ owner = "ptrv";
+ repo = "helm-smex";
+ rev = "7af4e4b44671f739b39584fc50c20084700701ac";
+ sha256 = "1dhzglpd48mb47iyii8igb1dldvnr4alg18m7g8xb529dx8z9wni";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/85568bd732da952053148e07b95e53f7caf5f62c/recipes/helm-smex";
+ sha256 = "02jvq2hyq4wwc9v8gaxr9vkjldc60khdbjf71p8w2iny5w3k0jbj";
+ name = "helm-smex";
+ };
+ packageRequires = [ emacs helm smex ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-smex";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-spaces = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, spaces }:
melpaBuild {
pname = "helm-spaces";
@@ -15676,12 +16096,12 @@
hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hl-todo";
- version = "1.7.3";
+ version = "1.7.4";
src = fetchFromGitHub {
owner = "tarsius";
repo = "hl-todo";
- rev = "17e0db99ca41f10a8cc2daff812d1c7bae048a8b";
- sha256 = "0my7xaphyh3rm6yfnim2p5fpp6ldj8y57g4kpnldw6vw4kd57x3j";
+ rev = "a23312464fc6462d559462a44cd74735e9f73421";
+ sha256 = "0sy0fjmh1m36ajzfmxa2j9akws5qa8a4f1qmj3wgj9vdqd043mr8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo";
@@ -15820,6 +16240,27 @@
license = lib.licenses.free;
};
}) {};
+ htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "htmlize";
+ version = "1.50";
+ src = fetchFromGitHub {
+ owner = "hniksic";
+ repo = "emacs-htmlize";
+ rev = "f74ea313ad364ffd648e330b2e6ddabb89f6e797";
+ sha256 = "16jxd5nfpqlg46zzp0yvvn5aynprd5xv655fcql8cvxkkg111d5z";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize";
+ sha256 = "16nvvsi4nxi0zzk5a6mwmp43p0ls20zdx9r18mxz6bsaw6jangh2";
+ name = "htmlize";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/htmlize";
+ license = lib.licenses.free;
+ };
+ }) {};
httpcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "httpcode";
@@ -15862,6 +16303,27 @@
license = lib.licenses.free;
};
}) {};
+ hungry-delete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "hungry-delete";
+ version = "1.1.5";
+ src = fetchFromGitHub {
+ owner = "nflath";
+ repo = "hungry-delete";
+ rev = "78a787a87aceb821818bbe2a322fbf2e5cbf80c3";
+ sha256 = "171s7akqcpj0jcbm8w19b4n9kdzw0acf7cv0ymwdz5mmgmfiy292";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e33960d9b7e24f830ebe4e5a26a562422d52fe97/recipes/hungry-delete";
+ sha256 = "0hcsm3yndkyfqzb77ibx7df6bjppc34x5yabi6nd389pdscp9rpz";
+ name = "hungry-delete";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/hungry-delete";
+ license = lib.licenses.free;
+ };
+ }) {};
hyai = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hyai";
@@ -16558,12 +17020,12 @@
import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "import-js";
- version = "0.1.0";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "galooshi";
repo = "emacs-import-js";
- rev = "5726c33b8d8c43974d4b367348962025c6df56b9";
- sha256 = "1gamzw0ayfrnp4wcn41p294kg4l80xa01w8phhsqq9kpsxz8mcr0";
+ rev = "231d3d5924adea2d0127aa50acbd2b6a4bab5d25";
+ sha256 = "1zsjaz69gbfmsy0zr6byag31m9jv3nglhxhz56xzhaabsk218f74";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/048344edd471a473c9e32945b021b3f26f1666e0/recipes/import-js";
@@ -16642,12 +17104,12 @@
inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-ruby";
- version = "2.4.0";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "nonsequitur";
repo = "inf-ruby";
- rev = "d130ede56a1203d0aa1c8e5bca5fedbfb14e7ce8";
- sha256 = "11zsprv5ycnfqi358dd4cx70dbn6a8hccd4prf28lln7vhldbmjz";
+ rev = "54eb6bf6d68d71bdac63fcb2042d8e1c554b427f";
+ sha256 = "0yqcl2r8kwdl99704vm8qsdzziidznp0gpyr29ipya7fl24nkfxr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby";
@@ -16726,12 +17188,12 @@
init-open-recentf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "init-open-recentf";
- version = "0.0.2";
+ version = "0.0.3";
src = fetchFromGitHub {
owner = "zonuexe";
repo = "init-open-recentf.el";
- rev = "39da6a50e7f39e6ccd9aada0c20d8b6d501cb487";
- sha256 = "06w1vnfhjy8g62z6xajin5akgh30pa0kk56am61kv6mi5ia8fc96";
+ rev = "a4f5338a14302d44fa5aebb1ddc7aff3dc9abbe3";
+ sha256 = "0iph5cpz2dva1rnvp5xynmkndny87z308pziadk1qgf05mc0i61d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4db8b6eced50726c788d7343137f6b4558575abf/recipes/init-open-recentf";
@@ -16893,12 +17355,12 @@
intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "intero";
- version = "0.1.19";
+ version = "0.1.20";
src = fetchFromGitHub {
owner = "commercialhaskell";
repo = "intero";
- rev = "fe0b045aadef5590eb33e03c1512430e5d52d639";
- sha256 = "18phlz8b2qwiy1mwqri02syxp7564ca0kmcdlw8m7wz6xqdr9vih";
+ rev = "402722b5ad035b87fc08bc73343f05610a5fcb3c";
+ sha256 = "143y94b4spslh06x4klvsvil7ywn3cmrad4mg1qc0y0h0d9ksd4v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -17206,12 +17668,12 @@
jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
melpaBuild {
pname = "jade";
- version = "0.24";
+ version = "0.26";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "jade";
- rev = "c669a9b28dc09806c30864659f6ac924045a083d";
- sha256 = "0fykdci5vi84xrnghaqfs79zsi8x6kv77wx5xw6yphjksdqrp2f3";
+ rev = "fc0c467db0549cfa3d96ff6e0f56d0c84c493ba6";
+ sha256 = "17iq0dn862xaak898lc7fmfbzxl9pyycwlmm5wn9kbbq8p6y7nrd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
@@ -17395,12 +17857,12 @@
jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jq-mode";
- version = "0.1.0";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "ljos";
repo = "jq-mode";
- rev = "7f03354a4c1e26796482c39ce543d1d1f075a18d";
- sha256 = "0ws0297v6sairvsk665wrfzymfi599g5ljshfnpmi81qnnnbwjgf";
+ rev = "3237634ab42566eb50f54e4b7f3896ffd20a8e53";
+ sha256 = "063j0kfp2ybaw5r9hvn9rrksh874xpm9xvpiycv33lf7kdsp5lh3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode";
@@ -17644,27 +18106,6 @@
license = lib.licenses.free;
};
}) {};
- judge-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "judge-indent";
- version = "1.1.2";
- src = fetchFromGitHub {
- owner = "yascentur";
- repo = "judge-indent-el";
- rev = "4cf8c8d3375f4d655b909a415cc4fa8d235a657a";
- sha256 = "11wybxrl2lny6vbf7qrxyf9wxw88ppvbrlfcd65paalrna2hn46h";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/73fb2c31f6af63145aae7c449bfde1bbb00e1100/recipes/judge-indent";
- sha256 = "1gakdhnlxfq8knnykqdw4bizb5y67m8xhi07zannd7bsfwi4k6rh";
- name = "judge-indent";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/judge-indent";
- license = lib.licenses.free;
- };
- }) {};
jump = callPackage ({ fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }:
melpaBuild {
pname = "jump";
@@ -18235,12 +18676,12 @@
latex-unicode-math-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "latex-unicode-math-mode";
- version = "0.2.6";
+ version = "0.3.1";
src = fetchFromGitHub {
owner = "Christoph-D";
repo = "latex-unicode-math-mode";
- rev = "54ddb8742c50a338639625183f7315278fa7369c";
- sha256 = "1yp6nicz0zzd28hfpi94shgj76l1h68mbw875c7x9abyhfz06sfm";
+ rev = "3b82347291edcb32e4062b0048c367a3079b3e8c";
+ sha256 = "1xylfg8xpyb2m0qnysf58cl05ibbg4drhgq7msiiql2qrdzvpx9f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9c021dfad8928c1a352e0ef5526eefa6c0a9cb37/recipes/latex-unicode-math-mode";
@@ -18382,12 +18823,12 @@
lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lfe-mode";
- version = "1.2.0";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "rvirding";
repo = "lfe";
- rev = "e035006a486278c5ad8b8b04d14d5ef3dede64f7";
- sha256 = "16wpjry4yg3ap87kzzy387j1hxm0y7mcnh2v4a25snxcsz2cz7qv";
+ rev = "d722d3662b191b61310dc9bba78f9a77f512b742";
+ sha256 = "0j5gjlsk92y14kxgvd80q9vwyhmjkphpzadcswyjxikgahwg1avz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -18683,12 +19124,12 @@
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "live-py-mode";
- version = "2.12.0";
+ version = "2.13.0";
src = fetchFromGitHub {
owner = "donkirkby";
repo = "live-py-plugin";
- rev = "8f782f58aa2fa2c805b6f488ade9e1c33fed6edb";
- sha256 = "0vmkqlgiahcc6aa0ky4jjdc5nxnn2i7qwfl6wkgy5rmq051nk4k0";
+ rev = "469ed0ccf146deab8c2ebbb162be7be31709da0a";
+ sha256 = "1qv6v27fjfq0h3i7d2nry752r9fwqf5llilngy5l3yimqddm2k4d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -18809,12 +19250,12 @@
logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "logview";
- version = "0.5.2";
+ version = "0.5.3";
src = fetchFromGitHub {
owner = "doublep";
repo = "logview";
- rev = "9b2f610a32557937e704b32e97f4b61abdec6845";
- sha256 = "0w1csjcgvl1jfhjpfj19hzrd6f055iaiq0qafpgjlyn6dd4sf9gj";
+ rev = "4f1db3f2081e819dd35545497529a03466bd0397";
+ sha256 = "0f96wxijls743qyqfgkdqil3p5nn0sm02rlz1nqkm6bd8k28rcg1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -18956,12 +19397,12 @@
magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "magic-filetype";
- version = "0.1.3";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "zonuexe";
repo = "magic-filetype.el";
- rev = "bccd17a8d152e4a2692c2bd71999f1d53c00262a";
- sha256 = "1rw5lvcj2v4b21akmsinkz24fbmp19s3jdqsd8jgmk3qqv0z81fc";
+ rev = "0dfe3d9e0e22c7b06e34c8338f110e337306e3fd";
+ sha256 = "1yjn2w0ykczhlj4q3dnfw2z4q66201dn3jz31yw7hh8bxjlsvwfh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6027c5a66386f7140305a4cde12d66da4dfa09/recipes/magic-filetype";
@@ -18977,12 +19418,12 @@
magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
melpaBuild {
pname = "magit";
- version = "2.8.0";
+ version = "2.9.0";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "570a0320bdd7437fc35a36d78a1c28e1ee19ce88";
- sha256 = "040wc4nj9r3vlma42sc24x4w25rm2kpzwyq44jw3njjk3b7q9avp";
+ rev = "acb8efe770b55ae23f24cf8d2dc4e62bc37c1b88";
+ sha256 = "11vhdz75yqp0c9vp64mv2c2bh4dwb8skvix5gbqhfykd5wa565ay";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -19005,12 +19446,12 @@
magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "magit-annex";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "magit";
repo = "magit-annex";
- rev = "b5d4389aa63ab4a03776120d2bd89229aa7d5238";
- sha256 = "19w8143c4spa856xyzx8fylndbj4s9nwn27f6v1ckqxvm5l0pph0";
+ rev = "74e0343b4152ad5c0d4f77f9f15dd6f1b02de432";
+ sha256 = "08mpnj9c43p528iy3hj8yljhzpkpjxkjiaiiss5n2jgyyc64hw9z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex";
@@ -19131,12 +19572,12 @@
magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "magit-popup";
- version = "2.8.0";
+ version = "2.9.0";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "570a0320bdd7437fc35a36d78a1c28e1ee19ce88";
- sha256 = "040wc4nj9r3vlma42sc24x4w25rm2kpzwyq44jw3njjk3b7q9avp";
+ rev = "acb8efe770b55ae23f24cf8d2dc4e62bc37c1b88";
+ sha256 = "11vhdz75yqp0c9vp64mv2c2bh4dwb8skvix5gbqhfykd5wa565ay";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -19488,16 +19929,16 @@
markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, websocket }:
melpaBuild {
pname = "markdown-preview-mode";
- version = "0.6";
+ version = "0.7";
src = fetchFromGitHub {
owner = "ancane";
repo = "markdown-preview-mode";
- rev = "25f1de28390a0b7be493e8f168749d851784ce12";
- sha256 = "116jms95wfdhlbcyn10nqq452jkplvhqwsl7al8f1zx4rn22snra";
+ rev = "2fc9f06fdf8489a2d5661b794941abb6f863f194";
+ sha256 = "0grljxihip0xyfm47ljwz6hy4kn30vw69bv4w5dw8kr33d51y5ym";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/011d26360a109b074cdecbcb133269ec6452ab86/recipes/markdown-preview-mode";
- sha256 = "0i0mld45d8y96nkqn2r77nvbyw6wgsf8r54d3c2jrv04mnaxs7pg";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode";
+ sha256 = "1cam5wfxca91q3i1kl0qbdvnfy62hr5ksargi4430kgaz34bcbyn";
name = "markdown-preview-mode";
};
packageRequires = [ cl-lib markdown-mode websocket ];
@@ -19779,22 +20220,22 @@
license = lib.licenses.free;
};
}) {};
- mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
melpaBuild {
pname = "mentor";
- version = "0.1";
+ version = "0.1.1";
src = fetchFromGitHub {
owner = "skangas";
repo = "mentor";
- rev = "bd8e4b89341686bbaf4c44680bbae778b96fb8f0";
- sha256 = "1y4ra5z3ayw3w7dszzlkk3qz3nv2jg1vvx8cf0y5j1pqpx8vy3jf";
+ rev = "f53dac51a29f67e31f1fb82702b19d158cc6fa22";
+ sha256 = "0qqapsp4gpkrj3faii7qbfssddl3vqfmwqcy259s7f896kzwaaky";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor";
sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s";
name = "mentor";
};
- packageRequires = [];
+ packageRequires = [ xml-rpc ];
meta = {
homepage = "https://melpa.org/#/mentor";
license = lib.licenses.free;
@@ -19803,12 +20244,12 @@
merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "merlin";
- version = "2.5.1";
+ version = "2.5.3";
src = fetchFromGitHub {
owner = "the-lambda-church";
repo = "merlin";
- rev = "6480e585a0e9d036d11aaf28bcee97e8e9b77c2e";
- sha256 = "0p3hqxawp18q43ws6506cnndi49f3gxzmai0x2qch7h42dgh1cb8";
+ rev = "69b1ec176603cfab6b60941c2dc8d75d64fac019";
+ sha256 = "150iyy75wqwva096c8g1w2sc97nfdgbry6kpz4ngz6l7ij3vivpc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -20306,12 +20747,12 @@
monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "monokai-theme";
- version = "2.2.1";
+ version = "3.2.1";
src = fetchFromGitHub {
owner = "oneKelvinSmith";
repo = "monokai-emacs";
- rev = "53f0ba96f0417885e7d3955d8750de6763f99444";
- sha256 = "1azyrvhvyrd5n7djyh324famzab9w5c81bm3nv04p93gd92mm6zh";
+ rev = "fc5822fcb11c3c6af67b5fb152f92c3e6e3c49d3";
+ sha256 = "0r81jdwfmgzivfpkxqr425qajgw3dzzs8y2v5lsiwl1d5z8rz52a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -20432,12 +20873,12 @@
mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mowedline";
- version = "2.0.0";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "retroj";
repo = "mowedline";
- rev = "c941d44c994e29f0c5f6c4532950eaceec0a6376";
- sha256 = "1wrdcxdlcvrhvarz71a09168bp1rd154ihs5v55dgh1sm7pv34la";
+ rev = "9645c431e921317721ba8dea9ce713d235f94726";
+ sha256 = "14kpj1fh3p8asnxwb0jl3b6r32b7zplxyl5hvbgkal687b1gx50w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline";
@@ -21062,12 +21503,12 @@
ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ninja-mode";
- version = "1.7.1";
+ version = "1.7.2";
src = fetchFromGitHub {
owner = "martine";
repo = "ninja";
- rev = "b49b0fc01bb052b6ac856b1e72be9391e962398e";
- sha256 = "14jh2cg1isip8b8lls3hdj99vpqjyjqlv27r2kpq6095b78p64d9";
+ rev = "717b7b4a31db6027207588c0fb89c3ead384747b";
+ sha256 = "1pc4sr50wknwai33lqm92bm811yzvpyrvry9419p7wp3r6p3nmhw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode";
@@ -21146,12 +21587,12 @@
no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "no-littering";
- version = "0.4.1";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "tarsius";
repo = "no-littering";
- rev = "c176eae5d97f627c946ad43c980a1300e3cbeb50";
- sha256 = "1fs50qll79w0kiyh4jr9kj08ara4s8mhfybx2x1s01xnd6yzjhk8";
+ rev = "12a4cc1155b938da947cce5b3dff7ffb91f2203c";
+ sha256 = "1x7xmqvmna5h5dg352v6pzm9ijdivaz7wcc2nhnshxc5pywpc1cg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -21227,11 +21668,11 @@
}) {};
notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "notmuch";
- version = "0.23.1";
+ version = "0.23.3";
src = fetchgit {
url = "git://git.notmuchmail.org/git/notmuch";
- rev = "ad517e9195a29b26955999c6e11fc37c73dbc01e";
- sha256 = "0g1xybi4ndhvmnxgzxbp3x8kwg69jp3idf8x1asljcfsm6qhvr5i";
+ rev = "fd7f3d0829725bf9ce209cf597dfb0acd4d59b10";
+ sha256 = "0w1nwr7brgapnzsbp9cjcx30lk90ir5hscllpxzw44sq25ir85g5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -21823,12 +22264,12 @@
opener = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "opener";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchFromGitHub {
owner = "0robustus1";
repo = "opener.el";
- rev = "ad3c65a5a748230bf07c18f56b1998ac03e3807a";
- sha256 = "178h7sbpgsn0xl93j7375f2ahmqcszmbl3f7mfb6vgjmm791q03p";
+ rev = "c384f67278046fdcd220275fdd212ab85672cbeb";
+ sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c5a448f1936f46176bc2462eb03955a0c19efb9e/recipes/opener";
@@ -21946,6 +22387,27 @@
license = lib.licenses.free;
};
}) {};
+ org-babel-eval-in-repl = callPackage ({ emacs, eval-in-repl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "org-babel-eval-in-repl";
+ version = "1.0";
+ src = fetchFromGitHub {
+ owner = "diadochos";
+ repo = "org-babel-eval-in-repl";
+ rev = "1e3189e2da14c1c2a2b793c6563597c1aa7d1122";
+ sha256 = "0vf77wc1pq9dfqkrnagkxfg7klwyaichms492jsp0dh5warnw7hm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/042745d47c379778195ed798ca5e0130e4877271/recipes/org-babel-eval-in-repl";
+ sha256 = "00x4idm9a5ddng74axm4xjnw7z89qv3yav8j8rw2z1jf5cgbgah6";
+ name = "org-babel-eval-in-repl";
+ };
+ packageRequires = [ emacs eval-in-repl ];
+ meta = {
+ homepage = "https://melpa.org/#/org-babel-eval-in-repl";
+ license = lib.licenses.free;
+ };
+ }) {};
org-beautify-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-beautify-theme";
@@ -22075,12 +22537,12 @@
org-elisp-help = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-elisp-help";
- version = "0.2.0";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "tarsius";
repo = "org-elisp-help";
- rev = "23506883074b65943987d09f1c0ecd6dc1e4a443";
- sha256 = "1wqq6phpp73qj2ra9k0whrngfaia28wc772v24dsds4dnw3zxsq0";
+ rev = "3e33ab1a2933dd7f2782ef91d667a37f12d633ab";
+ sha256 = "088pbafz1x4z7qi70cjbrvfrcdrjp4zy0yl115klbidshqhxycmj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9bf5046a4c3be8a83004d506bd258a6f7ff15/recipes/org-elisp-help";
@@ -22156,6 +22618,27 @@
license = lib.licenses.free;
};
}) {};
+ org-jira = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+ melpaBuild {
+ pname = "org-jira";
+ version = "2.2.0";
+ src = fetchFromGitHub {
+ owner = "ahungry";
+ repo = "org-jira";
+ rev = "d2db2827ff030a8c11b52402adcd3a4b3050f3c1";
+ sha256 = "16wzrq2syk03710iklrayf4s9ap4brvlzyd4b0rya0rxy2q2rck7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
+ sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib";
+ name = "org-jira";
+ };
+ packageRequires = [ cl-lib request ];
+ meta = {
+ homepage = "https://melpa.org/#/org-jira";
+ license = lib.licenses.free;
+ };
+ }) {};
org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-journal";
@@ -22305,12 +22788,12 @@
org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }:
melpaBuild {
pname = "org-pdfview";
- version = "0.3";
+ version = "0.4";
src = fetchFromGitHub {
owner = "markus1189";
repo = "org-pdfview";
- rev = "c1ca137ef90e442592ce88ef16437dc7dfa9c5dd";
- sha256 = "14lshgyrlzjcrqdfsn17llm70ijbs86cv9mccy87vlr01rbsz6lj";
+ rev = "3a96bfb57cb158ac02cfb4225512699c66f5221d";
+ sha256 = "0lrcj3mcdfcdrndivhj5ds386zrsy78sfg0i8126wwwc5lfh48vq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aadf708e55ddfe13d93d124681a5e6f97a690d79/recipes/org-pdfview";
@@ -22344,22 +22827,22 @@
license = lib.licenses.free;
};
}) {};
- org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, projectile }:
+ org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "org-projectile";
- version = "0.2.5";
+ version = "0.2.6";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "org-projectile";
- rev = "e17aa19d50284cd2c7ff45ce201f33c06626295e";
- sha256 = "0i7fy95jyi7nbgafb9xxfdgwfgs0cyqagx7s7z3b07sr6p0krxcv";
+ rev = "e2b78ca7fbd2e3b873d3ab9bb7196be4d7613f92";
+ sha256 = "03zy2bb1ha22xpx29d8610yrqfyaiaa8vgplpx6bmixaw85mcv58";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dde8c06c968d4375926d269150a16b31c3a840e/recipes/org-projectile";
sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm";
name = "org-projectile";
};
- packageRequires = [ dash emacs pcache projectile ];
+ packageRequires = [ dash emacs projectile ];
meta = {
homepage = "https://melpa.org/#/org-projectile";
license = lib.licenses.free;
@@ -22525,12 +23008,12 @@
org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-tfl";
- version = "0.3.3";
+ version = "0.3.4";
src = fetchFromGitHub {
owner = "storax";
repo = "org-tfl";
- rev = "308251618e215eb78d5436e7412a0c14216fa890";
- sha256 = "1qz1qhd7v6ynmvz7j1xscz85z6zwy9dcarwhbz020l4bk4g9zf94";
+ rev = "f0405e3ad62b90ea43489bdd6312adbd77edb9f3";
+ sha256 = "0cznw60ivaz42ass35sf9i62x7mf9in6z8kr8wc5i1mb7hafy2hk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf/recipes/org-tfl";
@@ -22609,12 +23092,12 @@
org-tracktable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-tracktable";
- version = "0.3";
+ version = "0.3.1";
src = fetchFromGitHub {
owner = "tty-tourist";
repo = "org-tracktable";
- rev = "c38a0019fdc5aac0f9b65e04c86c997fe5a32fb0";
- sha256 = "1yh4p3i0ajfnsvh057h8dpf4rqvvblmfgzj6vyn9dmcl5is1ir2q";
+ rev = "8e0e60a582a034bd66d5efb72d513140b7d4d90a";
+ sha256 = "1aq7qv5jyc2x2a4iphnzmmsvak6dbi7nwdcf3m8nly8w75vrl5lj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57263d996e321f842d0741898370390146606c63/recipes/org-tracktable";
@@ -22805,12 +23288,12 @@
orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "orglink";
- version = "1.1.1";
+ version = "1.1.2";
src = fetchFromGitHub {
owner = "tarsius";
repo = "orglink";
- rev = "3b617ba7290ee550caab1aa055a6bedabe33d6fd";
- sha256 = "0d1i30jbfbv0hm77sf278ism28ds5lz7675ji8f1gf01rfkchjbn";
+ rev = "50debcf3508d2252bdce35c8822af1b3a81fd2dd";
+ sha256 = "1b86c4pyc7cs02lrhnk93gh3czp9wajm17wd9mhszcbdn996rnhz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b8e97cda6af91d54d402887f225e3a0caf055/recipes/orglink";
@@ -22889,12 +23372,12 @@
osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "osx-dictionary";
- version = "0.2.2";
+ version = "0.4";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "osx-dictionary.el";
- rev = "d80d2f1f2637601330837959d9d2f7e0be95df85";
- sha256 = "1s2nahkqmij148z3ijz1l6a43m5pvq9gjza9z6x24936qny05r2w";
+ rev = "0e5e5f1b0077a62673855889d529dd4f0cc8f665";
+ sha256 = "1zpr50q7i4wg1x7vsj69rh1b8xvk9r0591y4fvvs3a2l1llca2mq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ae4467ad646d663f0266f39a76f9764004903424/recipes/osx-dictionary";
@@ -23243,22 +23726,22 @@
license = lib.licenses.free;
};
}) {};
- package-utils = callPackage ({ async, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ package-utils = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-utils";
- version = "0.4.1";
+ version = "0.4.2";
src = fetchFromGitHub {
owner = "Silex";
repo = "package-utils";
- rev = "f655efc89ea7675b6cc9990d46a9f48ca6d384b7";
- sha256 = "1q6hpfaj8hfybxmmh1v871arlv8dn77li9vgckcal4l6xf83nvpi";
+ rev = "e37d38b3c94ac39443f0e449f4112b654b6a8fd1";
+ sha256 = "1spdffw1pi4sp70w46v1njmzgjldcn9cir74imr23fw4n00hb4fa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a1bb884a0299408daa716eba42cb39f79622766c/recipes/package-utils";
sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r";
name = "package-utils";
};
- packageRequires = [ async epl ];
+ packageRequires = [ async ];
meta = {
homepage = "https://melpa.org/#/package-utils";
license = lib.licenses.free;
@@ -23414,12 +23897,12 @@
paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }:
melpaBuild {
pname = "paradox";
- version = "2.5";
+ version = "2.5.1";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "paradox";
- rev = "e9053ef6a7c9a433f2e5e612ba507459ded2840b";
- sha256 = "00jm904qnj9d6286gfixbcd5awwza5pv9vkisfpz6j7705bjvmap";
+ rev = "17a6690d42a1e854ec270ed930c7494077570fc8";
+ sha256 = "1vg5i4cxgn4a8cgx43i75w3cf0d8sb6ig6xxxdj3pvpzc81i53bc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox";
@@ -23580,12 +24063,12 @@
pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
melpaBuild {
pname = "pass";
- version = "1.5";
+ version = "1.6";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "pass";
- rev = "d89a0f82b9c606d59d6f3440825c1c0bb14b1455";
- sha256 = "15mk90dbwq5qbb7yv1gliq156lhc3ha576nkly4n7jl44v2f3c23";
+ rev = "b4c3bd9130044c4e106bac5ba73a50822865e258";
+ sha256 = "0na895x91a37wmdpqp545qvjh34d0vfq4dyxji7casdrdhx3bg16";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass";
@@ -23914,12 +24397,12 @@
persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "persp-mode";
- version = "2.9.2";
+ version = "2.9.4";
src = fetchFromGitHub {
owner = "Bad-ptr";
repo = "persp-mode.el";
- rev = "6fd464a3f5038b34751ec3d07913575906f38ab1";
- sha256 = "0v6abr2x4xnv6qi8az3ki330z7v5vc4b0ibxqzwlq9mzqlqhnpsl";
+ rev = "8200c8753513b14ebc1a8b40b917d7c0a6f5ac6a";
+ sha256 = "13pcdy18pqanjhkacl5rbfmyw3y52d9ll0b6w0w4ffc2lhqpi7nd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -24292,12 +24775,12 @@
plantuml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "plantuml-mode";
- version = "1.1.0";
+ version = "1.2.2";
src = fetchFromGitHub {
owner = "skuro";
repo = "plantuml-mode";
- rev = "2b7d79688608a5f328b95610edcdd871278fbd29";
- sha256 = "1pmnz01k3n4jjkl1p31lcfh8j6g3zpr78p8f2wazdlgcl14g7pjz";
+ rev = "87417ad75b215ababf153cba533575ac0273a5db";
+ sha256 = "1jrck9wybpm2p2imjn0x6g3ybasiqkfzxc1halm3rq6xvc4zvrsm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a658eb8085f2bf413c276af19c77597132cf569b/recipes/plantuml-mode";
@@ -24874,15 +25357,36 @@
license = lib.licenses.free;
};
}) {};
+ projectile-git-autofetch = callPackage ({ alert, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+ melpaBuild {
+ pname = "projectile-git-autofetch";
+ version = "0.1.0";
+ src = fetchFromGitHub {
+ owner = "andrmuel";
+ repo = "projectile-git-autofetch";
+ rev = "9692ed2a3935ee7b56e59af8b986e532839597dd";
+ sha256 = "0vg0d8alxzzzkk8s564wzbb71laj48gkpbpk3qnwj5hfk14jzaqv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7fdfdeb69fd78fc1bb2c62392f860a8c434f1762/recipes/projectile-git-autofetch";
+ sha256 = "0m0raddsw5yvjrw2v6bdaswffmva8y9hxksdgf9axpvrd3rzlk9n";
+ name = "projectile-git-autofetch";
+ };
+ packageRequires = [ alert projectile ];
+ meta = {
+ homepage = "https://melpa.org/#/projectile-git-autofetch";
+ license = lib.licenses.free;
+ };
+ }) {};
projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
melpaBuild {
pname = "projectile-rails";
- version = "0.11.0";
+ version = "0.12.1";
src = fetchFromGitHub {
owner = "asok";
repo = "projectile-rails";
- rev = "c3a54723005d015d5d4364e4c74617dfd10ee294";
- sha256 = "1gywkxm9qk7y5za6fzjizxlc1lvwwa4mhadcyf1pxpq2119yhqy0";
+ rev = "fe0cb5597d9e87ceebfadd1815beadfc04a194f1";
+ sha256 = "0yg7xbv0mnrcc6kgh8ci6pxzfjiq1qkrw6hx2zs5m4ryfrrfclz2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -24895,6 +25399,27 @@
license = lib.licenses.free;
};
}) {};
+ projectile-ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "projectile-ripgrep";
+ version = "0.3.0";
+ src = fetchFromGitHub {
+ owner = "nlamirault";
+ repo = "ripgrep.el";
+ rev = "1d579c5dc820b9a2c58261d362ffb95a02a8a752";
+ sha256 = "0ayq3h0mfqyn695r3qp31yamsyy6hcgj9fxsmlrsm615axvmki9g";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep";
+ sha256 = "1iczizyayql40wcljvpc1mvfvn9r28b1dkrkcmdxif732gd01jjg";
+ name = "projectile-ripgrep";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/projectile-ripgrep";
+ license = lib.licenses.free;
+ };
+ }) {};
projectile-sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, sift }:
melpaBuild {
pname = "projectile-sift";
@@ -25591,12 +26116,12 @@
railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "railscasts-reloaded-theme";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "thegeorgeous";
repo = "railscasts-reloaded-theme";
- rev = "c2b6f408606c3f89ddbd19325bdbfc9a9d3d2168";
- sha256 = "1lkm0shfa7d47qmpjg1q4awazvf6ci68d98zy04r018s31isavxr";
+ rev = "cce0e4ae6527e84e2ae3deb8b3c7770dda225853";
+ sha256 = "1li86qpbjg8sm9q4sl8cffc0fni6mwx8180x8zlmsxdnhqic5nvd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme";
@@ -25675,12 +26200,12 @@
rake = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rake";
- version = "0.4.0";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "asok";
repo = "rake";
- rev = "a9e65cb23d3dc700f5b41ff365153ef6a259d4f0";
- sha256 = "1q65jj6bghvzhlqmpg61a7vn8izc01wp2fjiqx013zxpg9awvzmq";
+ rev = "e680f1a8f2591af7c80cad188340601b101b5ddc";
+ sha256 = "1dk2clsnmjy3bfv6laxf8sslvdajjbwpk83ss8v9xm55dcxjvd7n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bf0f84698dda02a5b84a244ee29a23a6faa9de68/recipes/rake";
@@ -26008,15 +26533,36 @@
license = lib.licenses.free;
};
}) {};
+ region-convert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "region-convert";
+ version = "0.0.1";
+ src = fetchFromGitHub {
+ owner = "zonuexe";
+ repo = "right-click-context";
+ rev = "31d370fce60d8cda04e1b9e4fe0e5d268fd37fe5";
+ sha256 = "0bbfgz2n00dgqbij6c4kmlp3rnmf7jcjq56cmjck4nd81lkwk6j7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ddcf4612cccb9a53425c5f0324206d70549d9d9e/recipes/region-convert";
+ sha256 = "0daghvxc6gxgric1aa1gw036gbpbzilqz72gr1inqy92hz7xrxfm";
+ name = "region-convert";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/region-convert";
+ license = lib.licenses.free;
+ };
+ }) {};
relative-line-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "relative-line-numbers";
- version = "0.3.2";
+ version = "0.3.3";
src = fetchFromGitHub {
owner = "Fanael";
repo = "relative-line-numbers";
- rev = "64157db08b0c2f5fada3209fc8d3e4b4c7429978";
- sha256 = "1r8fhs7d2vkrbv15ic2bm79i9a8swbc38vk566vnxkhl3rfd5a0a";
+ rev = "38b5f9065aec008d9ad94fe5597338463aa1aa63";
+ sha256 = "00ixh7siyc8m7j6hfaxnnl3ynfhzkccpjfc89v8bp3z83m4v269w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2901c841d221bd782dae9059a070ae8130e1ae/recipes/relative-line-numbers";
@@ -26074,12 +26620,12 @@
repl-toggle = callPackage ({ fetchFromGitHub, fetchurl, fullframe, lib, melpaBuild }:
melpaBuild {
pname = "repl-toggle";
- version = "0.3.3";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "tomterl";
repo = "repl-toggle";
- rev = "0249c2a72e6bf782c2c15b0cb1d925410543184f";
- sha256 = "12wylmyz54n1f3kaw9clhvs66dg43xvcvll4pl5ii0ibfv6pls1b";
+ rev = "bd2d28738368a047d5f407034f78839a7e514489";
+ sha256 = "1h58a2darz4k1aj480xahhp29gh2cg41pymidymjx4wi2ygic4pr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/da4be8c67584ea0ae35c7c9ee33334db5061a538/recipes/repl-toggle";
@@ -26389,12 +26935,12 @@
ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ripgrep";
- version = "0.2.0";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "ripgrep.el";
- rev = "77e8aa61b5b893c037d87117943a164514c6145f";
- sha256 = "1xs8h2g02jdb05c07bk9qfvxvfchgzhccj5yhkxbnpxqmxpcskdc";
+ rev = "1d579c5dc820b9a2c58261d362ffb95a02a8a752";
+ sha256 = "0ayq3h0mfqyn695r3qp31yamsyy6hcgj9fxsmlrsm615axvmki9g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep";
@@ -26407,6 +26953,27 @@
license = lib.licenses.free;
};
}) {};
+ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
+ melpaBuild {
+ pname = "rjsx-mode";
+ version = "0.1.0";
+ src = fetchFromGitHub {
+ owner = "felipeochoa";
+ repo = "rjsx-mode";
+ rev = "20c7bd0e704dfc1c391edf78765c8b0ec4f5b3c0";
+ sha256 = "142zihjqgdq4bfy1hp0pz6k109ngii4kyc8xrdvd9yvzc0y5vp8a";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
+ sha256 = "0w3ij8k8058pfw443chm1kn30ia0f5rfbg03w9ddw86xb3wa2q0b";
+ name = "rjsx-mode";
+ };
+ packageRequires = [ emacs js2-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/rjsx-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
melpaBuild {
pname = "robe";
@@ -26536,12 +27103,12 @@
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rtags";
- version = "2.5";
+ version = "2.7";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "129cc5dece4a22fb0d786d1309bcba523252e744";
- sha256 = "0xwiqcv1xgv9ma2k8zjv2v10h4sm2m5xng7k3g9n5fafrd7j0lwp";
+ rev = "8b6d0cdf57c951769ead8aad1d8538308e1b6861";
+ sha256 = "07qjpvkhv556p3pfm1hxswky4irp7f4wxb2blcvk3s7qmqirqshj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -26897,8 +27464,8 @@
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-scala-mode";
- rev = "387e93c70a3703e55f717d3285912ad12cfee947";
- sha256 = "0xwwarla3m9cr1mpnlhsknfvxw1xyf85cxjkzg42q12k7i0yad5w";
+ rev = "4b492b9fa5f97521426f50c8dcfb6c0a251840ea";
+ sha256 = "01d907ph36yzfxgchqvk102ld1mvlb84sjxhmmq5xrzj4zbb0khm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@@ -26914,11 +27481,11 @@
schrute = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "schrute";
- version = "0.2";
+ version = "0.2.2";
src = fetchgit {
url = "https://bitbucket.org/shackra/dwight-k.-schrute";
- rev = "99857394886e516d5ebd63fedff200bceaef1d4d";
- sha256 = "0z1cnmyn7r0l93ivl5hr4illmrm9wdyza8822l175a62n9pr8hv6";
+ rev = "08ab6565fa94f3a8016163fe6f7be1932af1156b";
+ sha256 = "0l1k6wjjr569lk5k8ydwq13041kn889g20qbzf79qj1ws96rim4m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/505fc4d26049d4e2973a54b24117ccaf4f2fb7e7/recipes/schrute";
@@ -27563,12 +28130,12 @@
simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }:
melpaBuild {
pname = "simplenote2";
- version = "2.2.2";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "alpha22jp";
repo = "simplenote2.el";
- rev = "9984ad77e63ae8d40e863cf1b0d8339ede986792";
- sha256 = "04giklbd1fsw2zysr7aqg17h6cpyn4i9jbknm4d4v6581f2pcl93";
+ rev = "070aa311b0a08b530394c53d0c52c6438efbc20c";
+ sha256 = "0zx49kd3wrqx6f52nk8rzqx3ay3qbcygibcidw6w7drvxnxjgd04";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2";
@@ -28043,22 +28610,22 @@
license = lib.licenses.free;
};
}) {};
- smeargle = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ smeargle = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smeargle";
- version = "0.2";
+ version = "0.3";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-smeargle";
- rev = "fe0494bb859ea51800d6e7ae7d9eda2fe98e0097";
- sha256 = "1pcpg3lalbrc24z3vwcaysps8dbdzmncdgqdd5ig6yk2a9wyj9ng";
+ rev = "0665b1ff5109731898bc4a0ca6d939933b804777";
+ sha256 = "0p0kxmjdr02l9injlyyrnnzqdbb7mirz1xx79c3lw1rgpalf0jnf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c5b985b24a23499454dc61bf071073df325de571/recipes/smeargle";
sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd";
name = "smeargle";
};
- packageRequires = [ cl-lib emacs ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/smeargle";
license = lib.licenses.free;
@@ -28151,12 +28718,12 @@
snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "snakemake-mode";
- version = "0.5.1";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "kyleam";
repo = "snakemake-mode";
- rev = "3f02d1af5548d15a410ee745b9e7ebc09266a1ab";
- sha256 = "12s3ykb2flnbl6kvjn0yy11y0g5nq2k5arpgf7pqwj4wgx0fl8nb";
+ rev = "327c168febbde24c2b39cc10d26c9cfc9189e130";
+ sha256 = "1jlv8sr2g3i335h7hp8y39b77wla9hac1b0bk2imalr14lz04vly";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
@@ -28592,12 +29159,12 @@
sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sqlup-mode";
- version = "0.7.0";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "Trevoke";
repo = "sqlup-mode.el";
- rev = "4bf563b0b95f5a1e627e55d52d1c2fd0dd3af95f";
- sha256 = "0hxkkpylnf5phavcd2y3bxzikcnr7cdk3rbqgp3nw74sxz0223w2";
+ rev = "65e75ebc7d85a63e4e27900ba746623a8e4bfa95";
+ sha256 = "1yiz1k2dg010dypql5l9ahcl33nvqxl731wghv4jvp6bdxcf90g3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode";
@@ -28631,6 +29198,27 @@
license = lib.licenses.free;
};
}) {};
+ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ssh-deploy";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "cjohansson";
+ repo = "emacs-ssh-deploy";
+ rev = "94fc9e677c864bd2c302c4842b95f7580cda6cef";
+ sha256 = "1zxgqlfipbympgg8i58r1pwn50fq6vb42y8fmipxy25s0j3x53k7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy";
+ sha256 = "07kryxspjy8lr1a2m0bppa3xgbzwk180z4a8har37ygm3hdpj50x";
+ name = "ssh-deploy";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/ssh-deploy";
+ license = lib.licenses.free;
+ };
+ }) {};
stan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "stan-mode";
@@ -28755,6 +29343,27 @@
license = lib.licenses.free;
};
}) {};
+ string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "string-inflection";
+ version = "1.0.4";
+ src = fetchFromGitHub {
+ owner = "akicho8";
+ repo = "string-inflection";
+ rev = "af1fb965784eff308d6b4031dc2ef5f6961cd38a";
+ sha256 = "017rq1vll53i4xs1l24insjkfvr7nlq6l9g7gjmgnd8g9ck6jqg0";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection";
+ sha256 = "1vrjcg1fa5adw16s4v9dq0fid0gfazxk15z9cawz0kmnpyzz3fg2";
+ name = "string-inflection";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/string-inflection";
+ license = lib.licenses.free;
+ };
+ }) {};
string-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild }:
melpaBuild {
pname = "string-utils";
@@ -29554,12 +30163,12 @@
ten-hundred-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ten-hundred-mode";
- version = "1.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "aaron-em";
repo = "ten-hundred-mode.el";
- rev = "fc1d7cdb72c21dc1953ed2e2ecf28233b8b3e305";
- sha256 = "17633jachcgnibmvx433ygcfmz3j6hzli5mqbqg83r27chiq5mjx";
+ rev = "bdcfda49b1819e82d61fe90947e50bb948cf7933";
+ sha256 = "11nsh6dkd3i489lrqpd9xhr4c0ai51364rlrd6slm54720by9jql";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4a0534044ff9ce0740414bf5dc3b104bbdbdacce/recipes/ten-hundred-mode";
@@ -29575,12 +30184,12 @@
term-alert = callPackage ({ alert, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, term-cmd }:
melpaBuild {
pname = "term-alert";
- version = "1.1";
+ version = "1.2";
src = fetchFromGitHub {
owner = "CallumCameron";
repo = "term-alert";
- rev = "3e8b39ed4d960933ffdf0308f9bf0d5ce63648e9";
- sha256 = "195jghl1c8ncl15nix275r4x61zlii90pnwgx4m9q2bnbwsz3ycm";
+ rev = "47af9e6fe483ef0d393098c145f499362a33292a";
+ sha256 = "1nv8ma8x9xkgsl95z7yysy8q1lb3xr0pd8a5sb01nlx8ks3clad4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0d77aee0b1b2eb7834436bdfa339f95cb97da140/recipes/term-alert";
@@ -31008,12 +31617,12 @@
visual-fill-column = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "visual-fill-column";
- version = "1.9";
+ version = "1.10";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "visual-fill-column";
- rev = "73da507c8f4af7a755f9b209bbb3b0343ca2517c";
- sha256 = "0hks82hdx7rfx3lwsz0zq5k9j6vpwbpgj9d6i7xhd6cwb9q95ycv";
+ rev = "159dcee48e7311ee816686d62e7ce36619127462";
+ sha256 = "0bij20a8f9pd4307m2qslcx8p3j59hkr14sm18aw0bric65him8b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column";
@@ -31260,12 +31869,12 @@
web-beautify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "web-beautify";
- version = "0.3.1";
+ version = "0.3.2";
src = fetchFromGitHub {
owner = "yasuyk";
repo = "web-beautify";
- rev = "0fac5fa09cee9d45237d6d74e2760fb24c929f8a";
- sha256 = "0zpvs9yc2gxfmm0x0majhzxc0b0vmm6p6pxh92h8iq3pmr0di8yj";
+ rev = "aa95055224c24f38736716809fec487cd817c38d";
+ sha256 = "0vms7zz3ym53wf1zdrkbf2ky2xjr1v134ngsd0jr8azyi8siw84d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0d528d3e20b1656dff40860cac0e0fa9dc1a3e87/recipes/web-beautify";
@@ -31320,6 +31929,27 @@
license = lib.licenses.free;
};
}) {};
+ web-mode-edit-element = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }:
+ melpaBuild {
+ pname = "web-mode-edit-element";
+ version = "2.1";
+ src = fetchFromGitHub {
+ owner = "jtkDvlp";
+ repo = "web-mode-edit-element";
+ rev = "8b8ac07aa8c920dafd94c96a51effb0d6c0ed1ce";
+ sha256 = "0aj1ibmnrbaxrkwjf1fac2qzazrj39pql3prcibnchc2bmp191aa";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2658e8a80455ad5ae1ceb69deddab89ebc6b6871/recipes/web-mode-edit-element";
+ sha256 = "09m2jzsb3zz1wr396jrhcwskfm1m0a4hvxlxhq5p1w5fzfcdb8md";
+ name = "web-mode-edit-element";
+ };
+ packageRequires = [ emacs web-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/web-mode-edit-element";
+ license = lib.licenses.free;
+ };
+ }) {};
webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "webpaste";
@@ -31746,8 +32376,8 @@
version = "0.9.1";
src = fetchhg {
url = "https://bitbucket.com/ArneBab/wisp";
- rev = "9f38303df3b7";
- sha256 = "10bcyzaj4ramas2vwjnsl9pk82gnnvfrwdxn6g217xbjjjlylwds";
+ rev = "a67adbf5fc75";
+ sha256 = "1av071s0s6x0idbklfnps8j7vgjqxapk9y23prk6jrdbbwhfzb8n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -31784,12 +32414,12 @@
with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "with-editor";
- version = "2.5.7";
+ version = "2.5.8";
src = fetchFromGitHub {
owner = "magit";
repo = "with-editor";
- rev = "1a6c49bfdef5aacce14b76f06adda3b66d1f3847";
- sha256 = "1ignivq4df5a716p7n4cm6jbv9zly9b1ssn39a49wzvy9ch5m76q";
+ rev = "ab73c028e8dbe088d7545406efc5c5c7b8fd503a";
+ sha256 = "1hf2py6dby3wnvzv027x0555532aapn20bkhb7x8k020c6yr59s9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -32285,6 +32915,27 @@
license = lib.licenses.free;
};
}) {};
+ yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "yang-mode";
+ version = "0.9.3";
+ src = fetchFromGitHub {
+ owner = "mbj4668";
+ repo = "yang-mode";
+ rev = "351a17bfd4b78616cf740fc1c7148bc1d85b63a4";
+ sha256 = "14hrr4ix77g795b4xhdwwqkgpbbb3axpim1r4yl1bv9jbbkqllx5";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";
+ sha256 = "0rl90xbcf3383ls95g1dixh2dr02kc4g60d324cqbb4h59wffp40";
+ name = "yang-mode";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/yang-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
yascroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yascroll";
@@ -32348,6 +32999,25 @@
license = lib.licenses.free;
};
}) {};
+ yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+ pname = "yatex";
+ version = "1.78";
+ src = fetchhg {
+ url = "https://www.yatex.org/hgrepos/yatex/";
+ rev = "5428250c886a";
+ sha256 = "0q1b0wpdfdghp6hchc59jgkyra5qqqdam47q7g2ni4ym8nlhwd3c";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
+ sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
+ name = "yatex";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/yatex";
+ license = lib.licenses.free;
+ };
+ }) {};
yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yaxception";
@@ -32369,22 +33039,32 @@
license = lib.licenses.free;
};
}) {};
- ycmd = callPackage ({ dash, deferred, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
melpaBuild {
pname = "ycmd";
- version = "0.9";
+ version = "1.0";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "8fb29b84d42c0aea71fe7db088b0b7a5a0c6b34c";
- sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia";
+ rev = "be21ca7f807e70812b6fc0e0a4ea83b41723d815";
+ sha256 = "1q30k8rhk3plknkk544h2dk48yqmxwh4xp3rq1lz8isc3580qwxx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
sha256 = "10jqr6xz2fnrd1ihips9jmbcd28zha432h4pxjpswz3ivwjqhxna";
name = "ycmd";
};
- packageRequires = [ dash deferred emacs f popup ];
+ packageRequires = [
+ cl-lib
+ dash
+ deferred
+ emacs
+ let-alist
+ pkg-info
+ request
+ request-deferred
+ s
+ ];
meta = {
homepage = "https://melpa.org/#/ycmd";
license = lib.licenses.free;
@@ -32474,22 +33154,22 @@
license = lib.licenses.free;
};
}) {};
- zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline }:
+ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
melpaBuild {
pname = "zerodark-theme";
- version = "3.7";
+ version = "4.2";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "zerodark-theme";
- rev = "a9fc16f317cade7db85433e66c80ba784e07a975";
- sha256 = "1b5zg2w7nfcszwbqhxan470vvsrpqwddwjj9kzgh6qxcl81y7s1p";
+ rev = "af231794425255d436690c9c31bceb2052251210";
+ sha256 = "1xnhcxf5d0gn8lhapjg7b289bqpf8w0d2mp76ksb8rsvx4r0bdbw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9";
name = "zerodark-theme";
};
- packageRequires = [ all-the-icons flycheck magit powerline ];
+ packageRequires = [ all-the-icons flycheck magit ];
meta = {
homepage = "https://melpa.org/#/zerodark-theme";
license = lib.licenses.free;
@@ -32537,22 +33217,22 @@
license = lib.licenses.free;
};
}) {};
- zoom-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ zoom-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zoom-window";
- version = "0.4";
+ version = "0.5";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-zoom-window";
- rev = "f0eb12e389d8d2d13b5911907ef872e18230e00e";
- sha256 = "13393bd5lqpbv7m3p6ihg0ghx1w4w6mrnybx4m8hcfvcn17dr3hw";
+ rev = "eefe36d26e04a9f89aad27671d1f06e9d4736ac6";
+ sha256 = "08splg49ncgfsap3ivpc974wmg22ikshwv33l0i6advjjv9cskhm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55cc66cc0deb1c24023f638b8e920c9d975859/recipes/zoom-window";
sha256 = "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3";
name = "zoom-window";
};
- packageRequires = [ cl-lib emacs ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/zoom-window";
license = lib.licenses.free;
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index bdade742b04..438abd8afed 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -1,10 +1,10 @@
{ callPackage }: {
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
- version = "20161102";
+ version = "20161214";
src = fetchurl {
- url = "http://orgmode.org/elpa/org-20161102.tar";
- sha256 = "1mj100pnxskgrfmabj0vdmsijmr7v5ir7c18aypv92nh3fnmiz0f";
+ url = "http://orgmode.org/elpa/org-20161214.tar";
+ sha256 = "1x3wvagx7437xr4lawxr24kivb661997bncq2w9iz3fkg9rrr73m";
};
packageRequires = [];
meta = {
@@ -14,10 +14,10 @@
}) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib";
- version = "20161102";
+ version = "20161214";
src = fetchurl {
- url = "http://orgmode.org/elpa/org-plus-contrib-20161102.tar";
- sha256 = "124rizp50jaqshcmrr7x2132x5sy7q81nfb37482j9wzrc9l7b95";
+ url = "http://orgmode.org/elpa/org-plus-contrib-20161214.tar";
+ sha256 = "1rc3p1cys15i9vnll946w5hlckmmbgkw22yw98mna9cwqdpc387c";
};
packageRequires = [];
meta = {
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 08223ef82ef..aacc3f9e792 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
-, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls
+, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO
, withX ? !stdenv.isDarwin
, withGTK2 ? true, gtk2 ? null
@@ -34,14 +34,34 @@ stdenv.mkDerivation rec {
sha256 = "0cwgyiyymnx4xdg99dm2drfxcyhy2jmyf0rkr9fwj9mwwf77kwhr";
};
- patches = lib.optional stdenv.isDarwin ./at-fdcwd.patch;
+ patches = (lib.optional stdenv.isDarwin ./at-fdcwd.patch) ++ [
+ ## Fixes a segfault in emacs 25.1
+ ## http://lists.gnu.org/archive/html/emacs-devel/2016-10/msg00917.html
+ ## https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24358
+ (fetchurl {
+ url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=9afea93ed536fb9110ac62b413604cf4c4302199;
+ sha256 = "1iifyfqh7qfdfsrpqgz2l7z0l7alvma57jlklyq258qyjg0pc8n4"; })
+ (fetchurl {
+ url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=71ca4f6a43bad06192cbc4bb8c7a2d69c179b7b0;
+ sha256 = "0vadqvcigca0j891yis1mhjn18rg4l9qj621q6vzip46ka6qig0d"; })
+ (fetchurl {
+ url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=1047496722a58ef5b736dae64d32adeb58c5055c;
+ sha256 = "01lfa89qw7y0spcy57hm1ymijb57i6kvhb9z9impcxwza60lbi7b"; })
+ (fetchurl {
+ url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=96ac0c3ebce825e60595794f99e703ec8302e240;
+ sha256 = "0bmkrm356fbwc8wsiqh2w706mq5r9q4ic4m8vzdj099ihnf121nn"; })
+ (fetchurl {
+ url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=43986d16fb6ad78a627250e14570ea70bdb1f23a;
+ sha256 = "0kp8dgs7fjgvidhm2y84jrxad78mxi0c47jhyszj5644qqxm47cr";
+ })
+ ];
nativeBuildInputs = [ pkgconfig ]
++ lib.optionals srcRepo [ autoconf automake texinfo ];
buildInputs =
[ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ]
- ++ lib.optional stdenv.isLinux dbus
+ ++ lib.optionals stdenv.isLinux [ dbus libselinux ]
++ lib.optionals withX
[ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
imagemagick gconf ]
diff --git a/pkgs/applications/editors/emacs/macport-24.5.nix b/pkgs/applications/editors/emacs/macport-24.5.nix
index 885538dc883..33d24242db7 100644
--- a/pkgs/applications/editors/emacs/macport-24.5.nix
+++ b/pkgs/applications/editors/emacs/macport-24.5.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext
, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit
+, autoconf, automake
, ImageCaptureCore, GSS, ImageIO # These may be optional
}:
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- buildInputs = [ ncurses libxml2 gnutls pkgconfig texinfo gettext ];
+ buildInputs = [ ncurses libxml2 gnutls pkgconfig texinfo gettext autoconf automake ];
propagatedBuildInputs = [
AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
@@ -47,7 +48,7 @@ stdenv.mkDerivation rec {
"--enable-mac-app=$$out/Applications"
];
- CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090";
+ CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090";
LDFLAGS = "-O3 -L${ncurses.out}/lib";
postInstall = ''
diff --git a/pkgs/applications/editors/emacs/macport-25.1.nix b/pkgs/applications/editors/emacs/macport-25.1.nix
index 81e77c725d9..84d1950b865 100644
--- a/pkgs/applications/editors/emacs/macport-25.1.nix
+++ b/pkgs/applications/editors/emacs/macport-25.1.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
emacsName = "emacs-25.1";
- name = "${emacsName}-mac-6.0";
+ name = "${emacsName}-mac-6.1";
builder = ./builder.sh;
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
macportSrc = fetchurl {
url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
- sha256 = "2f7a3fd826e6dea541ada04f4a1ff2903a87a1f736b89c5b90bf7bb820568e34";
+ sha256 = "1zwxh7zsvwcg221mpjh0dhpdas3j9mc5q92pprf8yljl7clqvg62";
};
enableParallelBuilding = true;
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
"--enable-mac-app=$$out/Applications"
];
- CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090";
+ CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090";
LDFLAGS = "-O3 -L${ncurses.out}/lib";
postInstall = ''
diff --git a/pkgs/applications/editors/fte/default.nix b/pkgs/applications/editors/fte/default.nix
new file mode 100644
index 00000000000..d32a3fb5f1b
--- /dev/null
+++ b/pkgs/applications/editors/fte/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, unzip, perl, libX11, libXpm, gpm, ncurses, slang }:
+
+stdenv.mkDerivation rec {
+ name = "fte-0.50.02";
+
+ buildInputs = [ unzip perl libX11 libXpm gpm ncurses slang ];
+
+ ftesrc = fetchurl {
+ url = "mirror://sourceforge/fte/fte-20110708-src.zip";
+ sha256 = "17j9akr19w19myglw5mljjw2g3i2cwxiqrjaln82h3rz5ma1qcfn";
+ };
+ ftecommon = fetchurl {
+ url = "mirror://sourceforge/fte/fte-20110708-common.zip";
+ sha256 = "1xva4kh0674sj2b9rhf2amlr37yxmsvjkgyj89gpcn0rndw1ahaq";
+ };
+ src = [ ftesrc ftecommon ];
+
+ buildFlags = "PREFIX=$(out)";
+
+ installFlags = "PREFIX=$(out) INSTALL_NONROOT=1";
+
+ meta = with stdenv.lib; {
+ description = "A free text editor for developers";
+ homepage = http://fte.sourceforge.net/;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.volth ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index 961c7ba0461..c0370229580 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file }:
let
- version = "1.28";
+ version = "1.29";
in
stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://download.geany.org/${name}.tar.bz2";
- sha256 = "0nha21rbdhl10vdpaq8d5v5fszvggl1xar555pvrnvm2y443ffpp";
+ sha256 = "394307596bc908419617e4c33e93eae8b5b733dfc8d01161677b8cbd3a4fb20f";
};
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 1ce86e96c4d..dc85b5402bd 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -115,17 +115,33 @@ let
propagatedUserEnvPkgs = [ python ];
};
+ buildDataGrip = { name, version, src, license, description, wmClass }:
+ (mkIdeaProduct {
+ inherit name version src wmClass jdk;
+ product = "DataGrip";
+ meta = with stdenv.lib; {
+ homepage = "https://www.jetbrains.com/datagrip/";
+ inherit description license;
+ longDescription = ''
+ DataGrip is a new IDE from JetBrains built for database admins.
+ It allows you to quickly migrate and refactor relational databases,
+ construct efficient, statically checked SQL queries and much more.
+ '';
+ maintainers = with maintainers; [ loskutov ];
+ platforms = platforms.linux;
+ };
+ });
in
{
clion = buildClion rec {
name = "clion-${version}";
- version = "2016.2.3";
+ version = "2016.3";
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
- sha256 = "1gcglxmffq815r97wyy2wx1jsv467qyys8c0m5dv3yjdxknccbqd";
+ sha256 = "16nszamr0bxg8aghyrg4wzxbp9158kjzhr957ljpbipz0rlixf31";
};
wmClass = "jetbrains-clion";
};
@@ -156,12 +172,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 +208,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
- version = "2016.2.5";
+ version = "2016.3.1";
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 = "1696gfmqi76ybgi5r84kisjx9mv0hd70hsn16banw61zy4rfllhw";
};
wmClass = "jetbrains-idea";
};
@@ -240,36 +256,36 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
- version = "2016.2.3";
+ version = "2016.3";
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "0nph0dp0a2y6vrbc1a2d5iy1fzhm4wbkp6kpdk6mcfpnz5ppz84f";
+ sha256 = "1pi822ihzy58jszdy7y2pyni6pki9ih8s9xdbwlbwg9vck1iqprs";
};
wmClass = "jetbrains-pycharm-ce";
};
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
- version = "2016.2.3";
+ version = "2016.3";
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "0pjgdwpkbf6fgrhml97inmsjavz1n9l4ns1pnhv3mssnribg3vm1";
+ sha256 = "1b4ib77wzg0y12si8zqrfwbhv4kvmy9nm5dsrdr3k7f89dqg3279";
};
wmClass = "jetbrains-pycharm";
};
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
- version = "2016.2.2";
+ version = "2016.3";
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
- sha256 = "0np0ypqga1xx9zq0qwpxiw9xdkr7k0jcdv1w790aafjar7a5qbyz";
+ sha256 = "0hzjhwij2x3b5fqwyd69h24ld13bpc2bf9wdcd1jy758waf0d91y";
};
wmClass = "jetbrains-phpstorm";
};
@@ -288,12 +304,12 @@ in
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
- version = "2016.2.4";
+ version = "2016.3.1";
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 = "10za4d6w9yns7kclbviizslq2y7zas9rkmvs3xwrfw1rdw2b69af";
};
wmClass = "jetbrains-webstorm";
};
@@ -321,4 +337,16 @@ in
};
wmClass = "jetbrains-webstorm";
};
+
+ datagrip = buildDataGrip rec {
+ name = "datagrip-${version}";
+ version = "2016.3";
+ description = "Your Swiss Army Knife for Databases and SQL";
+ license = stdenv.lib.licenses.unfree;
+ src = fetchurl {
+ url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
+ sha256 = "10nah7v330qrrczzz5jldnr0k7w2xzljiny32gm9pqmjbl0i70il";
+ };
+ wmClass = "jetbrains-datagrip";
+ };
}
diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index d45fdc8e12d..73ee7ed64cd 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -4,12 +4,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "kakoune-nightly-${version}";
- version = "2016-07-26";
+ version = "2016-12-10";
src = fetchFromGitHub {
repo = "kakoune";
owner = "mawww";
- rev = "0d2c5072b083a893843e4fa87f9f702979069e14";
- sha256 = "01qqs5yr9xvvklg3gg45lgnyh6gji28m854mi1snzvjd7fksf50n";
+ rev = "e44129577a010ebb4dc609b806104d3175659074";
+ sha256 = "1jkpbk6wa9x5nlv002y1whv6ddhqawxzbp3jcbzcb51cg8bz0b1l";
};
buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ];
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index cf1d70350ba..19ffb2c4959 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -4,13 +4,13 @@
, kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
, threadweaver, kxmlgui, kwindowsystem, grantlee
, plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared_mime_info
-, libksysguard, llvmPackages, makeWrapper
+, libksysguard, konsole, llvmPackages, makeWrapper
}:
let
pname = "kdevelop";
- version = "5.0.2";
- dirVersion = "5.0.2";
+ version = "5.0.3";
+ dirVersion = "5.0.3";
in
stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://kde/stable/${pname}/${dirVersion}/src/${name}.tar.xz";
- sha256 = "9b017901167723230dee8b565cdc7b0e61762415ffcc0a32708f04f7ab668666";
+ sha256 = "17a58dfc38b853c6c5987084e8973b4f7f5015a6c2c20f94c2a9f96b0c13f601";
};
nativeBuildInputs = [
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews
kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor
threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner
- kdevplatform kdevelop-pg-qt shared_mime_info libksysguard
+ kdevplatform kdevelop-pg-qt shared_mime_info libksysguard konsole.unwrapped
llvmPackages.llvm llvmPackages.clang-unwrapped
];
diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
index d8a7e7f2b9e..93c3eac9c34 100644
--- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
@@ -6,8 +6,8 @@
let
pname = "kdevplatform";
- version = "5.0.2";
- dirVersion = "5.0.2";
+ version = "5.0.3";
+ dirVersion = "5.0.3";
in
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://kde/stable/kdevelop/${dirVersion}/src/${name}.tar.xz";
- sha256 = "a7f311198bb72f5fee064d99055e8df39ecf4e9066fe5c0ff901ee8c24d960ec";
+ sha256 = "643d1145e1948af221f9ae148d0a10809f3d89af4b97ff0d6c4d571004f46bd4";
};
nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ];
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 341b8063f66..738476b98e2 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -12,10 +12,10 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "nano-${version}";
- version = "2.7.1";
+ version = "2.7.2";
src = fetchurl {
url = "mirror://gnu/nano/${name}.tar.xz";
- sha256 = "1kapx0fyp0a0pvsdd1n59pm3acrimdrp7ciglg098wqxhdlvwp6z";
+ sha256 = "1hlhwgvzdgkc7k74fbbn49hn6vmvzqr7h8gclgl7r1c6qrrny0bp";
};
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
buildInputs = [ ncurses ];
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 57a684d5572..354aaf6db54 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -5,6 +5,7 @@
, withPython ? true, pythonPackages, extraPythonPackages ? []
, withPython3 ? true, python3Packages, extraPython3Packages ? []
, withJemalloc ? true, jemalloc
+, withRuby ? true, bundlerEnv
, withPyGUI ? false
, vimAlias ? false
@@ -23,8 +24,8 @@ let
src = fetchFromGitHub {
owner = "neovim";
repo = "libvterm";
- rev = "e0a3d4dbd44a9534bf7437ee98ceb26dabebf3ad";
- sha256 = "131mcnbdq4wvsf280v4az8vnakr78yrwlaihzgr5s1wmfjvf6knf";
+ rev = "11682793d84668057c5aedc3d7f8071bb54eaf2c";
+ sha256 = "0pd90yx6xsagrqjipi26sxri1l4wdnx23ziad1zbxnqx9njxa7g3";
};
buildInputs = [ perl ];
@@ -44,6 +45,14 @@ let
};
};
+ rubyEnv = bundlerEnv {
+ name = "neovim-ruby-env";
+ gemdir = ./ruby_provider;
+ };
+
+ rubyWrapper = ''--suffix PATH : \"${rubyEnv}/bin\" '' +
+ ''--suffix GEM_HOME : \"${rubyEnv}/${rubyEnv.ruby.gemPath}\" '';
+
pythonEnv = pythonPackages.python.buildEnv.override {
extraLibs = (
if withPyGUI
@@ -52,21 +61,27 @@ let
) ++ extraPythonPackages;
ignoreCollisions = true;
};
+ pythonWrapper = ''--cmd \"let g:python_host_prog='$out/bin/nvim-python'\" '';
python3Env = python3Packages.python.buildEnv.override {
extraLibs = [ python3Packages.neovim ] ++ extraPython3Packages;
ignoreCollisions = true;
};
+ python3Wrapper = ''--cmd \"let g:python3_host_prog='$out/bin/nvim-python3'\" '';
+ pythonFlags = optionalString (withPython || withPython3) ''--add-flags "${
+ (optionalString withPython pythonWrapper) +
+ (optionalString withPython3 python3Wrapper)
+ }"'';
neovim = stdenv.mkDerivation rec {
name = "neovim-${version}";
- version = "0.1.6";
+ version = "0.1.7";
src = fetchFromGitHub {
owner = "neovim";
repo = "neovim";
rev = "v${version}";
- sha256 = "0s8vqf4aym1d1h8yi0znpqw5rv9v3z64y5aha9dmynbwxa58q7pp";
+ sha256 = "0bk0raxlb1xsqyw9pmqmxvcq5szqhimidrasnvzrci84gld8cwz4";
};
enableParallelBuilding = true;
@@ -124,13 +139,8 @@ let
--prefix PATH : "$out/bin"
'' + optionalString withPython3 ''
ln -s ${python3Env}/bin/python3 $out/bin/nvim-python3
- '' + optionalString (withPython || withPython3) ''
- wrapProgram $out/bin/nvim --add-flags "${
- (optionalString withPython
- ''--cmd \"let g:python_host_prog='$out/bin/nvim-python'\" '') +
- (optionalString withPython3
- ''--cmd \"let g:python3_host_prog='$out/bin/nvim-python3'\" '')
- }"
+ '' + optionalString (withPython || withPython3 || withRuby) ''
+ wrapProgram $out/bin/nvim ${rubyWrapper + pythonFlags}
'';
meta = {
diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
index df98264d969..07660eaddf6 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -3,7 +3,7 @@
}:
let # not very usable ATM
- version = "0.2.3";
+ version = "0.2.4";
in
stdenv.mkDerivation {
name = "neovim-qt-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
owner = "equalsraf";
repo = "neovim-qt";
rev = "v${version}";
- sha256 = "0ichqph7nfw3934jf0sp81bqd376xna3f899cc2xg88alb4f16dv";
+ sha256 = "0yf9wwkl0lbbj3vyf8hxnlsk7jhk5ggivszyqxply69dbar9ww59";
};
# It tries to download libmsgpack; let's use ours.
diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile b/pkgs/applications/editors/neovim/ruby_provider/Gemfile
new file mode 100644
index 00000000000..eebecf2906f
--- /dev/null
+++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile
@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'neovim'
diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
new file mode 100644
index 00000000000..88100b2e8f8
--- /dev/null
+++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
@@ -0,0 +1,15 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ msgpack (1.0.2)
+ neovim (0.3.1)
+ msgpack (~> 1.0)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ neovim
+
+BUNDLED WITH
+ 1.12.5
diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
new file mode 100644
index 00000000000..c3ed45a7848
--- /dev/null
+++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
@@ -0,0 +1,19 @@
+{
+ msgpack = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fb2my91j08plsbbry5kilsrh7slmzgbbf6f55zy6xk28p9036lg";
+ type = "gem";
+ };
+ version = "1.0.2";
+ };
+ neovim = {
+ dependencies = ["msgpack"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "018mk4vqaxzbk4anq558h2rgj8prbn2rmi777iwrg3n0v8k5nxqw";
+ type = "gem";
+ };
+ version = "0.3.1";
+ };
+}
\ No newline at end of file
diff --git a/pkgs/applications/editors/vim/cflags-prune.diff b/pkgs/applications/editors/vim/cflags-prune.diff
new file mode 100644
index 00000000000..6bec4fec09e
--- /dev/null
+++ b/pkgs/applications/editors/vim/cflags-prune.diff
@@ -0,0 +1,15 @@
+diff --git a/src/Makefile b/src/Makefile
+index 864f54b..fd85f76 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -2806,8 +2806,8 @@ auto/pathdef.c: Makefile auto/config.mk
+ -@echo '#include "vim.h"' >> $@
+ -@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' | $(QUOTESED) >> $@
+ -@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' | $(QUOTESED) >> $@
+- -@echo 'char_u *all_cflags = (char_u *)"$(CC) -c -I$(srcdir) $(ALL_CFLAGS)";' | $(QUOTESED) >> $@
+- -@echo 'char_u *all_lflags = (char_u *)"$(CC) $(ALL_LIB_DIRS) $(LDFLAGS) -o $(VIMTARGET) $(ALL_LIBS) ";' | $(QUOTESED) >> $@
++ -@echo 'char_u *all_cflags = (char_u *)"see nix-store --read-log $(out)";' | $(QUOTESED) >> $@
++ -@echo 'char_u *all_lflags = (char_u *)"see nix-store --read-log $(out)";' | $(QUOTESED) >> $@
+ -@echo 'char_u *compiled_user = (char_u *)"' | tr -d $(NL) >> $@
+ -@if test -n "$(COMPILEDBY)"; then \
+ echo "$(COMPILEDBY)" | tr -d $(NL) >> $@; \
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
new file mode 100644
index 00000000000..39975c3dc69
--- /dev/null
+++ b/pkgs/applications/editors/vim/common.nix
@@ -0,0 +1,30 @@
+{ lib, fetchFromGitHub }:
+rec {
+ version = "8.0.0075";
+
+ src = fetchFromGitHub {
+ owner = "vim";
+ repo = "vim";
+ rev = "v${version}";
+ sha256 = "1imhvrd90f797jlbzvx8sc08h53s55ns6jxy1kl5kh8lz1qq455w";
+ };
+
+ enableParallelBuilding = true;
+
+ hardeningDisable = [ "fortify" ];
+
+ postPatch =
+ # Use man from $PATH; escape sequences are still problematic.
+ ''
+ substituteInPlace runtime/ftplugin/man.vim \
+ --replace "/usr/bin/man " "man "
+ '';
+
+ meta = with lib; {
+ description = "The most popular clone of the VI editor";
+ homepage = http://www.vim.org;
+ license = licenses.vim;
+ maintainers = with maintainers; [ lovek323 ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 4ab0ca3f27c..d0a0c63d9d0 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -1,7 +1,7 @@
# TODO tidy up eg The patchelf code is patching gvim even if you don't build it..
# but I have gvim with python support now :) - Marc
-args@{pkgs, source ? "default", fetchurl, fetchFromGitHub, stdenv, ncurses, pkgconfig, gettext
-, composableDerivation, lib, config, glib, gtk2, python, perl, tcl, ruby
+args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext
+, composableDerivation, writeText, lib, config, glib, gtk2, python, perl, tcl, ruby
, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
, libICE
@@ -11,8 +11,9 @@ args@{pkgs, source ? "default", fetchurl, fetchFromGitHub, stdenv, ncurses, pkgc
, ... }: with args;
-let inherit (args.composableDerivation) composableDerivation edf;
- nixosRuntimepath = pkgs.writeText "nixos-vimrc" ''
+let
+ inherit (args.composableDerivation) composableDerivation edf;
+ nixosRuntimepath = writeText "nixos-vimrc" ''
set nocompatible
syntax on
@@ -37,25 +38,18 @@ let inherit (args.composableDerivation) composableDerivation edf;
source /etc/vim/vimrc
endif
'';
+
+ common = callPackage ./common.nix {};
in
composableDerivation {
} (fix: rec {
name = "vim_configurable-${version}";
- version = "8.0.0005";
- enableParallelBuilding = true; # test this
+ inherit (common) version postPatch hardeningDisable enableParallelBuilding meta;
- src =
- builtins.getAttr source {
- "default" =
- # latest release
- args.fetchFromGitHub {
- owner = "vim";
- repo = "vim";
- rev = "v${version}";
- sha256 = "0ys3l3dr43vjad1f096ch1sl3x2ajsqkd03rdn6n812m7j4wipx0";
- };
+ src = builtins.getAttr source {
+ "default" = common.src; # latest release
"vim-nox" =
{
@@ -67,31 +61,27 @@ composableDerivation {
}.src;
};
- prePatch = "cd src";
+ patches = [ ./cflags-prune.diff ];
configureFlags
= [ "--enable-gui=${args.gui}" "--with-features=${args.features}" ];
- nativeBuildInputs
- = [ ncurses pkgconfig gtk2 libX11 libXext libSM libXpm libXt libXaw libXau
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs
+ = [ ncurses gtk2 libX11 libXext libSM libXpm libXt libXaw libXau
libXmu glib libICE ];
# most interpreters aren't tested yet.. (see python for example how to do it)
flags = {
ftNix = {
- # because we cd to src in the main patch phase, we can't just add this
- # patch to the list, we have to apply it manually
- postPatch = ''
- cd ../runtime
- patch -p2 < ${./ft-nix-support.patch}
- cd ..
- '';
+ patches = [ ./ft-nix-support.patch ];
};
}
// edf {
name = "darwin";
enable = {
- nativeBuildInputs = [ CoreServices CoreData Cocoa Foundation libobjc cf-private ];
+ buildInputs = [ CoreServices CoreData Cocoa Foundation libobjc cf-private ];
NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
"/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
};
@@ -105,7 +95,7 @@ composableDerivation {
name = "python";
feat = "python${if python ? isPy3 then "3" else ""}interp";
enable = {
- nativeBuildInputs = [ python ];
+ buildInputs = [ python ];
} // lib.optionalAttrs stdenv.isDarwin {
configureFlags
= [ "--enable-python${if python ? isPy3 then "3" else ""}interp=yes"
@@ -114,13 +104,13 @@ composableDerivation {
};
}
- // edf { name = "tcl"; feat = "tclinterp"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter.
- // edf { name = "ruby"; feat = "rubyinterp"; enable = { nativeBuildInputs = [ruby]; };} #Include Ruby interpreter.
+ // edf { name = "tcl"; feat = "tclinterp"; enable = { buildInputs = [tcl]; }; } #Include Tcl interpreter.
+ // edf { name = "ruby"; feat = "rubyinterp"; enable = { buildInputs = [ruby]; };} #Include Ruby interpreter.
// edf {
name = "lua";
feat = "luainterp";
enable = {
- nativeBuildInputs = [lua];
+ buildInputs = [lua];
configureFlags = [
"--with-lua-prefix=${args.lua}"
"--enable-luainterp"
@@ -172,28 +162,13 @@ composableDerivation {
*/
postInstall = stdenv.lib.optionalString stdenv.isLinux ''
- rpath=`patchelf --print-rpath $out/bin/vim`;
- for i in $nativeBuildInputs; do
- echo adding $i/lib
- rpath=$rpath:$i/lib
- done
- echo $nativeBuildInputs
- echo $rpath
- patchelf --set-rpath $rpath $out/bin/{vim,gvim}
+ patchelf --set-rpath \
+ "$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \
+ "$out"/bin/{vim,gvim}
- ln -sfn ${nixosRuntimepath} $out/share/vim/vimrc
+ ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc
'';
dontStrip = 1;
-
- hardeningDisable = [ "fortify" ];
-
- meta = with stdenv.lib; {
- description = "The most popular clone of the VI editor";
- homepage = http://www.vim.org;
- license = licenses.vim;
- maintainers = with maintainers; [ lovek323 ];
- platforms = platforms.unix;
- };
})
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 1511b386579..8c9a725ddd6 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, ncurses, gettext, pkgconfig
+{ stdenv, fetchurl, callPackage, ncurses, gettext, pkgconfig
# default vimrc
, vimrc ? fetchurl {
name = "default-vimrc";
@@ -8,18 +8,13 @@
# apple frameworks
, Carbon, Cocoa }:
+let
+ common = callPackage ./common.nix {};
+in
stdenv.mkDerivation rec {
name = "vim-${version}";
- version = "8.0.0005";
- src = fetchFromGitHub {
- owner = "vim";
- repo = "vim";
- rev = "v${version}";
- sha256 = "0ys3l3dr43vjad1f096ch1sl3x2ajsqkd03rdn6n812m7j4wipx0";
- };
-
- enableParallelBuilding = true;
+ inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta;
buildInputs = [ ncurses pkgconfig ]
++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
@@ -30,8 +25,6 @@ stdenv.mkDerivation rec {
"--enable-nls"
];
- hardeningDisable = [ "fortify" ];
-
postInstall = ''
ln -s $out/bin/vim $out/bin/vi
mkdir -p $out/share/vim
@@ -62,12 +55,4 @@ stdenv.mkDerivation rec {
# patchPhase = ''
# sed -i -e 's/as_fn_error.*int32.*/:/' src/auto/configure
# '';
-
- meta = with stdenv.lib; {
- description = "The most popular clone of the VI editor";
- homepage = http://www.vim.org;
- license = licenses.vim;
- maintainers = with maintainers; [ lovek323 ];
- platforms = platforms.unix;
- };
}
diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index f7983f71385..689a1537b69 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,20 +2,20 @@
makeWrapper, libXScrnSaver }:
let
- version = "1.6.1";
- rev = "9e4e44c19e393803e2b05fe2323cf4ed7e36880e";
+ version = "1.8.0";
+ rev = "38746938a4ab94f2f57d9e1309c51fd6fb37553d";
- sha256 = if stdenv.system == "i686-linux" then "1aks84siflpjbd2s9y1f0vvvf3nas4f50cimjf25lijxzjxrlivy"
- else if stdenv.system == "x86_64-linux" then "05kbi081ih64fadj4k74grkk9ca3wga6ybwgs5ld0bal4ilw1q6i"
- else if stdenv.system == "x86_64-darwin" then "00p2m8b0l3pkf5k74szw6kcql3j1fjnv3rwnhy24wfkg4b4ah2x9"
+ sha256 = if stdenv.system == "i686-linux" then "0p7r1i71v2ab4dzlwh43hqih958a31cqskf64ds4vgc35x2mfjcq"
+ else if stdenv.system == "x86_64-linux" then "1k15701jskk7w5kwzlzfri96vvw7fcinyfqqafls8nms8h5csv76"
+ else if stdenv.system == "x86_64-darwin" then "12fqz62gs2wcg2wwx1k6gv2gqil9c54yq254vk3rqdf82q9zyapk"
else throw "Unsupported system: ${stdenv.system}";
urlBase = "https://az764295.vo.msecnd.net/stable/${rev}/";
urlStr = if stdenv.system == "i686-linux" then
- urlBase + "code-stable-code_${version}-1476372351_i386.tar.gz"
+ urlBase + "code-stable-code_${version}-1481650382_i386.tar.gz"
else if stdenv.system == "x86_64-linux" then
- urlBase + "code-stable-code_${version}-1476373175_amd64.tar.gz"
+ urlBase + "code-stable-code_${version}-1481651903_amd64.tar.gz"
else if stdenv.system == "x86_64-darwin" then
urlBase + "VSCode-darwin-stable.zip"
else throw "Unsupported system: ${stdenv.system}";
diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index 7282dc0ba20..58971b3199b 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, pkgconfig, ncurses, boehmgc, perl, help2man }:
stdenv.mkDerivation rec {
- name = "zile-2.4.11";
+ name = "zile-2.4.13";
src = fetchurl {
url = "mirror://gnu/zile/${name}.tar.gz";
- sha256 = "1k593y1xzvlj52q0gyhcx2lllws4sg84b8r9pcginjb1vjypplhz";
+ sha256 = "03mcg0bxkzprlsx8y6h22w924pzx4a9zr7zm3g11j8j3x9lz75f7";
};
buildInputs = [ pkgconfig ncurses boehmgc ];
diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix
index fb6c76be079..44e07cc22c0 100644
--- a/pkgs/applications/gis/grass/default.nix
+++ b/pkgs/applications/gis/grass/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw
, cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas
-, proj, gdal, geos, sqlite, postgresql, mysql, pythonPackages
+, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages
}:
stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite pkgconfig cairo
readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.client blas ]
- ++ (with pythonPackages; [ python dateutil wxPython30 numpy ]);
+ ++ (with python2Packages; [ python dateutil wxPython30 numpy ]);
configureFlags = [
"--with-proj-share=${proj}/share/proj"
@@ -59,7 +59,7 @@ stdenv.mkDerivation {
postInstall = ''
wrapProgram $out/bin/grass70 \
--set PYTHONPATH $PYTHONPATH \
- --set GRASS_PYTHON ${pythonPackages.python}/bin/${pythonPackages.python.executable}
+ --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable}
ln -s $out/grass-*/lib $out/lib
'';
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index cce683067e7..680cf921ce2 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
-, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper
+, qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper
, qjson, qca2, txt2tags, openssl
, withGrass ? false, grass
}:
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++
(stdenv.lib.optional withGrass grass) ++
- (with pythonPackages; [ numpy psycopg2 requests2 pythonPackages.qscintilla sip ]);
+ (with python2Packages; [ numpy psycopg2 requests2 python2Packages.qscintilla sip ]);
nativeBuildInputs = [ cmake makeWrapper ];
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index c7d1adfdd18..8030302cdcf 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -11,8 +11,8 @@ let
else throw "ImageMagick is not supported on this platform.";
cfg = {
- version = "6.9.6-2";
- sha256 = "139h9lycxw3lszn052m34xm0rqyanin4nb529vxjcrkkzqilh91r";
+ version = "6.9.6-7";
+ sha256 = "1ls3g4gpdh094n03szr9arpr0rfwd1krv2s9gnck8j0ab10ccgs5";
patches = [];
}
# Freeze version on mingw so we don't need to port the patch too often.
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
"mirror://imagemagick/releases/ImageMagick-${version}.tar.xz"
# the original source above removes tarballs quickly
"http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz"
+ "https://bintray.com/homebrew/mirror/download_file?file_path=imagemagick-${version}.tar.xz"
];
inherit (cfg) sha256;
};
diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix
index e130b23a8aa..a9b2eb1163a 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/applications/graphics/apitrace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libX11, procps, python, libdwarf, qtbase, qtwebkit }:
+{ stdenv, fetchFromGitHub, cmake, libX11, procps, python2, libdwarf, qtbase, qtwebkit }:
stdenv.mkDerivation rec {
name = "apitrace-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
# LD_PRELOAD wrappers need to be statically linked to work against all kinds
# of games -- so it's fine to use e.g. bundled snappy.
- buildInputs = [ libX11 procps python libdwarf qtbase qtwebkit ];
+ buildInputs = [ libX11 procps python2 libdwarf qtbase qtwebkit ];
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/graphics/digikam/5.1.nix b/pkgs/applications/graphics/digikam/5.nix
similarity index 95%
rename from pkgs/applications/graphics/digikam/5.1.nix
rename to pkgs/applications/graphics/digikam/5.nix
index 6bd572e99bb..3e5d1b7b52e 100644
--- a/pkgs/applications/graphics/digikam/5.1.nix
+++ b/pkgs/applications/graphics/digikam/5.nix
@@ -45,11 +45,11 @@
stdenv.mkDerivation rec {
name = "digikam-${version}";
- version = "5.1.0";
+ version = "5.3.0";
src = fetchurl {
url = "http://download.kde.org/stable/digikam/${name}.tar.xz";
- sha256 = "1w97a5cmg39dgmjgmjwa936gcrmxjms3h2ww61qi1lny84p5x4a7";
+ sha256 = "0p1y5kgkz7lzzqpf7qd3mmg59zfdkkz9jg7knldd8dl94wkzlv5k";
};
nativeBuildInputs = [ cmake ecm makeQtWrapper ];
diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix
index 65209cbd6ff..75033cf0f9d 100644
--- a/pkgs/applications/graphics/fbida/default.nix
+++ b/pkgs/applications/graphics/fbida/default.nix
@@ -1,20 +1,18 @@
{ stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm
-, pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends
-}:
+, pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm
+, epoxy, poppler }:
stdenv.mkDerivation rec {
- name = "fbida-2.11";
+ name = "fbida-2.12";
src = fetchurl {
url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz";
- sha256 = "00x1lppb66b0gvp6sqs7zjgnlfh80lnkwvsm15ifzvlss3b67akw";
+ sha256 = "0bw224vb7jh0lrqaf4jgxk48xglvxs674qcpj5y0axyfbh896cfk";
};
nativeBuildInputs = [ pkgconfig which ];
- buildInputs =
- [ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp
- imagemagick curl sane-backends libdrm
- ];
+ buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff
+ libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler ];
makeFlags = [ "prefix=$(out)" "verbose=yes" ];
@@ -34,6 +32,6 @@ stdenv.mkDerivation rec {
homepage = https://www.kraxel.org/blog/linux/fbida/;
license = licenses.gpl2;
maintainers = with maintainers; [ pSub ];
- platforms = with platforms; linux;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 9fd669551de..fa6db4e7f02 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/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index 91f8e677adb..651bfafcead 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -15,15 +15,15 @@ stdenv.mkDerivation {
patches = [
./disable-popen.patch
(fetchpatch {
- url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-4/debian/patches/CVE-2016-7996_CVE-2016-7997.patch";
+ url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7996_CVE-2016-7997.patch";
sha256 = "0xsby2z8n7cnnln7szjznq7iaabq323wymvdjra59yb41aix74r2";
})
(fetchpatch {
- url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-4/debian/patches/CVE-2016-7800_part1.patch";
+ url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7800_part1.patch";
sha256 = "02s0x9bkbnm5wrd0d2x9ld4d9z5xqpfk310lyylyr5zlnhqxmwgn";
})
(fetchpatch {
- url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-4/debian/patches/CVE-2016-7800_part2.patch";
+ url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7800_part2.patch";
sha256 = "1h4xv3i1aq5avsd584rwa5sa7ca8f7w9ggmh7j2llqq5kymwsv5f";
})
(fetchpatch {
diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix
index a446ab5dd18..d8052f93345 100644
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -1,18 +1,25 @@
-{ stdenv, fetchFromGitHub, unzip, ftgl, glew, asciidoc
+{ stdenv, fetchFromGitHub, fetchpatch, unzip, ftgl, glew, asciidoc
, cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
, libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff
, gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }:
stdenv.mkDerivation rec {
- version = "0.8.0.5";
+ version = "0.8.0.6";
name = "k3d-${version}";
src = fetchFromGitHub {
owner = "K-3D";
repo = "k3d";
rev = name;
- sha256 = "0q05d51vhnmrq887n15frpwkhx8w7n20h2sc1lpr338jzpryihb3";
+ sha256 = "0vdjjg6h8mxm2n8mvkkg2mvd27jn2xx90hnmx23cbd35mpz9p4aa";
};
-
+
+ patches = [
+ (fetchpatch { /* glibmm 2.50 fix */
+ url = https://github.com/K-3D/k3d/commit/c65889d0652490d88a573e47de7a9324bf27bff2.patch;
+ sha256 = "162icv1hicr2dirkb9ijacvg9bhz5j30yfwg7b45ijavk8rns62j";
+ })
+ ];
+
cmakeFlags = "-DK3D_BUILD_DOCS=false -DK3D_BUILD_GUIDE=false";
preConfigure = ''
@@ -33,7 +40,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A 3D editor with support for procedural editing";
- homepage = "http://k-3d.org/";
+ homepage = http://www.k-3d.org/;
platforms = with stdenv.lib.platforms;
linux;
maintainers = with stdenv.lib.maintainers;
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index f29d09b8ef7..fded09545e1 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, cmake, extra-cmake-modules, makeQtWrapper
+{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, makeQtWrapper
, karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons
, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
, kio, kcrash
@@ -8,12 +8,11 @@
stdenv.mkDerivation rec {
name = "krita-${version}";
- version = "3.0";
+ version = "3.0.1.1";
- src = fetchgit {
- url = "http://phabricator.kde.org/diffusion/KRITA/krita.git";
- rev = "refs/tags/v${version}";
- sha256 = "0aas86667ncp8jz00c8qk7bm26g76l65cysh06wxr8kxbvqynrdn";
+ src = fetchurl {
+ url = "http://download.kde.org/stable/krita/${version}/${name}.tar.gz";
+ sha256 = "0v58p9am2gsrgn5nhynvdg1a7v8d9kcsswb1962r8ijszm3fav5k";
};
nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ];
diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix
index 27d6c207e68..db5e6e1a7e3 100644
--- a/pkgs/applications/graphics/mypaint/default.nix
+++ b/pkgs/applications/graphics/mypaint/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, gettext, glib, gtk2, hicolor_icon_theme, json_c
-, lcms2, libpng , makeWrapper, pkgconfig, pythonPackages
+, lcms2, libpng , makeWrapper, pkgconfig, python2Packages
, scons, swig
}:
let
- inherit (pythonPackages) python pygtk numpy;
+ inherit (python2Packages) python pygtk numpy;
in stdenv.mkDerivation rec {
name = "mypaint-${version}";
version = "1.1.0";
diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix
index 4b8c7a4fe92..c0a0206ddd1 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/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix
index 0d52e563c9d..3d4e8c592ab 100644
--- a/pkgs/applications/graphics/shutter/default.nix
+++ b/pkgs/applications/graphics/shutter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg }:
+{ stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg }:
let
perlModules = with perlPackages;
@@ -18,6 +18,14 @@ stdenv.mkDerivation rec {
sha256 = "09cn3scwy98wqxkrjhnmxhpfnnynlbb41856yn5m3zwzqrxiyvak";
};
+ patches = [
+ (fetchpatch {
+ url = "http://svnweb.mageia.org/packages/cauldron/shutter/current/SOURCES/CVE-2015-0854.patch?revision=880308&view=co";
+ name = "CVE-2015-0854.patch";
+ sha256 = "14r18sxz3ylf39cn9b85snjhjxdk6ngq4vnpljwghw2q5430nb12";
+ })
+ ];
+
buildInputs = [ perl makeWrapper gdk_pixbuf librsvg ] ++ perlModules;
installPhase = ''
diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix
index 375b0999548..1f1da9a389f 100644
--- a/pkgs/applications/graphics/tesseract/default.nix
+++ b/pkgs/applications/graphics/tesseract/default.nix
@@ -1,53 +1,31 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, leptonica, libpng, libtiff
-, enableLanguages ? null
+{ stdenv, fetchFromGitHub, pkgconfig, leptonica, libpng, libtiff
+, icu, pango, opencl-headers
}:
-with stdenv.lib;
-
-let
- majVersion = "3.02";
- version = "${majVersion}.02";
-
- mkLang = lang: sha256: let
- src = fetchurl {
- url = "http://tesseract-ocr.googlecode.com/files/tesseract-ocr-${majVersion}.${lang}.tar.gz";
- inherit sha256;
- };
- in "tar xfvz ${src} -C $out/share/ --strip=1";
-
- wantLang = name: const (enableLanguages == null || elem name enableLanguages);
-
- extraLanguages = mapAttrsToList mkLang (filterAttrs wantLang {
- cat = "0d1smiv1b3k9ay2s05sl7q08mb3ln4w5iiiymv2cs8g8333z8jl9";
- rus = "059336mkhsj9m3hwfb818xjlxkcdpy7wfgr62qwz65cx914xl709";
- spa = "1c9iza5mbahd9pa7znnq8yv09v5kz3gbd2sarcgcgc1ps1jc437l";
- nld = "162acxp1yb6gyki2is3ay2msalmfcsnrlsd9wml2ja05k94m6bjy";
- eng = "1y5xf794n832s3lymzlsdm2s9nlrd2v27jjjp0fd9xp7c2ah4461";
- slv = "0rqng43435cly32idxm1lvxkcippvc3xpxbfizwq5j0155ym00dr";
- jpn = "07v8pymd0iwyzh946lxylybda20gsw7p4fsb09jw147955x49gq9";
- });
-in
-
stdenv.mkDerivation rec {
name = "tesseract-${version}";
+ version = "3.04.01";
- src = fetchurl {
- url = "http://tesseract-ocr.googlecode.com/files/tesseract-ocr-${version}.tar.gz";
- sha256 = "0g81m9y4iydp7kgr56mlkvjdwpp3mb01q385yhdnyvra7z5kkk96";
+ src = fetchFromGitHub {
+ owner = "tesseract-ocr";
+ repo = "tesseract";
+ rev = version;
+ sha256 = "0h1x4z1h86n2gwknd0wck6gykkp99bmm02lg4a47a698g4az6ybv";
};
- buildInputs = [ autoconf automake libtool leptonica libpng libtiff ];
+ tessdata = fetchFromGitHub {
+ owner = "tesseract-ocr";
+ repo = "tessdata";
+ rev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d";
+ sha256 = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7";
+ };
- hardeningDisable = [ "format" ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ];
- preConfigure = ''
- ./autogen.sh
- substituteInPlace "configure" \
- --replace 'LIBLEPT_HEADERSDIR="/usr/local/include /usr/include"' \
- 'LIBLEPT_HEADERSDIR=${leptonica}/include'
- '';
+ LIBLEPT_HEADERSDIR = "${leptonica}/include";
- postInstall = concatStringsSep "; " extraLanguages;
+ postInstall = "cp -Rt \"$out/share/tessdata\" \"$tessdata/\"*";
meta = {
description = "OCR engine";
diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix
new file mode 100644
index 00000000000..39db1dd1f6d
--- /dev/null
+++ b/pkgs/applications/graphics/vimiv/default.nix
@@ -0,0 +1,72 @@
+{ lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead
+, hicolor_icon_theme, defaultIconTheme
+
+# Test requirements
+, dbus, xvfb_run, xdotool
+}:
+
+python3Packages.buildPythonApplication rec {
+ name = "vimiv";
+ version = "0.7.3";
+
+ src = fetchFromGitHub {
+ owner = "karlch";
+ repo = "vimiv";
+ rev = "v${version}";
+ sha256 = "18dn81n8hcrqhrqfida34qz7a0ar9rz2rrmzsvyp54zc6nyvv1cn";
+ };
+
+ testimages = fetchFromGitHub {
+ owner = "karlch";
+ repo = "vimiv";
+ rev = "6f4d1372b27f2065c56eafdb521d230d9bb8f4e2";
+ sha256 = "0a3aybzpms0381dz9japhm4c7j5klhmw91prcac6zaww6x34nmxb";
+ };
+
+ postPatch = ''
+ patchShebangs scripts/install_icons.sh
+ sed -i -e 's,/usr,,g' -e '/setup\.py/d' Makefile scripts/install_icons.sh
+
+ sed -i \
+ -e 's,/etc/vimiv/\(vimivrc\|keys\.conf\),'"$out"'&,g' \
+ man/* vimiv/parser.py
+
+ sed -i \
+ -e 's!"mogrify"!"${imagemagick}/bin/mogrify"!g' \
+ -e '/cmd *=/s!"jhead"!"${jhead}/bin/jhead"!g' \
+ vimiv/imageactions.py
+ '';
+
+ checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ];
+ buildInputs = [ hicolor_icon_theme defaultIconTheme librsvg ];
+ propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ];
+
+ makeWrapperArgs = [
+ "--prefix GI_TYPELIB_PATH : \"$GI_TYPELIB_PATH\""
+ "--suffix XDG_DATA_DIRS : \"$XDG_ICON_DIRS:$out/share\""
+ "--set GDK_PIXBUF_MODULE_FILE \"$GDK_PIXBUF_MODULE_FILE\""
+ ];
+
+ postCheck = ''
+ # Some tests assume that the directory only contains one vimiv directory
+ rm -rf vimiv.egg-info vimiv.desktop
+
+ # Re-use the wrapper args from the main program
+ makeWrapper "$SHELL" run-tests $makeWrapperArgs
+
+ cp -Rd --no-preserve=mode "$testimages/testimages" vimiv/testimages
+ HOME="$(mktemp -d)" PATH="$out/bin:$PATH" \
+ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+ --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+ ./run-tests -c 'python tests/main_test.py && nosetests -vx'
+ '';
+
+ postInstall = "make DESTDIR=\"$out\" install";
+
+ meta = {
+ homepage = "https://github.com/karlch/vimiv";
+ description = "An image viewer with Vim-like keybindings";
+ license = lib.licenses.mit;
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix
index b81efb08d8a..669fc5a28a7 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/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index afb48c697b5..d97a970df2a 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "yEd-${version}";
- version = "3.16.1";
+ version = "3.16.2.1";
src = requireFile {
name = "${name}.zip";
url = "https://www.yworks.com/en/products/yfiles/yed/";
- sha256 = "0h7ykcpvsikjfap51hpcz6z814riiwyps585j2i1yv9dmsbqdi7j";
+ sha256 = "019qfmdifqsrc9h4g3zbn7ivdc0dzlp3isa5ixdkgdhfsdm79b27";
};
nativeBuildInputs = [ unzip makeWrapper ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
license = licenses.unfree;
- homepage = http://www.yworks.com/en/products/yfiles/yed/;
+ homepage = "http://www.yworks.com/en/products/yfiles/yed/";
description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams";
platforms = jre.meta.platforms;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 7b47b9fb3cb..b98d327d3b8 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,20 +1,18 @@
-{ stdenv, fetchurl, fetchpatch, python, pyqt5, sip, poppler_utils, pkgconfig, libpng
+{ stdenv, fetchurl, fetchpatch, poppler_utils, pkgconfig, libpng
, imagemagick, libjpeg, fontconfig, podofo, qtbase, qmakeHook, icu, sqlite
-, makeWrapper, unrarSupport ? false, chmlib, pythonPackages, xz, libusb1, libmtp
+, makeWrapper, unrarSupport ? false, chmlib, python2Packages, xz, libusb1, libmtp
, xdg_utils, makeDesktopItem
}:
stdenv.mkDerivation rec {
- version = "2.70.0";
+ version = "2.73.0";
name = "calibre-${version}";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
- sha256 = "18iv1c2nx93gkfqa3k2m42dk4p59b9zp08fggb6imc1xqh2icfch";
+ sha256 = "17qs7dakzd25wbshsny2x82ppdqa6kwwfbp2vp1i8qmfc1nq61gc";
};
- inherit python;
-
patches = [
# Patches from Debian that:
# - disable plugin installation (very insecure)
@@ -39,7 +37,7 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
prePatch = ''
- sed -i "/pyqt_sip_dir/ s:=.*:= '${pyqt5}/share/sip/PyQt5':" \
+ sed -i "/pyqt_sip_dir/ s:=.*:= '${python2Packages.pyqt5}/share/sip/PyQt5':" \
setup/build_environment.py
# Remove unneeded files and libs
@@ -48,18 +46,15 @@ stdenv.mkDerivation rec {
'';
dontUseQmakeConfigure = true;
- # hack around a build problem
- preBuild = ''
- mkdir -p ../tmp.*/lib
- '';
nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ];
buildInputs = [
- python pyqt5 sip poppler_utils libpng imagemagick libjpeg
+ poppler_utils libpng imagemagick libjpeg
fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils
- ] ++ (with pythonPackages; [
+ ] ++ (with python2Packages; [
apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow
+ python pyqt5 sip
# the following are distributed with calibre, but we use upstream instead
chardet cherrypy html5lib odfpy routes
]);
@@ -74,8 +69,8 @@ stdenv.mkDerivation rec {
export FC_LIB_DIR=${fontconfig.lib}/lib
export PODOFO_INC_DIR=${podofo}/include/podofo
export PODOFO_LIB_DIR=${podofo}/lib
- export SIP_BIN=${sip}/bin/sip
- python setup.py install --prefix=$out
+ export SIP_BIN=${python2Packages.sip}/bin/sip
+ ${python2Packages.python.interpreter} setup.py install --prefix=$out
PYFILES="$out/bin/* $out/lib/calibre/calibre/web/feeds/*.py
$out/lib/calibre/calibre/ebooks/metadata/*.py
diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix
index 09bc8f25b26..246a50842c6 100644
--- a/pkgs/applications/misc/cheat/default.nix
+++ b/pkgs/applications/misc/cheat/default.nix
@@ -1,15 +1,17 @@
{ python3Packages, fetchurl, lib }:
python3Packages.buildPythonApplication rec {
- version = "2.1.26";
+ version = "2.1.27";
name = "cheat-${version}";
propagatedBuildInputs = with python3Packages; [ docopt pygments ];
src = fetchurl {
url = "mirror://pypi/c/cheat/${name}.tar.gz";
- sha256 = "0yilm9ba6ll9wzh20gj3lg9mnc50q95m6sqmjp2vcghwgipdixpm";
+ sha256 = "1mrrfwd4ivas0alfkhjryxxzf24a4ngk8c6n2zlfb8ziwf7czcqd";
};
+ # no tests available
+ doCheck = false;
meta = {
description = "cheat allows you to create and view interactive cheatsheets on the command-line";
diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix
index 3cc334c6765..150c900ba9f 100644
--- a/pkgs/applications/misc/cpp-ethereum/default.nix
+++ b/pkgs/applications/misc/cpp-ethereum/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
dontStrip = true;
meta = with stdenv.lib; {
- decription = "Ethereum C++ client";
+ description = "Ethereum C++ client";
homepage = https://github.com/ethereum/cpp-ethereum;
license = licenses.gpl3;
maintainers = with maintainers; [ artuuge ];
diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 0c51cb13262..221bd3c4bf5 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -1,7 +1,8 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, fetchFromGitHub, fetchpatch
, pkgconfig, which, perl
, cairo, dbus, freetype, gdk_pixbuf, glib, libX11, libXScrnSaver
, libXext, libXinerama, libnotify, libxdg_basedir, pango, xproto
+, librsvg
}:
stdenv.mkDerivation rec {
@@ -15,11 +16,17 @@ stdenv.mkDerivation rec {
sha256 = "102s0rkcdz22hnacsi3dhm7kj3lsw9gnikmh3a7wk862nkvvwjmk";
};
+ patches = [(fetchpatch {
+ name = "add-svg-support.patch";
+ url = "https://github.com/knopwob/dunst/commit/63b11141185d1d07a6d12212257a543e182d250a.patch";
+ sha256 = "0giiaj5zjim7xqcav5ij5gn4x6nnchkllwcx0ln16j0p3vbi4y4x";
+ })];
+
nativeBuildInputs = [ perl pkgconfig which ];
buildInputs = [
cairo dbus freetype gdk_pixbuf glib libX11 libXScrnSaver libXext
- libXinerama libnotify libxdg_basedir pango xproto
+ libXinerama libnotify libxdg_basedir pango xproto librsvg
];
outputs = [ "out" "man" ];
diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix
index 7abeaf57b64..917d32e74af 100644
--- a/pkgs/applications/misc/electrum-dash/default.nix
+++ b/pkgs/applications/misc/electrum-dash/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, python2Packages }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "electrum-dash-${version}";
version = "2.4.1";
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "02k7m7fyn0cvlgmwxr2gag7rf2knllkch1ma58shysp7zx9jb000";
};
- propagatedBuildInputs = with pythonPackages; [
+ propagatedBuildInputs = with python2Packages; [
dns
ecdsa
pbkdf2
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index bc562b7d577..e0d426e99b6 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, python2Packages }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "electrum-${version}";
- version = "2.7.11";
+ version = "2.7.12";
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
- sha256 = "0qy2ynyw57jgi7fw3xzsyy608yk4bhsda7qfw0j26zqinv52mrsb";
+ sha256 = "0vxdfl208if7mdsnva1jg37bnay2dsz3ww157aqwcv1j6512fi1n";
};
- propagatedBuildInputs = with pythonPackages; [
+ propagatedBuildInputs = with python2Packages; [
dns
ecdsa
jsonrpclib
@@ -36,6 +36,15 @@ pythonPackages.buildPythonApplication rec {
preBuild = ''
sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
pyrcc4 icons.qrc -o gui/qt/icons_rc.py
+ # Recording the creation timestamps introduces indeterminism to the build
+ sed -i '/Created: .*/d' gui/qt/icons_rc.py
+ '';
+
+ postInstall = ''
+ # Despite setting usr_share above, these files are installed under
+ # $out/nix ...
+ mv $out/lib/python2.7/site-packages/nix/store/*/share $out
+ rm -rf $out/lib/python2.7/site-packages/nix
'';
doInstallCheck = true;
diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix
new file mode 100644
index 00000000000..a77f87f6f1f
--- /dev/null
+++ b/pkgs/applications/misc/getxbook/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, openssl }:
+
+stdenv.mkDerivation rec {
+ name = "getxbook-${version}";
+ version = "1.2";
+
+ src = fetchurl {
+ url = "https://njw.me.uk/getxbook/${name}.tar.xz";
+ sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs";
+ };
+
+ buildInputs = [ openssl ];
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ meta = with stdenv.lib; {
+ description = "A collection of tools to download books from Google Books";
+ homepage = https://njw.me.uk/getxbook/;
+ license = licenses.isc;
+ maintainers = with maintainers; [ obadz ];
+ platforms = platforms.all;
+ inherit version;
+ };
+}
diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix
index efe39e5d8b7..497ac298d28 100644
--- a/pkgs/applications/misc/gnuradio/default.nix
+++ b/pkgs/applications/misc/gnuradio/default.nix
@@ -23,11 +23,11 @@
stdenv.mkDerivation rec {
name = "gnuradio-${version}";
- version = "3.7.9.2";
+ version = "3.7.10.1";
src = fetchurl {
url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz";
- sha256 = "0qdmakvgq3jxnnqpcn3k4q07vj8ycrbyzv32h76k71cv13w2yrki";
+ sha256 = "0ds9mcw8hgm03f82jvp3j4mm02ha6zvsl77lp13jzqmbqifbdmv3";
};
buildInputs = [
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index dde6b151c8b..30398747d43 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "josm-${version}";
- version = "10966";
+ version = "11223";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
- sha256 = "0ggiilqfr7n4b2qik1ddlx9h0dwzglfk10y1zmzw9ij0gfbxn791";
+ sha256 = "0fv1hlp98f178jy7lxnvq2rk6rq1zj62q6dv0vn02fvm00ia53s8";
};
phases = [ "installPhase" ];
diff --git a/pkgs/applications/misc/keepass-plugins/keefox/default.nix b/pkgs/applications/misc/keepass-plugins/keefox/default.nix
index cb48ff22bef..0215c5a71c2 100644
--- a/pkgs/applications/misc/keepass-plugins/keefox/default.nix
+++ b/pkgs/applications/misc/keepass-plugins/keefox/default.nix
@@ -1,12 +1,12 @@
{ stdenv, buildEnv, fetchurl, mono, unzip }:
let
- version = "1.6.3";
+ version = "1.6.4";
drv = stdenv.mkDerivation {
name = "keefox-${version}";
src = fetchurl {
url = "https://github.com/luckyrat/KeeFox/releases/download/v${version}/${version}.xpi";
- sha256 = "dc26c51a6b3690d4bec527c3732a72f67a85b804c60db5e699260552e2dd2bd9";
+ sha256 = "0nj4l9ssyfwbl1pxgxvd2h9q0mqhx7i0yzm4a2xjqlqwam534d1w";
};
meta = {
@@ -14,6 +14,7 @@ let
homepage = http://keefox.org;
platforms = with stdenv.lib.platforms; linux;
license = stdenv.lib.licenses.gpl2;
+ maintainers = [ stdenv.lib.maintainers.mjanczyk ];
};
buildInputs = [ unzip ];
diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index 3161af33ead..bfb658098b7 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, qt4, qmake4Hook, muparser, which, boost, pkgconfig }:
stdenv.mkDerivation rec {
- version = "2.0.10";
+ version = "2.1.3";
name = "librecad-${version}";
src = fetchurl {
url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}";
name = name + ".tar.gz";
- sha256 = "13jr0zkirnnpkbx8ysh7j6sh2psxi1dg7ncfjqzyxrcr2b270rcj";
+ sha256 = "1czp8bja61hfav2m7184cq1np1n76w3w6vn0hlkp81hhz9zc62sx";
};
patchPhase = ''
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index 58d95d3b3fa..0da6e8eb34a 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -1,29 +1,35 @@
{ fetchurl, stdenv, pkgconfig, python, file, bc
-, qt4, hunspell, makeWrapper #, mythes, boost
+, qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost
}:
stdenv.mkDerivation rec {
- version = "2.1.5";
+ version = "2.2.2";
name = "lyx-${version}";
src = fetchurl {
- url = "ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/${name}.tar.xz";
- sha256 = "1wrcxsvr5kx8cfdabshzmcjrb3rmy5bh74njnzpq9m5xms8parrf";
+ url = "ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${name}.tar.xz";
+ sha256 = "0s2mma8fkj5mi8qzc0j67589mbj854bypx2s3y59y1n429s3sp58";
};
+ # LaTeX is used from $PATH, as people often want to have it with extra pkgs
+ buildInputs = [
+ pkgconfig qtbase qtsvg python file/*for libmagic*/ bc
+ hunspell makeWrapper # enchant
+ ];
+
+ # bogus configure script tests
+ preConfigure = ''
+ NIX_CFLAGS_COMPILE+=" $(pkg-config --cflags Qt5Core)"
+ '';
+
configureFlags = [
+ "--enable-qt5"
#"--without-included-boost"
/* Boost is a huge dependency from which 1.4 MB of libs would be used.
Using internal boost stuff only increases executable by around 0.2 MB. */
#"--without-included-mythes" # such a small library isn't worth a separate package
];
- # LaTeX is used from $PATH, as people often want to have it with extra pkgs
- buildInputs = [
- pkgconfig qt4 python file/*for libmagic*/ bc
- hunspell makeWrapper # enchant
- ];
-
enableParallelBuilding = true;
doCheck = true;
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index fa0097272ff..aecea732a23 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -16,11 +16,11 @@ let
sockjs-tornado = pythonPackages.buildPythonPackage rec {
name = "sockjs-tornado-${version}";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz";
- sha256 = "15lcy40h2cm0l8aknbrk48p2sni5wzybsqjx1hxwpk9lfa1xryyv";
+ sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd";
};
# This is needed for compatibility with OctoPrint
@@ -28,7 +28,7 @@ let
meta = with stdenv.lib; {
description = "SockJS python server implementation on top of Tornado framework";
- homepage = http://github.com/mrjoes/sockjs-tornado/;
+ homepage = "http://github.com/mrjoes/sockjs-tornado/";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ abbradar ];
@@ -37,13 +37,13 @@ let
in pythonPackages.buildPythonApplication rec {
name = "OctoPrint-${version}";
- version = "1.2.15";
+ version = "1.2.17";
src = fetchFromGitHub {
owner = "foosel";
repo = "OctoPrint";
rev = version;
- sha256 = "0qfragp7n8m7l5l30s5fz1x7xzini2sdh2y3m1ahs7ay8zp4xk56";
+ sha256 = "1di2f5npwsfckx5p2fl23bl5zi75i0aksd9qy4sa3zmw672337fh";
};
# We need old Tornado
@@ -67,8 +67,10 @@ in pythonPackages.buildPythonApplication rec {
-e 's,Flask-Principal>=[^"]*,Flask-Principal,g' \
-e 's,markdown>=[^"]*,markdown,g' \
-e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \
+ -e 's,Flask-Login>=[^"]*,Flask-Login,g' \
-e 's,rsa>=[^"]*,rsa,g' \
-e 's,PyYAML>=[^"]*,PyYAML,g' \
+ -e 's,flask>=[^"]*,flask,g' \
setup.py
'';
diff --git a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
index 968983696fe..cbfb6111ec5 100644
--- a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
+++ b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
@@ -1,18 +1,18 @@
-From 62b4fabd1d4ee7a584a565d48c7eaec6e80fe0bd Mon Sep 17 00:00:00 2001
+From c84b2130dab0d26be35294d023ed8f4be404c3c1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov
-Date: Fri, 12 Aug 2016 23:41:22 +0300
+Date: Wed, 23 Nov 2016 00:40:48 +0300
Subject: [PATCH] Build and use one version of preprocessor library
---
- octoprint_m33fio/__init__.py | 66 +-----------------------------------------
- shared library source/Makefile | 59 +++----------------------------------
- 2 files changed, 5 insertions(+), 120 deletions(-)
+ octoprint_m33fio/__init__.py | 67 ++----------------------------------------
+ shared library source/Makefile | 62 +++-----------------------------------
+ 2 files changed, 6 insertions(+), 123 deletions(-)
diff --git a/octoprint_m33fio/__init__.py b/octoprint_m33fio/__init__.py
-index da539f5..b0a17ad 100755
+index f9f84c4..b365024 100755
--- a/octoprint_m33fio/__init__.py
+++ b/octoprint_m33fio/__init__.py
-@@ -979,71 +979,7 @@ class M33FioPlugin(
+@@ -1061,71 +1061,8 @@ class M33FioPlugin(
# Check if using shared library or checking if it is usable
if self._settings.get_boolean(["UseSharedLibrary"]) or isUsable :
@@ -81,19 +81,20 @@ index da539f5..b0a17ad 100755
-
- # Set shared library
- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dylib")
-+ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so")
++ # Set shared library
++ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so")
# Check if shared library was set
if self.sharedLibrary :
diff --git a/shared library source/Makefile b/shared library source/Makefile
-index a43d657..0b254aa 100755
+index 887899b..4c74f5c 100755
--- a/shared library source/Makefile
+++ b/shared library source/Makefile
-@@ -1,62 +1,11 @@
- # Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, OSX32, OSX64
+@@ -1,68 +1,14 @@
+-# Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, OSX32, OSX64
-LIBRARY_NAME = preprocessor
+-TARGET_PLATFORM = LINUX64
+LIBRARY_NAME = libpreprocessor
- TARGET_PLATFORM = LINUX64
VER = .1
-ifeq ($(TARGET_PLATFORM), LINUX32)
@@ -122,19 +123,19 @@ index a43d657..0b254aa 100755
-
-ifeq ($(TARGET_PLATFORM), PI)
- PROG = $(LIBRARY_NAME)_arm1176jzf-s.so
-- CC = ~/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++
+- CC = /opt/arm-toolchain/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++
- CFLAGS = -fPIC -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++
-endif
-
-ifeq ($(TARGET_PLATFORM), PI2)
- PROG = $(LIBRARY_NAME)_arm_cortex-a7.so
-- CC = ~/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++
+- CC = /opt/arm-toolchain/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++
- CFLAGS = -fPIC -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++
-endif
-
-ifeq ($(TARGET_PLATFORM), ARM7)
- PROG = $(LIBRARY_NAME)_arm7.so
-- CC = ~/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++
+- CC = /opt/arm-toolchain/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++
- CFLAGS = -fPIC -mcpu=generic-armv7-a -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++
-endif
-
@@ -151,11 +152,17 @@ index a43d657..0b254aa 100755
- CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER)
-endif
+PROG = $(LIBRARY_NAME).so
-+CC = g++
+CFLAGS = -fPIC -O3 -Wl,-soname,$(PROG)$(VER)
SRCS = preprocessor.cpp gcode.cpp vector.cpp
CFLAGS += -Wall -std=c++11 -fvisibility=hidden -shared
+
+ all:
+- $(CC) $(CFLAGS) -o ../octoprint_m33fio/static/libraries/$(PROG) $(SRCS)
++ $(CXX) $(CFLAGS) -o ../octoprint_m33fio/static/libraries/$(PROG) $(SRCS)
+
+ clean:
+ rm -f ../octoprint_m33fio/static/libraries/$(PROG)
--
-2.9.2
+2.10.2
diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 09f9e654b94..8f015245763 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -12,13 +12,13 @@ let
m33-fio = buildPlugin rec {
name = "M33-Fio-${version}";
- version = "1.7";
+ version = "1.11";
src = fetchFromGitHub {
owner = "donovan6000";
repo = "M33-Fio";
rev = "V${version}";
- sha256 = "14sqvgrpf3zvgycjj7f3m7m2flx06zq4h0yhq4g18av0zbsrv7yp";
+ sha256 = "11nbsi93clrqlnmaj73ak87hkqyghybccqz5jzhn2dhp0263adhl";
};
patches = [
diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index 96ad943ad57..848b39eeb07 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.4";
src = fetchFromGitHub {
repo = "pdfpc";
owner = "pdfpc";
rev = "v${version}";
- sha256 = "0151i9msagcqcfaddgd1vkmman0qgqy6s3714sqas568r4r9ngdk";
+ sha256 = "07wpf3gkgiq7dpgsrv7whk0pzm18cni4s53hd7zz40319jmlaf4q";
};
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/plover/default.nix b/pkgs/applications/misc/plover/default.nix
new file mode 100644
index 00000000000..b8fa38268c3
--- /dev/null
+++ b/pkgs/applications/misc/plover/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, python27Packages, wmctrl }:
+
+python27Packages.buildPythonPackage rec {
+ name = "plover-${version}";
+ version = "3.1.0";
+
+ meta = with stdenv.lib; {
+ description = "OpenSteno Plover stenography software";
+ maintainers = with maintainers; [ twey kovirobi ];
+ license = licenses.gpl2;
+ };
+
+ src = fetchurl {
+ url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz";
+ sha256 = "1zdlgyjp93sfvk6by7rsh9hj4ijzplglrxpcpkcir6c3nq2bixl4";
+ };
+
+ # This is a fix for https://github.com/pypa/pip/issues/3624 causing regression https://github.com/pypa/pip/issues/3781
+ postPatch = ''
+ substituteInPlace setup.py --replace " in sys_platform" " == sys_platform"
+ '';
+
+ buildInputs = with python27Packages; [ pytest mock ];
+ propagatedBuildInputs = with python27Packages; [ six setuptools pyserial appdirs hidapi
+ wxPython xlib wmctrl ];
+}
diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix
index 9b376684284..da59f7f1886 100644
--- a/pkgs/applications/misc/pmenu/default.nix
+++ b/pkgs/applications/misc/pmenu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pythonPackages, gnome2 }:
+{ stdenv, fetchFromGitLab, python2Packages, gnome2 }:
stdenv.mkDerivation rec {
name = "pmenu-${version}";
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "15bkvadr7ab44mc8gkdqs3w14cm498mwf72w5rjm2rdh55357jjh";
};
- nativeBuildInputs = [ pythonPackages.wrapPython ];
+ nativeBuildInputs = [ python2Packages.wrapPython ];
- buildInputs = [ pythonPackages.pygtk gnome2.gnome_menus ];
+ buildInputs = [ python2Packages.pygtk gnome2.gnome_menus ];
- pythonPath = [ pythonPackages.pygtk ];
+ pythonPath = [ python2Packages.pygtk ];
patchPhase = ''
substituteInPlace install.sh --replace "/usr/local" "$out"
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index d07863df0e0..cbf602b75da 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/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
index 901afab78bc..194bb8397fb 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, perl }:
stdenv.mkDerivation {
- name = "urxvt-tabbedex-2016-08-09";
+ name = "urxvt-tabbedex-2016-08-17";
src = fetchFromGitHub {
owner = "mina86";
repo = "urxvt-tabbedex";
- rev = "ac220eb3984e151ba14dce08f446bc7bc8ca29a2";
- sha256 = "1b5mff5137jb5ysklsmfp5ql3m4g1z3bdhk0nwhz2hgwz40ap6k8";
+ rev = "089d0cb724eeb62fa8a5dfcb00ced7761e794149";
+ sha256 = "0a5jrb7ryafj55fgi8fhpy3gmb1xh5j7pbn8p5j5k6s2fnh0g0hq";
};
nativeBuildInputs = [ perl ];
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix
new file mode 100644
index 00000000000..000828ddb7f
--- /dev/null
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchgit, perl }:
+
+stdenv.mkDerivation {
+
+ name = "rxvt_unicode-vtwheel-0.3.2";
+
+ src = fetchgit {
+ url = "https://aur.archlinux.org/urxvt-vtwheel.git";
+ rev = "36d3e861664aeae36a45f96100f10f8fe2218035";
+ sha256 = "1h3vrsbli5q9kr84j5ijbivlhpwlh3l8cv233pg362v2zz4ja8i7";
+ };
+
+ installPhase = ''
+ sed -i 's|#! perl|#! ${perl}/bin/perl|g' vtwheel
+ mkdir -p $out/lib/urxvt/perl
+ cp vtwheel $out/lib/urxvt/perl
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Pass mouse wheel commands to secondary screens (screen, less, nano, etc)";
+ homepage = "https://aur.archlinux.org/packages/urxvt-vtwheel";
+ license = licenses.mit;
+ maintainers = with maintainers; [ danbst ];
+ platforms = with platforms; unix;
+ };
+
+}
\ No newline at end of file
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index 69eda23b143..f3939d3b6eb 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -1,10 +1,21 @@
-{ stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl,
- fontconfig, freetype, pkgconfig, libXrender, gdkPixbufSupport, gdk_pixbuf,
- unicode3Support }:
+{ stdenv, fetchurl, makeDesktopItem, perlSupport, libX11, libXt, libXft,
+ ncurses, perl, fontconfig, freetype, pkgconfig, libXrender,
+ gdkPixbufSupport, gdk_pixbuf, unicode3Support }:
let
pname = "rxvt-unicode";
version = "9.22";
+ description = "A clone of the well-known terminal emulator rxvt";
+
+ desktopItem = makeDesktopItem {
+ name = "${pname}";
+ exec = "urxvt";
+ icon = "utilities-terminal";
+ comment = description;
+ desktopName = "URxvt";
+ genericName = "${pname}";
+ categories = "System;TerminalEmulator;";
+ };
in
stdenv.mkDerivation (rec {
@@ -47,13 +58,14 @@ stdenv.mkDerivation (rec {
postInstall = ''
mkdir -p $out/nix-support
echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
+ cp -r ${desktopItem}/share/applications/ $out/share/
'';
- meta = {
- description = "A clone of the well-known terminal emulator rxvt";
+ meta = with stdenv.lib; {
+ inherit description;
homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html";
downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/";
- maintainers = [ stdenv.lib.maintainers.mornfall ];
- platforms = stdenv.lib.platforms.unix;
+ maintainers = [ maintainers.mornfall ];
+ platforms = platforms.unix;
};
})
diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix
new file mode 100644
index 00000000000..7367c820705
--- /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/styx/default.nix b/pkgs/applications/misc/styx/default.nix
index aa1c1deebd6..15e8453de51 100644
--- a/pkgs/applications/misc/styx/default.nix
+++ b/pkgs/applications/misc/styx/default.nix
@@ -1,21 +1,30 @@
-{ stdenv, fetchFromGitHub, caddy, asciidoctor }:
+{ stdenv, fetchFromGitHub, caddy, asciidoctor
+, file, lessc, sass, multimarkdown }:
stdenv.mkDerivation rec {
name = "styx-${version}";
- version = "0.3.1";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "styx-static";
repo = "styx";
rev = "v${version}";
- sha256 = "0wyibdyi4ld0kfhng5ldb2rlgjrci014fahxn7nnchlg7dvcc5ni";
+ sha256 = "1s4465absxqwlwhn5rf51h0s1rw25ls581yjg0fy9kbyhy979qvs";
};
- server = caddy.bin;
+ setSourceRoot = "cd styx-*/src; export sourceRoot=`pwd`";
+
+ server = "${caddy.bin}/bin/caddy";
nativeBuildInputs = [ asciidoctor ];
- setSourceRoot = "cd styx-*/src; export sourceRoot=`pwd`";
+ propagatedBuildInputs = [
+ file
+ lessc
+ sass
+ asciidoctor
+ multimarkdown
+ ];
installPhase = ''
mkdir $out
@@ -24,6 +33,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/styx
cp -r lib $out/share/styx
cp -r scaffold $out/share/styx
+ cp builder.nix $out/share/styx
mkdir -p $out/share/doc/styx
asciidoctor doc/manual.adoc -o $out/share/doc/styx/index.html
diff --git a/pkgs/applications/misc/styx/themes.nix b/pkgs/applications/misc/styx/themes.nix
new file mode 100644
index 00000000000..2b3570608af
--- /dev/null
+++ b/pkgs/applications/misc/styx/themes.nix
@@ -0,0 +1,92 @@
+{ fetchFromGitHub, stdenv }:
+
+let
+
+ mkThemeDrv = args: stdenv.mkDerivation {
+ name = "styx-theme-${args.themeName}-${args.version}";
+
+ src = fetchFromGitHub ({
+ owner = "styx-static";
+ repo = "styx-theme-${args.themeName}";
+ } // args.src);
+
+ installPhase = ''
+ mkdir $out
+ cp -r * $out/
+ '';
+
+ preferLocalBuild = true;
+
+ meta = with stdenv.lib; {
+ maintainer = with maintainers; [ ericsagnes ];
+ description = "${args.themeName} theme for styx";
+ platforms = platforms.all;
+ } // args.meta;
+ };
+
+in
+{
+ agency = mkThemeDrv {
+ themeName = "agency";
+ version = "2016-12-03";
+ src = {
+ rev = "3604239cc5d940eee9c14ad2540d68a53cfebd7e";
+ sha256 = "1kk8d5a3lb7fx1avivjd49gv0ffq7ppiswmwqlcsq87h2dbrqf61";
+ };
+ meta = {
+ license = stdenv.lib.licenses.asl20;
+ longDescription = ''
+ Agency Theme is a one page portfolio for companies and freelancers.
+ This theme features several content sections, a responsive portfolio
+ grid with hover effects, full page portfolio item modals, a timeline,
+ and a contact form.
+ '';
+ };
+ };
+
+ hyde = mkThemeDrv {
+ themeName = "hyde";
+ version = "2016-12-03";
+ src = {
+ rev = "b6b9b77839959fbf3c9ca3a4488617fa1831cd28";
+ sha256 = "0d1k03mjn08s3rpc5rdivb8ahr345kblhqyihxnfgd1501ih9pg6";
+ };
+ meta = {
+ license = stdenv.lib.licenses.mit;
+ longDescription = ''
+ Hyde is a brazen two-column Jekyll theme that pairs a prominent sidebar
+ with uncomplicated content.
+ '';
+ };
+ };
+
+ orbit = mkThemeDrv {
+ themeName = "orbit";
+ version = "2016-12-03";
+ src = {
+ rev = "1d41745c689c4336d4e2bfbb2483b80e67ec96e4";
+ sha256 = "19pp9dykqxmrixn3cvqpdpcqy547y9n5izqhz0c4a11mmm0v3v64";
+ };
+ meta = {
+ license = stdenv.lib.licenses.cc-by-30;
+ longDescription = ''
+ Orbit is a free resume/CV template designed for developers.
+ '';
+ };
+ };
+
+ showcase = mkThemeDrv {
+ themeName = "showcase";
+ version = "2016-12-04";
+ src = {
+ rev = "33feb0a09183e88d3580e9444ea36a255dffef60";
+ sha256 = "01ighlnrja442ip5fhllydl77bfdz8yig80spmizivdfxdrdiyyf";
+ };
+ meta = {
+ license = stdenv.lib.licenses.mit;
+ longDescription = ''
+ Theme that show most of styx functionalities with a basic design.
+ '';
+ };
+ };
+}
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
new file mode 100644
index 00000000000..be4a004fb8b
--- /dev/null
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -0,0 +1,64 @@
+{
+ stdenv,
+ cmake,
+ curl,
+ fetchgit,
+ grantlee,
+ libdivecomputer,
+ libgit2,
+ libmarble-ssrf,
+ libssh2,
+ libxml2,
+ libxslt,
+ libzip,
+ pkgconfig,
+ qtbase,
+ qtconnectivity,
+ qttools,
+ qtwebkit,
+ sqlite
+}:
+
+stdenv.mkDerivation rec {
+ version = "4.5.6";
+ name = "subsurface-${version}";
+
+ # use fetchgit instead of the official tgz is not complete
+ src = fetchgit {
+ sha256 = "156rqcszy0c4plk2mv7wdd4h7s7mygpq5sdc64pjfs4qvvsdj10f";
+ url = "git://git.subsurface-divelog.org/subsurface";
+ rev = "4d8d7c2a0fa1b4b0e6953d92287c75b6f97472d0";
+ branchName = "v4.5-branch";
+ };
+
+ buildInputs = [ qtbase libdivecomputer libmarble-ssrf libxslt
+ libzip libxml2 grantlee qtwebkit qttools
+ qtconnectivity libgit2 libssh2 curl ];
+ nativeBuildInputs = [ pkgconfig cmake ];
+
+ enableParallelBuilding = true;
+
+ # hack incoming...
+ preConfigure = ''
+ marble_libs=$(echo $(echo $CMAKE_LIBRARY_PATH | grep -o "/nix/store/[[:alnum:]]*-libmarble-ssrf-[a-zA-Z0-9\-]*/lib")/libssrfmarblewidget.so)
+ cmakeFlags="$cmakeFlags -DCMAKE_BUILD_TYPE=Debug \
+ -DMARBLE_LIBRARIES=$marble_libs \
+ -DNO_PRINTING=OFF \
+ -DUSE_LIBGIT23_API=1"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Subsurface is an open source divelog program that runs on Windows, Mac and Linux";
+ longDescription = ''
+ Subsurface can track single- and multi-tank dives using air, Nitrox or TriMix.
+ It allows tracking of dive locations including GPS coordinates (which can also
+ conveniently be entered using a map interface), logging of equipment used and
+ names of other divers, and lets users rate dives and provide additional notes.
+ '';
+ homepage = https://subsurface-divelog.org;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.mguentner ];
+ platforms = platforms.all;
+ };
+
+}
diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix
index 43b7312cda6..a64ab0ea2ca 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/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix
index cf8bcb7a51b..8155c1ca414 100644
--- a/pkgs/applications/misc/xdgmenumaker/default.nix
+++ b/pkgs/applications/misc/xdgmenumaker/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "xdgmenumaker-${version}";
- version = "0.9";
+ version = "1.1";
src = fetchFromGitHub {
- rev = version;
owner = "gapan";
repo = "xdgmenumaker";
- sha256 = "1n29syadsgj0vpnkc8nji4k1c8gminr1xdriz5ck2bcygsgxkdrd";
+ rev = version;
+ sha256 = "11mqafpgfnz0h0d6fxd1xsfsjxzg1abvwqgwy9jmm5xhcjx3c3l7";
};
nativeBuildInputs = [
@@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
description = "Command line tool that generates XDG menus for several window managers";
homepage = https://github.com/gapan/xdgmenumaker;
license = licenses.gpl2Plus;
- platforms = platforms.unix;
+ # NOTE: exclude darwin from platforms because Travis reports hash mismatch
+ platforms = with platforms; filter (x: !(elem x darwin)) unix;
maintainers = [ maintainers.romildo ];
};
}
diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index adc0c3c9fb6..d01dc120735 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig
+{ stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig, makeWrapper
, enableDecLocator ? true
}:
stdenv.mkDerivation rec {
- name = "xterm-325";
+ name = "xterm-327";
src = fetchurl {
url = "ftp://invisible-island.net/xterm/${name}.tgz";
- sha256 = "06sz66z4hvjjkvm3r5a5z442iis8lz8yjfzc629pwhj01ixb0c9v";
+ sha256 = "02qmfr1y24y5vq6kddksw84b8gxalc96n9wwaj7i8hmk6mn2zyv6";
};
buildInputs =
[ xorg.libXaw xorg.xproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE
- ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit
+ ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit makeWrapper
];
patches = [
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
"--enable-luit"
"--enable-mini-luit"
"--with-tty-group=tty"
+ "--with-app-defaults=$(out)/lib/X11/app-defaults"
] ++ stdenv.lib.optional enableDecLocator "--enable-dec-locator";
# Work around broken "plink.sh".
@@ -44,6 +45,12 @@ stdenv.mkDerivation rec {
echo '#define USE_UTMP_SETGID 1'
'';
+ postInstall = ''
+ for bin in $out/bin/*; do
+ wrapProgram $bin --set XAPPLRESDIR $out/lib/X11/app-defaults/
+ done
+ '';
+
meta = {
homepage = http://invisible-island.net/xterm;
license = "BSD";
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 9eb25c316f9..58e5ab98c16 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -18,6 +18,11 @@ mkChromiumDerivation (base: rec {
cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
cp -v "$buildPath/chrome" "$libExecPath/$packageName"
+ if [ -e "$buildPath/libwidevinecdmadapter.so" ]; then
+ cp -v "$buildPath/libwidevinecdmadapter.so" \
+ "$libExecPath/libwidevinecdmadapter.so"
+ fi
+
mkdir -p "$sandbox/bin"
cp -v "$buildPath/chrome_sandbox" "$sandbox/bin/${sandboxExecutableName}"
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 8a561e75f79..ea66703f166 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -1,17 +1,17 @@
-{ stdenv, ninja, which
+{ stdenv, gn, ninja, which
# default dependencies
, bzip2, flac, speex, libopus
, libevent, expat, libjpeg, snappy
, libpng, libxml2, libxslt, libcap
, xdg_utils, yasm, minizip, libwebp
-, libusb1, pciutils, nss
+, libusb1, pciutils, nss, re2, zlib, libvpx
, python2Packages, perl, pkgconfig
, nspr, systemd, kerberos
, utillinux, alsaLib
, bison, gperf
-, glib, gtk2, dbus_glib
+, glib, gtk2, gtk3, dbus_glib
, libXScrnSaver, libXcursor, libXtst, mesa
, protobuf, speechd, libXdamage, cups
@@ -23,12 +23,12 @@
, enableSELinux ? false, libselinux ? null
, enableNaCl ? false
, enableHotwording ? false
+, enableWideVine ? false
, gnomeSupport ? false, gnome ? null
, gnomeKeyringSupport ? false, libgnome_keyring3 ? null
, proprietaryCodecs ? true
, cupsSupport ? true
, pulseSupport ? false, libpulseaudio ? null
-, hiDPISupport ? false
, upstream-info
}:
@@ -38,47 +38,28 @@ buildFun:
with stdenv.lib;
let
- inherit (python2Packages) python gyp ply jinja2;
-
# The additional attributes for creating derivations based on the chromium
# source tree.
extraAttrs = buildFun base;
- mkGypFlags =
+ mkGnFlags =
let
+ # Serialize Nix types into GN types according to this document:
+ # https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/language.md
+ mkGnString = value: "\"${escape ["\"" "$" "\\"] value}\"";
sanitize = value:
- if value == true then "1"
- else if value == false then "0"
- else "${value}";
- toFlag = key: value: "-D${key}=${sanitize value}";
+ if value == true then "true"
+ else if value == false then "false"
+ else if isList value then "[${concatMapStringsSep ", " sanitize value}]"
+ else if isInt value then toString value
+ else if isString value then mkGnString value
+ else throw "Unsupported type for GN value `${value}'.";
+ toFlag = key: value: "${key}=${sanitize value}";
in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
- gypFlagsUseSystemLibs = {
- use_system_bzip2 = true;
- use_system_flac = true;
- use_system_libevent = true;
- use_system_libexpat = true;
- # XXX: System libjpeg fails to link for version 52.0.2743.10
- use_system_libjpeg = versionOlder upstream-info.version "52.0.2743.10";
- use_system_libpng = false;
- use_system_libwebp = true;
- use_system_libxml = true;
- use_system_opus = true;
- use_system_snappy = true;
- use_system_speex = true;
- use_system_stlport = true;
- use_system_xdg_utils = true;
- use_system_yasm = true;
- use_system_zlib = false;
- use_system_protobuf = false; # needs newer protobuf
-
- use_system_harfbuzz = false;
- use_system_icu = false; # Doesn't support ICU 52 yet.
- use_system_libusb = false; # http://crbug.com/266149
- use_system_skia = false;
- use_system_sqlite = false; # http://crbug.com/22208
- use_system_v8 = false;
- };
+ gnSystemLibraries = [
+ "flac" "libwebp" "libxml" "libxslt" "snappy" "yasm"
+ ];
opusWithCustomModes = libopus.override {
withCustomModes = true;
@@ -89,7 +70,7 @@ let
libevent expat libjpeg snappy
libpng libxml2 libxslt libcap
xdg_utils yasm minizip libwebp
- libusb1
+ libusb1 re2 zlib
];
# build paths and release info
@@ -105,36 +86,27 @@ let
src = upstream-info.main;
- unpackCmd = ''
- tar xf "$src" \
- --anchored \
- --no-wildcards-match-slash \
- --exclude='*/tools/gyp'
- '';
+ nativeBuildInputs = [ gn which python2Packages.python perl pkgconfig ];
buildInputs = defaultDependencies ++ [
- which
- python perl pkgconfig
nspr nss systemd
utillinux alsaLib
bison gperf kerberos
glib gtk2 dbus_glib
libXScrnSaver libXcursor libXtst mesa
pciutils protobuf speechd libXdamage
- gyp ply jinja2
+ python2Packages.ply python2Packages.jinja2
] ++ optional gnomeKeyringSupport libgnome_keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optional enableSELinux libselinux
++ optionals cupsSupport [ libgcrypt cups ]
- ++ optional pulseSupport libpulseaudio;
+ ++ optional pulseSupport libpulseaudio
+ ++ optional (versionAtLeast version "56.0.0.0") gtk3;
patches = [
- ./patches/widevine.patch
./patches/glibc-2.24.patch
- (if versionOlder version "52.0.0.0"
- then ./patches/nix_plugin_paths_50.patch
- else ./patches/nix_plugin_paths_52.patch)
- ];
+ ./patches/nix_plugin_paths_52.patch
+ ] ++ optional enableWideVine ./patches/widevine.patch;
postPatch = ''
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
@@ -143,12 +115,6 @@ let
'return sandbox_binary;' \
'return base::FilePath(GetDevelSandboxPath());'
- sed -i -r \
- -e 's/-f(stack-protector)(-all)?/-fno-\1/' \
- -e 's|/bin/echo|echo|' \
- -e "/python_arch/s/: *'[^']*'/: '""'/" \
- build/common.gypi chrome/chrome_tests.gypi
-
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
device/udev_linux/udev?_loader.cc
@@ -157,31 +123,37 @@ let
sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \
chrome/browser/ui/webui/engagement/site_engagement_ui.cc
+
+ sed -i -e '/#include/ {
+ i #include
+ :l; n; bl
+ }' gpu/config/gpu_control_list.cc
+
+ patchShebangs .
'' + optionalString (versionAtLeast version "52.0.0.0") ''
sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \
third_party/pdfium/xfa/fxbarcode/utils.h
'';
- gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {
+ gnFlags = mkGnFlags ({
linux_use_bundled_binutils = false;
linux_use_bundled_gold = false;
linux_use_gold_flags = true;
+ is_debug = false;
proprietary_codecs = false;
use_sysroot = false;
use_gnome_keyring = gnomeKeyringSupport;
use_gconf = gnomeSupport;
use_gio = gnomeSupport;
- use_pulseaudio = pulseSupport;
- linux_link_pulseaudio = pulseSupport;
- disable_nacl = !enableNaCl;
+ enable_nacl = enableNaCl;
enable_hotwording = enableHotwording;
+ enable_widevine = enableWideVine;
selinux = enableSELinux;
use_cups = cupsSupport;
} // {
- werror = "";
- clang = false;
- enable_hidpi = hiDPISupport;
+ treat_warnings_as_errors = false;
+ is_clang = false;
# Google API keys, see:
# http://www.chromium.org/developers/how-tos/api-keys
@@ -195,22 +167,17 @@ let
proprietary_codecs = true;
enable_hangout_services_extension = true;
ffmpeg_branding = "Chrome";
- } // optionalAttrs (stdenv.system == "x86_64-linux") {
- target_arch = "x64";
- python_arch = "x86-64";
- } // optionalAttrs (stdenv.system == "i686-linux") {
- target_arch = "ia32";
- python_arch = "ia32";
- } // (extraAttrs.gypFlags or {}));
+ } // optionalAttrs pulseSupport {
+ use_pulseaudio = true;
+ link_pulseaudio = true;
+ } // (extraAttrs.gnFlags or {}));
configurePhase = ''
- echo "Precompiling .py files to prevent race conditions..." >&2
- python -m compileall -q -f . > /dev/null 2>&1 || : # ignore errors
-
# This is to ensure expansion of $out.
libExecPath="${libExecPath}"
- python build/linux/unbundle/replace_gyp_files.py ${gypFlags}
- python build/gyp_chromium -f ninja --depth . ${gypFlags}
+ python build/linux/unbundle/replace_gn_files.py \
+ --system-libraries ${toString gnSystemLibraries}
+ gn gen --args=${escapeShellArg gnFlags} out/Release
'';
buildPhase = let
@@ -228,5 +195,5 @@ let
# Remove some extraAttrs we supplied to the base attributes already.
in stdenv.mkDerivation (base // removeAttrs extraAttrs [
- "name" "gypFlags" "buildTargets"
+ "name" "gnFlags" "buildTargets"
])
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 7402a8bae29..1556603db2c 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -12,7 +12,6 @@
, enableWideVine ? false
, cupsSupport ? true
, pulseSupport ? false
-, hiDPISupport ? false
}:
let
@@ -24,7 +23,7 @@ let
mkChromiumDerivation = callPackage ./common.nix {
inherit enableSELinux enableNaCl enableHotwording gnomeSupport gnome
gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport
- hiDPISupport;
+ enableWideVine;
};
browser = callPackage ./browser.nix { inherit channel; };
diff --git a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_50.patch b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_50.patch
deleted file mode 100644
index 062098a8522..00000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_50.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
-index 74bf041..5f34198 100644
---- a/chrome/common/chrome_paths.cc
-+++ b/chrome/common/chrome_paths.cc
-@@ -66,21 +66,14 @@ static base::LazyInstance
- g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER;
-
- // Gets the path for internal plugins.
--bool GetInternalPluginsDirectory(base::FilePath* result) {
--#if defined(OS_MACOSX)
-- // If called from Chrome, get internal plugins from a subdirectory of the
-- // framework.
-- if (base::mac::AmIBundled()) {
-- *result = chrome::GetFrameworkBundlePath();
-- DCHECK(!result->empty());
-- *result = result->Append("Internet Plug-Ins");
-- return true;
-- }
-- // In tests, just look in the module directory (below).
--#endif
--
-- // The rest of the world expects plugins in the module directory.
-- return PathService::Get(base::DIR_MODULE, result);
-+bool GetInternalPluginsDirectory(base::FilePath* result,
-+ const std::string& ident) {
-+ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident;
-+ const char* value = getenv(full_env.c_str());
-+ if (value == NULL)
-+ return PathService::Get(base::DIR_MODULE, result);
-+ else
-+ *result = base::FilePath(value);
- }
-
- #if defined(OS_WIN)
-@@ -253,11 +246,11 @@ bool PathProvider(int key, base::FilePath* result) {
- create_dir = true;
- break;
- case chrome::DIR_INTERNAL_PLUGINS:
-- if (!GetInternalPluginsDirectory(&cur))
-+ if (!GetInternalPluginsDirectory(&cur, "ALL"))
- return false;
- break;
- case chrome::DIR_PEPPER_FLASH_PLUGIN:
-- if (!GetInternalPluginsDirectory(&cur))
-+ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH"))
- return false;
- cur = cur.Append(kPepperFlashBaseDirectory);
- break;
-@@ -314,7 +307,7 @@ bool PathProvider(int key, base::FilePath* result) {
- // We currently need a path here to look up whether the plugin is disabled
- // and what its permissions are.
- case chrome::FILE_NACL_PLUGIN:
-- if (!GetInternalPluginsDirectory(&cur))
-+ if (!GetInternalPluginsDirectory(&cur, "NACL"))
- return false;
- cur = cur.Append(kInternalNaClPluginFileName);
- break;
-@@ -349,7 +342,7 @@ bool PathProvider(int key, base::FilePath* result) {
- cur = cur.DirName();
- }
- #else
-- if (!GetInternalPluginsDirectory(&cur))
-+ if (!GetInternalPluginsDirectory(&cur, "PNACL"))
- return false;
- #endif
- cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
-@@ -366,7 +359,7 @@ bool PathProvider(int key, base::FilePath* result) {
- // In the component case, this is the source adapter. Otherwise, it is the
- // actual Pepper module that gets loaded.
- case chrome::FILE_WIDEVINE_CDM_ADAPTER:
-- if (!GetInternalPluginsDirectory(&cur))
-+ if (!GetInternalPluginsDirectory(&cur, "WIDEVINE"))
- return false;
- cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
- break;
diff --git a/pkgs/applications/networking/browsers/chromium/patches/widevine.patch b/pkgs/applications/networking/browsers/chromium/patches/widevine.patch
index 45048cada87..90a13928e3b 100644
--- a/pkgs/applications/networking/browsers/chromium/patches/widevine.patch
+++ b/pkgs/applications/networking/browsers/chromium/patches/widevine.patch
@@ -1,12 +1,16 @@
-diff -upr chromium-42.0.2311.90.orig/third_party/widevine/cdm/widevine_cdm_version.h chromium-42.0.2311.90/third_party/widevine/cdm/widevine_cdm_version.h
---- chromium-42.0.2311.90.orig/third_party/widevine/cdm/widevine_cdm_version.h 2015-04-15 01:18:59.000000000 +0300
-+++ chromium-42.0.2311.90/third_party/widevine/cdm/widevine_cdm_version.h 2015-04-15 09:09:49.157260050 +0300
-@@ -14,4 +14,8 @@
- // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
- // as a string, e.g., "1.0.123.456").
+Minimal WideVine patch from Gentoo:
+
+https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-widevine-r1.patch
+
+BTS: https://bugs.gentoo.org/show_bug.cgi?id=547630
+
+--- a/third_party/widevine/cdm/stub/widevine_cdm_version.h
++++ b/third_party/widevine/cdm/stub/widevine_cdm_version.h
+@@ -10,6 +10,7 @@
+
+ #include "third_party/widevine/cdm/widevine_cdm_common.h"
+
++#define WIDEVINE_CDM_VERSION_STRING "unknown"
+ #define WIDEVINE_CDM_AVAILABLE
-+#include "third_party/widevine/cdm/widevine_cdm_common.h"
-+#define WIDEVINE_CDM_AVAILABLE
-+#define WIDEVINE_CDM_VERSION_STRING "@WIDEVINE_VERSION@"
-+
#endif // WIDEVINE_CDM_VERSION_H_
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index ac7f8111212..c1c18828fb4 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -1,5 +1,6 @@
{ stdenv
, jshon
+, fetchzip
, enablePepperFlash ? false
, enableWideVine ? false
@@ -9,6 +10,8 @@
with stdenv.lib;
let
+ mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}";
+
# Generate a shell fragment that emits flags appended to the
# final makeWrapper call for wrapping the browser's main binary.
#
@@ -37,14 +40,12 @@ let
echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags"
'';
- plugins = stdenv.mkDerivation {
- name = "chromium-binary-plugins";
+ widevine = stdenv.mkDerivation {
+ name = "chromium-binary-plugin-widevine";
src = upstream-info.binary;
phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
- outputs = [ "flash" "widevine" ];
- out = "flash"; # outputs TODO: is this a hack?
unpackCmd = let
chan = if upstream-info.channel == "dev" then "chrome-unstable"
@@ -53,7 +54,6 @@ let
in ''
mkdir -p plugins
ar p "$src" data.tar.xz | tar xJ -C plugins --strip-components=4 \
- ./opt/google/${chan}/PepperFlash \
./opt/google/${chan}/libwidevinecdm.so \
./opt/google/${chan}/libwidevinecdmadapter.so
'';
@@ -63,17 +63,13 @@ let
! find -iname '*.so' -exec ldd {} + | grep 'not found'
'';
- patchPhase = let
- rpaths = [ stdenv.cc.cc ];
- mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}";
- in ''
- for sofile in PepperFlash/libpepflashplayer.so \
- libwidevinecdm.so libwidevinecdmadapter.so; do
+ patchPhase = ''
+ for sofile in libwidevinecdm.so libwidevinecdmadapter.so; do
chmod +x "$sofile"
- patchelf --set-rpath "${mkrpath rpaths}" "$sofile"
+ patchelf --set-rpath "${mkrpath [ stdenv.cc.cc ]}" "$sofile"
done
- patchelf --set-rpath "$widevine/lib:${mkrpath rpaths}" \
+ patchelf --set-rpath "$out/lib:${mkrpath [ stdenv.cc.cc ]}" \
libwidevinecdmadapter.so
'';
@@ -81,38 +77,62 @@ let
wvName = "Widevine Content Decryption Module";
wvDescription = "Playback of encrypted HTML audio/video content";
wvMimeTypes = "application/x-ppapi-widevine-cdm";
- wvModule = "@widevine@/lib/libwidevinecdmadapter.so";
+ wvModule = "@out@/lib/libwidevinecdmadapter.so";
wvInfo = "#${wvName}#${wvDescription};${wvMimeTypes}";
in ''
- flashVersion="$(
- "${jshon}/bin/jshon" -F PepperFlash/manifest.json -e version -u
- )"
-
- install -vD PepperFlash/libpepflashplayer.so \
- "$flash/lib/libpepflashplayer.so"
+ install -vD libwidevinecdm.so \
+ "$out/lib/libwidevinecdm.so"
+ install -vD libwidevinecdmadapter.so \
+ "$out/lib/libwidevinecdmadapter.so"
${mkPluginInfo {
- output = "flash";
- allowedVars = [ "flash" "flashVersion" ];
+ flags = [ "--register-pepper-plugins=${wvModule}${wvInfo}" ];
+ envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "@out@/lib";
+ }}
+ '';
+ };
+
+ flash = stdenv.mkDerivation rec {
+ name = "flashplayer-ppapi-${version}";
+ version = "24.0.0.186";
+
+ src = fetchzip {
+ url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
+ + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
+ sha256 = "1pwayhnfjvb6gal5msw0k8rv4h6jvl0mpfsi0jqlka00cnyfjqpd";
+ stripRoot = false;
+ };
+
+ patchPhase = ''
+ chmod +x libpepflashplayer.so
+ patchelf --set-rpath "${mkrpath [ stdenv.cc.cc ]}" libpepflashplayer.so
+ '';
+
+ doCheck = true;
+ checkPhase = ''
+ ! find -iname '*.so' -exec ldd {} + | grep 'not found'
+ '';
+
+ installPhase = ''
+ flashVersion="$(
+ "${jshon}/bin/jshon" -F manifest.json -e version -u
+ )"
+
+ install -vD libpepflashplayer.so "$out/lib/libpepflashplayer.so"
+
+ ${mkPluginInfo {
+ allowedVars = [ "out" "flashVersion" ];
flags = [
- "--ppapi-flash-path=@flash@/lib/libpepflashplayer.so"
+ "--ppapi-flash-path=@out@/lib/libpepflashplayer.so"
"--ppapi-flash-version=@flashVersion@"
];
}}
-
- install -vD libwidevinecdm.so \
- "$widevine/lib/libwidevinecdm.so"
- install -vD libwidevinecdmadapter.so \
- "$widevine/lib/libwidevinecdmadapter.so"
-
- ${mkPluginInfo {
- output = "widevine";
- flags = [ "--register-pepper-plugins=${wvModule}${wvInfo}" ];
- envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "@widevine@/lib";
- }}
'';
- passthru.enabled = optional enablePepperFlash plugins.flash
- ++ optional enableWideVine plugins.widevine;
+ dontStrip = true;
};
-in plugins
+
+in {
+ enabled = optional enableWideVine widevine
+ ++ optional enablePepperFlash flash;
+}
diff --git a/pkgs/applications/networking/browsers/chromium/update.nix b/pkgs/applications/networking/browsers/chromium/update.nix
index 23f06569fa9..3b9ea396647 100644
--- a/pkgs/applications/networking/browsers/chromium/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/update.nix
@@ -64,7 +64,7 @@ in rec {
csv2nix = name: src: import (runCommand "${name}.nix" {
src = builtins.fetchurl src;
} ''
- esc() { echo "\"$(echo "$1" | sed -e 's/"\\$/\\&/')\""; }
+ esc() { echo "\"$(echo "$1" | sed -e 's/"\\$/\\&/')\""; } # ohai emacs "
IFS=, read -r -a headings <<< "$(head -n1 "$src")"
echo "[" > "$out"
tail -n +2 "$src" | while IFS=, read -r -a line; do
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index dfac55a18b6..fa24ed9146f 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
- sha256 = "0f6cqvhlg06lrf4bzaiwzm9yi3fi1dk5jrzvjcg7alw3mzrmh2wv";
- sha256bin64 = "02cv9vc1l2nlwa4a0lc7cj9c9czrwp1jd8d024bq16a5fvmhl01l";
- version = "54.0.2840.50";
+ sha256 = "0mafk3cxwc16qbd7jzqj8rw1ys6s2bv7f9byixjcgssvjf073ksv";
+ sha256bin64 = "0sb2d7vyrckkbg823rnl7y3k6q3kvmxp13lpm0ncy821cx89m89a";
+ version = "55.0.2883.75";
};
dev = {
- sha256 = "06kcymwi0wfir7w10g8viayk2h0b5a66dav76mlia4lm30p502kz";
- sha256bin64 = "0mgamiffnnkaw8c68b5kyna84x7hlhrzmqfc36kzf434fmm8v5d6";
- version = "55.0.2873.0";
+ sha256 = "1g4jy8zpmgqh9br2jcvbrnnr8fc5i4s5hvv01bs433rlcgaqk066";
+ sha256bin64 = "08vzar0zshf39390xhr8l7gvzai9pxcqzwqzrmizaaqi9m5pijdr";
+ version = "56.0.2924.18";
};
stable = {
- sha256 = "1hyw0z7dsfaxyy8b4mvnfjy5yj0160hzz9m0wj3vn9zvkfvmhan5";
- sha256bin64 = "0n0px7yi94gdxq7p6pjqfdz04bnh3mcvbaccjaglj6h5p0jc8abq";
- version = "53.0.2785.143";
+ sha256 = "0mafk3cxwc16qbd7jzqj8rw1ys6s2bv7f9byixjcgssvjf073ksv";
+ sha256bin64 = "0qfqj8067vjqklg1zm203dh6c29sbhk6w7flvi8h3z28y1pws2qw";
+ version = "55.0.2883.75";
};
}
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index a785b859350..cc34318edf3 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-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index ce49d92e335..fec1665f8b7 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,192 +1,925 @@
-# This file is generated from generate_sources.rb. DO NOT EDIT.
-# Execute the following command to update the file.
-#
-# ruby generate_sources.rb 46.0.1 > sources.nix
-
{
- version = "49.0b1";
+ version = "51.0b8";
sources = [
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ach/firefox-49.0b1.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "98736e1a7503e6550491147b418815abc1cc59e58172ca45933f24f8a3df1d2e2d614d059d1159fefd727e771489c488a369e0b1f9bb7a25c8eb75cfb4c3e2b0"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ach/firefox-49.0b1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "e8186d58d6c3847b475ac3c55f97476f393bb2ef210a4b7ec95d174d160011e0b4d0798de8bd33ebd30c342506f713a71509eba06fab03dc6b0fee7524f19dcc"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/af/firefox-49.0b1.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "0732de2c643ec1ac17bfb3b7629207cfde48f4a135b7dafd6a5efbac3231382fdc5f19048cb76f3da3bca255bf9816956e301e26cf28390ea9cccada67d920cc"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/af/firefox-49.0b1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "ea5c72eb31b41714d57385040cd2d80f273b4177a576685ee752b2e92f90f8d9b5439e1f52dfc9941143bf91248be72aa670d134ba523cca856d175960bb3f40"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/an/firefox-49.0b1.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "36e3b5c374522efe6dfbb3b072ed2a75b3bcda8934c4763468643999fd14bcf043a2e4a0a5c62ada2f2d903a1f593e06976354a620733523ff806f6b8fecf1ce"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/an/firefox-49.0b1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "398134c3133b75f027743ded416f3063d74ef777cc854992cd39aabb6397b00fff8dcf5116dabdfccee6ab1335bc296ccd991b3a4d72707735880d94b8f81af7"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ar/firefox-49.0b1.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "395b9abf6a6f01f448d7671908c2d7903604592490109793f3e36ba83375685aa43007bec07d3f28997416d8aa02df2597ce3392b7c1e83e1af4911203e2baaf"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ar/firefox-49.0b1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "731d61dbc03548c77aade87c413f91d727cc8a87e15c202b73dece2a17c2bab887eb3912077aea670d9a928e930c4550ef2150442be8894e59b082c6f3d4b479"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/as/firefox-49.0b1.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "7f2d08dbeae79e7f903ed182c9eeb436f227ed9ff9db17d93f2c34efc3353788a0b499e23f2fb3eb892c9ee1592493cd8f960a6092f83b19de9419c7bd4ec3e1"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/as/firefox-49.0b1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "311e413592438b610b8402eb00ed19b87caaa02522e8c40fff454d6d3fd8e0b7d5cf9223a6fc52d7c5f0be23baebb87639c2c64630e5a1a966d341b679bc1d03"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ast/firefox-49.0b1.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "a782df4a337fe18a7bb85c2a252444154100a597253d98d25c268c69a430045e4722a888f3d5fa51926de3571dd1941c117cd34537ff866c5d34279f3861e0e5"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ast/firefox-49.0b1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "87a7759ecd002f994ebf7334b9c8c4c042ed6b84bc33485c791c5ba49bb7477ec801531a0723820aa181770c3d404eb7a0f7fb91818c38044ca9e3a130962899"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/az/firefox-49.0b1.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "d3822be0aebbbaf200e243c3e0ed0564cf6b5a9f14825f477767f98b796afedde9c6018f3b34c0263553fe190516ff0020e591ddc8ed688cab9454b7760cf131"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/az/firefox-49.0b1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "2a70bffe3da3d3a9a61e649badc3a64f3110950cfc0b3cbb42c6f799465d928ec12c9efd1e7ee6ea978c865e2d3fe05d732a870654bf629f083f15357b360ccd"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/be/firefox-49.0b1.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "edc39ed32b7d990074ae3a5099cc4a0caf23190364eb87d1218a61a25b66777fa02b5df6f20c96c5ea67798a999f0cba6873d5d23b583bcd3d6ee90a7c978847"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/be/firefox-49.0b1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "d0558a2e751d561e2f316a7bd57c3a8d92e8d5cb56e5eb28d44b5d40303550afef2bb9b69dfb0b80d1ef706a33717017eb077d3b2bca9277294cc76656a6131b"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/bg/firefox-49.0b1.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "3524f48e8fb8b0c98c8df55d3e2934240eb414160d0e17d6f9beccb6b0540b9c9b554757e99dc99b16e685779c5d3395ff9bdb5c3a6c9faa2e88e099986aa4df"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/bg/firefox-49.0b1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "f44089b4c10a0791d98e75580c1316f400c7fadd48050d9f3a352064005b3b4205db7ef54bb1ab7bf6518f7bdb3be5f853f490cc0247f3f7a4ee7d6c50cbd20b"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/bn-BD/firefox-49.0b1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "39b42d189a8ba7508e98045e1d94a1c79f8544cf4b2e2cc5187356d7f9ab6deef012c6e5d2220b2ce2b5a58f565289c5aeaee6ddcf0ab7b0cfcf18a902b95715"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/bn-BD/firefox-49.0b1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "210c40e18347440077ddd0ffd25426fe583547a2a9bfbecf3e8ba3d0159d7f7317c06f893731512cc0666af488f32ed5808c8e2aabc921367f538695ba49fde9"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/bn-IN/firefox-49.0b1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "dadbab0c70f22ec20a253d73081d3ccecbe148c6b0e854b85e7c079f4979f746c79fd5febd916c167cedd78ef04f5e0b2d2c925999424bb77118d251287311a6"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/bn-IN/firefox-49.0b1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "8a2b9fe150579e487063f68373157ba087c571f53a98dbc9251deee92ebc58d587e38be2bc0412ed02cd8ccd485d91bc2fe5d70c223e7fe6edd996d9bfb89bfe"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/br/firefox-49.0b1.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "7a3a3c5015f407a1b7ecbf35763ea091cdcd3652c7916fe81d39336521fd6ab908a549bec8d39e089d0161fb6b37894b893058b523f78bb76e75dff21852fd13"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/br/firefox-49.0b1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "9a7b5efd1f8d35f8cacaeefcb446028745bd999765fb04e60403b710cc9e5be14d172b6f0c2b08f1093083b6c4d94f22117f2b717473f5cd2bdc43ecaaec50a4"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/bs/firefox-49.0b1.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "4671c1ed650df67ecdf152ae1503979f52b001660e167ea4ca1c47e1152e1450e2a5eac306b302c55b28e686c8535f6d612faa4c53b81cc5297e765c1bdd0afc"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/bs/firefox-49.0b1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "a2e4417c3987c8ab15ef8afd4fa130f6c45550c57a4605ffa301dc7d4ff49620c768d83e9de00f509dbb0cfd94530f4cb102cdb1f2a01eba091982fbfcd82d36"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ca/firefox-49.0b1.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "076f1deebdec83f76b44c41820253a7659b6702a1b1ef7139419a50411f2f752e764f96f84be24d84be388a3a3083656f967ee53ae1c640651dcac46b6dcd089"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ca/firefox-49.0b1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "6a34ba7edb264cf974fa23650c73bcdca3e9344dfa82f3adf56c04a73439af5a093789e38406e2ec94c97635883eda2a232fe33a1746d08ff148022a1bb61fd1"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/cak/firefox-49.0b1.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "0657e07ceb245e435dcb3c2e36e71054bf369c088e42ad0b7448c05c5d6a666ba5505da01d2e232388794ce5ae3be8dd1ce30ab0926dc9948d2a1291948f9b5f"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/cak/firefox-49.0b1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "4e95bff1e40614451baad90fb3ef76e27f2ee5d1d2ede400c091f46421b6b17a0c91bad04a45208219ef7513046749b9a42a147cdf7ba52a88dd515f5dc27cec"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/cs/firefox-49.0b1.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "73264dd3b43e4ea4028bf622a2062797e4a28118ba597df19affa7fe38e630aac4a960fde8eb6be4a1e64d91b3b01e986d93684819c54e66c506153b19a06550"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/cs/firefox-49.0b1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "a94a811ede59154c98e87c47bedf4a5faae44cbf2c87bd7346476c92977abcdb96b79cfe379a04a459daa576170849a5c2c779a14948e51e046fc6fcf0ba4571"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/cy/firefox-49.0b1.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "cc45c49758e3542ce704f941fda143ec531c9c0b9b0b28eade737e792afe7bad0db708a61510fadcede7af64622b7a97cb1f2c8eae7385ab447dc4a4198c07d4"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/cy/firefox-49.0b1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "07999f0049f305e75ec3fd1102673576e685e42b894db7ac8eef4d4dd1b4d2599a47b8f1ac034c728a5f3bb433ed96550907dd2f9e63a3fbd0aa43b65f2ca744"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/da/firefox-49.0b1.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "115840053470a057de9afeecc8a74113ff97c06293ce52995ef2bb473217d7b057329a4bb239bd21799d894e6a11081e7afe5191cc1ffb8887481fd08911f333"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/da/firefox-49.0b1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "358f79e56cab4260557fdd999a70d025c6b2f8e7ea01a5767500e4b1906a57994592c633b7e10b9aa54a7a2dfd98f86bb3a8f8b09c364d8675bad5d74cedfd2c"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/de/firefox-49.0b1.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "5f80f4e32a71560188a21bb6b457b66a692f5eb32c5b45e04c40770b83689ead6bc07ec4a110f3855f5fe0e034f7b64ef8b5fe80526c708077664b179def71f6"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/de/firefox-49.0b1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "01c71572560665dafa87ae8b327ee356b18b5ef08df093792c07b3858c42f2f9f3a89a2752fee35503785cf10130ca22fb21db83ce48fb902876eb9780b959cf"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/dsb/firefox-49.0b1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "11385bdd26fd0eb9eb505141af2033a9e3b85f0d748959938eb51b9d7bb9e4c801ecf19e351957b9f8549d487086968b1f86e19534b09997b04642ced3f708d5"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/dsb/firefox-49.0b1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "4daa34474c395c52c42c12f03125db8266e83ac1d8e5b098f0371cab7445b767abfb965668eafff466857ac99b6f4c00f4238d00b2f3915f228a25277b54fc2d"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/el/firefox-49.0b1.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "f77b62b8acabbd5afca19572be983c2f81200ff2bccabfe45b6c3d41c32de90cb4fac56db7be01fcf6a8dd69a72056e903f62d2af08b7ef0a06d18588c685b8e"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/el/firefox-49.0b1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "9a3852f3dec48d5c40c09d6c961f87fb34f7fd6423ac86c4f4fe293560769c1e5a40f0d3e307fe65cdf614fe6b7fa7b1279c59b8a514e83e121b58ca90b46d31"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/en-GB/firefox-49.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "3197dddc1f6aa65cc7bef6217175d308c29f1bc87014e651af76b490601cc202e9609d2728ba2c05203cfb93735094dc7efc2ee9f02b8544776ead8e788ac7b2"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/en-GB/firefox-49.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "c1dcd26ed3b07c555793304c15644033105a72390c1307921fb215a06ddde547a34e1d027966e524878adf26a8fd3323d3d59c2914bfd20b6e7b7b4e59f54eb3"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/en-US/firefox-49.0b1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "27d8f7ca57bd1fad729e73c0fce7f33da77249f1668c4d2b546db8b0edbddff4795537250c190d59cebd83dd91a06baad9b791c7c7ffec2f4d82cfdf15bb58f8"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/en-US/firefox-49.0b1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "1e267127d21a6f7c64acd7e1a991a70b51742bdc2ae83f669a25203f710483a35b3bc7a9f226ad2efed77ef88161d345d312efba32e9b38d60d2144a1ff1810d"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/en-ZA/firefox-49.0b1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "37fc1a82999c427496fb50ab6ce47d719add8f2e00d47269d266418dc1c1cb4191675a0cef398098fa17e9ec510a40250628eb5290b270c502316b3694361f6c"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/en-ZA/firefox-49.0b1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "5ce15a1e1d9a5d3c26a2e1b2705c11fcd42acbd296231f2d25d7b130185b09ab25d0332c199d0f8e4994b30c97ea8d80e1f1ceaab8c8d8ffeaa2a2da91b32875"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/eo/firefox-49.0b1.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "bb5e5f0b07054f2cfaa047e8df129c0fede79f6e5d736014cea52bc59b8b4c5276bf3c4217b818adf2ddf11c054c8a5ddc782a9c0b529b7164bd6f1e7edb6ca4"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/eo/firefox-49.0b1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "01d363154887ebf4c008646c4d749c89f8d748d9b0f76e19de37dc097517aa67485830679406b57348a670568f9406fe14fd22e01410f3a00e102b5436779193"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/es-AR/firefox-49.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "8fa22a6ac6e2f9553bfc6fd7b0326ce327e4352b83e45d89ea0f79267073e03bba7dd1f2c2c2de40e3533cb0af97673aaa758eb0914c090078306f4b2902e361"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/es-AR/firefox-49.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "da2b44fc3bd5c7536744b1355ee9640b2d430c32c3127ce1f8eea09cf88016c0e2bd9768925abf19b49ba62c55d90c029465b03c307fbc361ad95f4c28acb419"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/es-CL/firefox-49.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "2cbc20485b5faf26a7f8978b63b8c135582569bc5d68c96b2dcd3d66864b2158479b7c5db0521ccb9c2de4eda6b4ffdea04ea480ac9b3e4609fade7f17806a6f"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/es-CL/firefox-49.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "ea8bfed6bb886d23f8755b8187495ead5aa955c9fa45db1249a2f23477bf01dae4959cd4eeacffb6c3a6402d47da458c9d9fdb43243d64e19e3d66e3e1b85114"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/es-ES/firefox-49.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "ffb37896e2f7de03c26b6e182416c399b9776bb14828fd54ebb34406f25ef77bc9eb975a13b7c9c9b02bf78b496928abc059283322fb1422d63d506f40b533a5"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/es-ES/firefox-49.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "635e7f1e0fe96d6e074bb1f2a4e92d98e0fb4049f7bf34f5e5547fadd00691e27efbd5acf6b79ea9e3bbb8d7b72a50f7beb64bbabfc55601645292a83384a2a2"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/es-MX/firefox-49.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "f67781fcf3ff9e4dfc1ed042bbc6c8aede1a06a6f9b4f9f4c969a9df769114febcdb4bae191ccc9ac10cebe727f495307e497af721c326ad7d2bb6894fd93944"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/es-MX/firefox-49.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "42236f745af27e5ffbd1370b9d5136793d1c0ffcd1a1f8299f3a3d439e2671175524416bba6e1ecd162d9f986f89da0d3d1ffc760f2d48c5d28a99d74c467bbb"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/et/firefox-49.0b1.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "d2823810c39808332c46cc39d50c552efb61d74dbc7fb59dfd5b76d1efae544b52de89cac42be4944d831691971d4d8c880ed1cffd9448b05872acf7da39b698"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/et/firefox-49.0b1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "61fb55d812c8b487ddad136f9c908396aa02e3ec4eee3f2f3fefd883c5aaf24a0c138366326bfbebe59b7065cc6f8f99550823e46bad876db8d930251f6a4492"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/eu/firefox-49.0b1.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "5086ad7828197b129d8cd25fbbe7bf0e152b3476ea886ed8cc02290d4ab4912cd02ccdee0c02f08c73dffe6a0b34c11dceeba73cd948c03b26fea8c3bb2a84bc"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/eu/firefox-49.0b1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "b701decbbb6374ebb39522b068a36fb7c3bedff9f2b76cb655cd56addd592bf7d118c828283f52686545a6d9f603b674d8d80b35db217b5637fe2b29864e35b1"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/fa/firefox-49.0b1.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "e14d7a15eb97c7b35bcdca156a86514ad8ca91d9af8978d9e9c1afeef6e71fd3f990daabd65efe424c6275944ea1922c3a313d562e710ee747b4e63d950c6578"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/fa/firefox-49.0b1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "4a0cd3b22daae4cba54473e4b144062e93dcc995a00e4f94fb66349e52274a5504b8e91e681305999fbd0acc3691fb011cc4db5485d59a9de79f542c3fd4dc64"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ff/firefox-49.0b1.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "d199ced706d4dd7f1b21999c335c500cacb8c1e4ece153f2f169711b4b381c316d5c2654608bb6f9a035f8c318c6ec96afe217ee6480451002e8f3269b4f0a82"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ff/firefox-49.0b1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "58bb1595a4eb0dc651ad4778674103b42621375f8f7d138ac658915a974be52c35fd3944c099ee7ff791d7441cd818b09cddfb2a1498274aaecbaba8cbbd8ba7"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/fi/firefox-49.0b1.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "4796471c2c42d9f5f278615b4a29edd80df8c113f42929a97c211bd63fe905bb7861a4c42474c6f19847308c2444e5549b7844824d99e6f236bcd0e2ab44e906"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/fi/firefox-49.0b1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "5d61a0ce98ffb8b9b3a8942b756ecaccaed33fe02513607aacf5338141beefcdcc547815d0f522da57ea1ba81dfcfb0c0e3ca6a0df237ce12501c41a157cfb51"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/fr/firefox-49.0b1.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "6d69faed2f0c72d47311b2a756cd08c1f0b3c142129fd062bce661ec90a888e1ab246a04fd10dc2ba987ee2602f43b794a1507a7f23a5c65e909c0378e2bdea6"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/fr/firefox-49.0b1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "c92b0a2d591037bfda7831767d3c3f3d324190cfb26100bfb26cb12d9281a1b3a487141e4db5112cf122cb4e236ffded74d751aef2590fe703201128a1c453ff"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/fy-NL/firefox-49.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "25cddb8ea11d5422f966c1467d225743aa5807df9131563ed272953b4fa5004c331de87629e2eb6ba1903ad9abf8f0745be966f2e29c82fa74f620f08473f638"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/fy-NL/firefox-49.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "6ea3b911dcbf66fa365b2ce6a6722ce3e412e61e9779d647fdc42d6e9571d60b3908af034658cfa42bc22432ab0a360f9eca676ef3f22b36f05008a33760b1db"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ga-IE/firefox-49.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "7d594f87fc45fd1ef00f2d62dc1c0a382eabd02745cee1901d133f853cc937a4c8915615c189ee6c5378d161fc75230a1c250c789a8c734aca7eb23bb44d45cd"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ga-IE/firefox-49.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "af5a12a3cf90eeaea1f028d4c9a6985d9d8c994947b7976b1a3e8e0ec1af18bab4f8d7b5b86105eb119b1928c23abb4cb7fde737662eb06e0b8394b19573daef"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/gd/firefox-49.0b1.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "8f0e9fa58b929fe1d5640a373ec0b9a93eac336989b1cf10e1577ef8b3b57786f51a40fb0b6a2401faf192e54f7793f04ac3ebccef5dec56a48ded34cbd5cbb7"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/gd/firefox-49.0b1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "8719d4655bf8ac157a6d144ff9acbcdcc138094a3d589a4078d9786acd036adfae6216846681a8feb33f9e020129acff3756074bfe18289cca126f140c4be1a5"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/gl/firefox-49.0b1.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "e198a3becf663600184ee46f5d7043d5349abf10e2e951abfef7782449c142755fa0a37defaadecd674fb92589c24c3d49b45fadcd75ccfb81dea5ddd42b766e"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/gl/firefox-49.0b1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "e37ed350a7cdd5801631ddc934874016b38e4596b1d397d28a9735a977ceee80a70f0b382c186a88bef39c3c747f9825805a2c8143e0fb7b7be574c07301b77d"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/gn/firefox-49.0b1.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "24b41e132f5aac62884d6b5703a8c3be679d6f8201a3abd3ed966cfe349055102bf099cec81f01cd86b40499c597adfbcbae2ca17bc6767c18aa9c0f1c317fb5"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/gn/firefox-49.0b1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "27c62ad953946a1c40b7b7393cc249a9fc2047c6a251c4d27c5a1a9ae8e8361a14c3fa934f6669f0e7a99b27573fac6c5e151ae9c590bb58327ab503f4482ba5"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/gu-IN/firefox-49.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "aea376e23c7522fdd3c0c82f39455b8bbe67ce7008e1e1d9de575f98776fdf3bfa06bab3ba0da81862c0a7242ab9cd2ab1f873a34df084a88ec82ec45c088611"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/gu-IN/firefox-49.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "4dbb401a0f92e02ee8822379a6313a9e7822d1155d064199272dd2be921d9dc7849439b04be3f25043fe37f43a3dee3e7b21831eabd1c555d5292694975987ae"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/he/firefox-49.0b1.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "97888c66cec9bfd111e76fc22440dda604c643396679abad421223b10688763a5d0e64fec46dd94084f30d819a5a12df4fd78434c4b03290fa745b60281b39eb"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/he/firefox-49.0b1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "d46a2aec65b32e9b92a11230465ee6e2f83cef5a5b95057710f0ebdb3581810a1cbff09563f9ad3503a2c7217947369fdd80e0217318a40feed7bfd01fdbbcff"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hi-IN/firefox-49.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "48c3142a39ed9d9173d1c25337d65367f1430804b13d0c9595ac2546c7c22a177a4d528f37d773ddff3379bc7bdba5e69002f2a37c837aa95a29d4e52774e65b"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hi-IN/firefox-49.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "cc3c1520f6ec453bd7e347791f8ab3da06a3aeaccb44cfe5491a4fcfdf69ed7baef66c2d31a9ebad9d2538b6ff8f1dd27b20a8f42665a1c6ee57c5f60094ef71"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hr/firefox-49.0b1.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "86dce4d32a3f01493ce83379cb20bb2e267dbeb770b9631914d3b9e722cdb9ae5a0a974b323ee2ed17fb97bd232baaaea1e53ea6f29b11253046656f98219cde"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hr/firefox-49.0b1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "446c11ab6645e17465e24fe1d4dbf27175b27e4808bc66084bcf8a1760883f6a36a5992be18ab26115f75bf0dce780c42fcabb1af3d2009f4ff7015bbe0612fd"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hsb/firefox-49.0b1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "8eae4fae6e4a7d5acb9ad2b83c4f7b4d2c7edd75a4d320b6665d803d44fc448214ac71b2c86c9b16e6450f7b5238db8633a917f201b5d45f2cc03a31df2ac9d7"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hsb/firefox-49.0b1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "c937552d45b948fde0854ab6ec27f77aebf7fa13eb6ff5fbcc74e86309581fe6ec799580fca7e131c940d218d09f70e4e49dc5348ec99e4d5ae6a0c63c9a6f06"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hu/firefox-49.0b1.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "4c38f40861411365e4a67bef548252328024438fc3a39260708a505a625ae9fc2912bd537a83bbe4125a027b50916daceae369a68d0ea7ba309b8595f8864fd8"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hu/firefox-49.0b1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "fa298f7b4cd8fa50767f8b9a2bea0bd10e898a9e3042a0e09785ac74559b05877dbbc663ddb185146062fb1b3018a06f7e948fc33711726e43d5f33df1b3aef4"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hy-AM/firefox-49.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "9e2838645094c6f8703857b674916517a47328aedead3e10dd3801abfe94971a648d792cbc1abfcfc7e39629aa7936d74cb711b53daf9f7198594e7b82c063ec"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hy-AM/firefox-49.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "a84c9f9f20e19d3820b632f3ba4c9c479066459d293a57b5ff8fd4dae1d1451f812b0a6a71e72559d3ae0596a4ccb5fd09c0056a2726ac3a0c1cf083595adceb"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/id/firefox-49.0b1.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "dc84f03e90ca309805c85f45f8e3a54c92e80237980b488abcac0eee1083237a51f30847b84adc3b6051b6d9c9075799c295996d5a912b7ebfb290911006b8c7"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/id/firefox-49.0b1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "e3d9e20347ffdce67d5bf5c720c93330b6a19e9733eab79f07820b50cc4ccd39a7f0736b0355f15e5bd59a8de24a0e9105bedb9d8da1cef125ea88cd1e6865c0"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/is/firefox-49.0b1.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "5b4966046dae0bb27a9fde5850fe291820b19c5e41fef4f010faa4d2d040ffcccb487d7f7647d0286e8e4e7fd27b50a12047d6fc95dc70dc34e7e1da4bce6b37"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/is/firefox-49.0b1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "7b30d841c840af2c9b55173ac31ce5880a8b01daefd7871a4519107d276660af072c097479ae92b5b83379cd36a7c68ecf2d781d16b75d5eb38648aef6d89288"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/it/firefox-49.0b1.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "920e34f7db5452fad20303296b49f7d3dc7bc780735ef881c4c2cb42f2393d3be319adacbda74cfa965283681a01260dbe2298244fba5e541b807f7faffdf285"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/it/firefox-49.0b1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "3af89ab3f92d771fa82c58fc5ebdaa9ad11d7f89b57357e98ecadcd57bcadfe66101d09b187daec1c64dff808172eac5a608239be6c991e2a725ea9421e4b8e5"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ja/firefox-49.0b1.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "e0239291135a98bce718d86831a0aaf3486c0e1ff54c98e65e970d1824786624e76ae73572b85f009b413bbe8c61aff41972629819812eb36918d4f2e864a274"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ja/firefox-49.0b1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "998635a41eb45b8329f70837d0096cc69c6c7983ec48a208185fb0f3ee56c607c68178ac6f8c02de34c62e5c7ab38c1829b445dfed80f7794b7ef4fcd9ddc4aa"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/kk/firefox-49.0b1.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "aee3c991acefbf1e257882bbd34eaee45415eecfb3fee2fa47a1d70cc5b6780b0894165a4c25609d595e4759d56ff0767b42f5b1d9174b4c1daa3e967871b66d"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/kk/firefox-49.0b1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "e2170378be3b442bd97066d740d458e82d282cbcdcac555d425d16082ca22c766832a8602071135cf9802eb97b0c6f7f414fe076ddb976d84a4ddb1f1ea23bcc"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/km/firefox-49.0b1.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "71e8ebcec8758c4fcd6056530b26c2fed1512f36746d431660eb603838c22e7c9c86a560ba36bd18e3df783531e608c67daceb50ea1758671c489ce91e214690"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/km/firefox-49.0b1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "ed54aa4da9b6b2692c7d275d11ea53a85bd4ad131ecd644ec37acd3efbd51a25358c6b5720227e5cffb291d018c0890d46d09b61d3782e8000012893da10d144"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/kn/firefox-49.0b1.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "678f4cfff160cfc6fd4f8e478f64ace3658c84672153c501f817a1456d7f7721d891d0186dfffa32e12bbbb46421e08e46753dc01021d3361b2e863176b32288"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/kn/firefox-49.0b1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "ec945284725364eff8e57d2f2e8bee7d35d8c217423b21d97328c8c5c2d43575c2af30fc93c8e128131c72ca7b2ea7420b88b21ded184a6b5e242fc76731e25a"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ko/firefox-49.0b1.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "07839edad66284da56ec54366fef1ef0d1a55b6e7f7d215d9f52827e080d070c07be4948df13d3b082bb5962e00d503b4916937bcf5045d9e3f9896e7c8698d1"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ko/firefox-49.0b1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "6183cd77dfef7ed41e2049f3b423942eedcc2d5a49f820226c1fa366cbb75f63954b26c7797da42a11ec63f19bfc5bf19ebe605ac0d501391f64f5f168e157a5"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/lij/firefox-49.0b1.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "3e78f5ada0a37d181e4a7b5ef90ad39fcc0216783e6ef26de826c642f1aaea59cb968636b0249af9ff92b0ef32fdde051c2d6a71d4aa2e6ac35aecc062f8e222"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/lij/firefox-49.0b1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "b8e8f635e927beaa0a12e92e025deaa2e98cf2d19dacca5ae91c21fe6c41177c8670b46b1a896f1b8b80fc60d806f1642bf787c44058077c4225a6de8902e664"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/lt/firefox-49.0b1.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "e71759b4088ab845c193271e0c48c319401362c8d2f0def8342807a972f70db6963ea405c93fb8832cae1f930503a3a54458de230d17d53cc376946782cb6e3f"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/lt/firefox-49.0b1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "616a104d2ef421c162e6688d4128995faddac35f95327fccb313e20e56c410558f39869041900ac246d2cdbf510552bdc8a006623d8c6bbbf5350b6d7bd94899"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/lv/firefox-49.0b1.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "2c413f2194c147fa4c3e21a9bdf67157fa7ea51dc7129dd8cb34e3b645600561ad9e9ebf3608cd75fc17e7d7b95cec49bb746d48c0b55fb4ea7b9ba7a359cfee"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/lv/firefox-49.0b1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "2743486ad0860c500a6a9146a49ec6190867706a74350310ed2987b71c5503886ba2931ba066f373fd05342198f6e8bf2a491cbb4a85c0763f1a68c1a124f796"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/mai/firefox-49.0b1.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "7e5bbede973200faf58753d0de6041298f8d31937e19b9353bb83043229c8634cafc2e79129e9a8b34d1b4be451b6d3ad77e3ceb21ce8bf1a35f386ecdd64d09"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/mai/firefox-49.0b1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "8e51758b070bbde4d7bb4cd8aee148c1e8fef2d5bf236a4801b58e8acdfa567b6df5d32c3d46ddf965a599ba79c95b0884210bc3166fb8e9408e5255fcfaf5c7"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/mk/firefox-49.0b1.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "3d945094b78f360045cfe6e1ffd53ac15a070b61adafec3063a88dd7f6ad4972fa5d4cc0398aa9bf30494be4326b63c8d8340ebd25d15c231c39d9a8b9c18da4"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/mk/firefox-49.0b1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "d2e8537a64747c06b2fe05b080c0eb0af82e1f4427a396c90006d012b663c1d34273307af4995b6ff8e75de4e3727cc3f736c7a9a78e0042f2f8d018ce525582"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ml/firefox-49.0b1.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "561b7a1d3f308552ba8b2084c86d6318b901fe8a7fff3254b65b790e4909dffb355eaaa898ee352310b8633fc695c6d7feb1d13ab60bf491a0668dbb05297b7a"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ml/firefox-49.0b1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "6970448bfda2c54605d052570fa3ac81cfd554611c994125247ff4927807938a80fa65405ddc14a295a38bae9a1d9fcf460b32e5ba0cdff5cc690b57cb4a8d87"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/mr/firefox-49.0b1.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "43b9022cd14ca829cc1f8546a9e13767e6f32daa3b008b6864a8cae3a8e6f99e70df0a05fdaa724e92fad38aabc5ffdbc9685795a0cbf1c914fbe3b515e80c99"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/mr/firefox-49.0b1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "16e029ba38ba9a88d57a72d7bb3ac843916f2e15b4a288815f59109cad9bb1c70beb0716360df4977231fe91f18ba3490168a857ce94c04d85a1aa5927372571"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ms/firefox-49.0b1.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "f418c661961f6c2e6fae0a1cd5329c35b331fa64bf9aa6d186f59d7b778d5b3fd7d6d548f69ba86f5b031bade68ec118aecc4aefc9a90ebc219945ce907f31be"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ms/firefox-49.0b1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "05630d2f74ea7f70e9dd97284b41c4d4da2d325884696f58b1f88b3e29c4d5bcfa1ba7cc5f3aa412c852ac61f406fec29e0d3fea7820759d87f022811e6c5b0f"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/nb-NO/firefox-49.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "81127ce66c7f7da82e6059abaf002b79225bea3e69558636d5aaccba0c9df97adcc8c041b9239ec8763e28040807151b2ea01c795f4df088b896b774ea2e6162"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/nb-NO/firefox-49.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "e6c13dcdef6935921f74beaad25ceb8394a1256bc3ac6a1d76f3957f067d0bf1572d1a7b8ea2da6ffeb0eff8a4b2a1d80215f5169dce3c701fcc40dece34bd3e"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/nl/firefox-49.0b1.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "b97db2d48eb98be9228358a0a068ea93d21ce4a5f6d138d079461c0a7f93d3a726d141adb43f41a56e658f629366eebb7ed4a0a1594a9d265ef121faabb14d52"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/nl/firefox-49.0b1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "acd10d50291fd833a574d049d99a567383dbb4483ecc45583dd977c3c67fabb9d450c802b8e2eb3d4eabc719f68f0db4e2a102bd716a4bf50aa02724da382f58"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/nn-NO/firefox-49.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "a07fb8c7ee065b0b7a4a3fa33e8dad026b65e42920398e6fdbf186985e46c6c55b72ecff087aace1559df286b7832a6de8215b713274234242531d7807d90180"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/nn-NO/firefox-49.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "37d17e905e92aa51d82f13e33415738cf8a5952617bec6a6e095147efca81b7196f997b47167abdd7a8d041c3308307c587a29ca3ec9f2e65e71d15b68b8bbda"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/or/firefox-49.0b1.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "85ec647821f82cc3ad99142e8e4425a00b6e0b273f137cdbff10c4e91afbdf4eb9feb7d4a2c9f80191cec918180aab0a84f96b7de1efda1fe0cdf9e1c44446eb"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/or/firefox-49.0b1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "8819b00e2fdc06fb17873c769f7c8461fa131bcb12f0fd191a08a3a6526571fe40caa7cd8f7ef8e0d8722bae84699a479105cf518897c76aee674ea8a2dddc2f"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/pa-IN/firefox-49.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "70f7cdc912a6d1c5360b58ce522386ed9562aee8dffbf4a1f653871114359880df3f98629a2d4fe5556a1ba89fc5ec90a2c3da2d56ccf419f3956dfad157a3f9"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/pa-IN/firefox-49.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "9b60f41e9fd92c1d22dbfa1d287081d9514e081940dd9cbe1c9b4467926d83cec9ff43caf854710ec59d805293a83ea5defab887be5a93c8eedfa959b74ba783"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/pl/firefox-49.0b1.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "80372feb8348b48627a93c5f2a5486933fe731a3fdfa2da6d71a7c75b35f585cd5b2cfa0760bb17de8fb98be1ef3dd90339a635ce25749bd27d147b316847084"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/pl/firefox-49.0b1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "445b104cd539f088a5cecbad4a1a861096542d1a4f2c95696ec51d43d08f10fc71513cceb5a68fa179fd988abaedb20829742f108f529face6e8e442576abb54"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/pt-BR/firefox-49.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "0788d7f599c3f46dfe485ed1ded013a7d87db6aec63193887f5e6b8c3636e0b117f4b854c5b0f60ee8b9683e6d46390f365a19e499fabc2a78ac29380dd26b35"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/pt-BR/firefox-49.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "ced012e0d447aae654edde3b26422f895440d8aa0822f3a14450142f6d97c20e74d1ec068bf2cde4a81270a77ef01a23646532e55ada6dc41603b013945986cf"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/pt-PT/firefox-49.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "d27ad4e240ee032cf16ecdc5588d3bdfcc81d338ef357c96194bc33d5d0d571c3826d298215b9cf058dec1cdb86d2bb41d5739ee4f49292bcc290ea4d50d2ca7"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/pt-PT/firefox-49.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "e80d1df4ea210d5a3731803026c3fca5143ade3e7f994a7a7bd673a6ba8b7df8eff9784e9bfe6d3360caf5c50609835ffaab631ecb5aafe71dde8adafa91db04"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/rm/firefox-49.0b1.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "75f10944c6ab83ca1ca49d2bc05e8923830b1fa236620ceba9cbe2f874713cd49a6f0ea4968ce3ad08a5196746dbe3c48a3b51eb0f6d8d310715c6636d17d1f1"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/rm/firefox-49.0b1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "35df8ad315c60342119605cbad7fc1614002750ba6745d35d25653eaad6eedd7b039271b2900f712ec5a1c03425a902f5009e76b8c42bb074d5f64d6f6ea7477"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ro/firefox-49.0b1.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "8c31aa2df6cf1e1006691152e74aaf4b580a3b15d141444eab1cd4f3adc1066e7ac9c8196c8cd87902d590cf605bdf449d71fcb34b132a9221b101e0c16efe8d"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ro/firefox-49.0b1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "ff6d5a5bc127841a1e92eb6bc22d157a57d7f48e4bc95b68907fee50683b20a0dcfd9e5a567f013a6c72311b9441231e986c7659fa60b894ea34d265786a857e"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ru/firefox-49.0b1.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "e8e7a794a3dde3b9fbe82c367d44134979cc45ad115fbc82bc8b9c8c438a857abe2e4962f50fa69ac7c22772ba3eb21c464bb800bef9eee9f2b33636f43261d2"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ru/firefox-49.0b1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "c653182b26d643d32e0983cf546fe8f0e5a96b7f174c52e8a9025fc56f17ce6ae12b1362abe9b408cb9970b15fcacad1747b41be86bd2475a3e3c45665f88355"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/si/firefox-49.0b1.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "4e4ab25fc8048b4bd9129a554b465ced3ff773d9a7eed9715c71ab92852573712c58667971a1dec556917603c493872577b003168821350ceaa3dc3dd9e2211c"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/si/firefox-49.0b1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "a8a9dad2f7563b686012a002b8fedac3b0a68f73986db717b901e832c57d1e4b2304b47aabcc17f5e453de3467caf8aabf9635e6db7772ef340fa38fed29eb0d"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sk/firefox-49.0b1.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "2e2f936448e58f8b3b46119e06b2ab5f1c181536939127de0a76931ac992f28ea307227d5c61aa8b440907aefaeb95cdf81f9d0184c78234f82f6d965c045c98"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sk/firefox-49.0b1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "14d5960a06fb7135bbe78ea7123a7c151c4494898ad6ea1a5386f0532f0a5ec35ef58e3fcb82381afdf47ca1c0e6954d0903232d1ee06d9c2a606e706d22e82e"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sl/firefox-49.0b1.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "04f2f408835a9bdddd4a4c256d9a0040171760f5bce1b7d5e9c3a4ce2c74682c4016ee93f8da193280c7fd3d47ef839d67e0c480d5abd8c2235e61b9c039453d"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sl/firefox-49.0b1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "631c9305f259aab364c71550ad14a0cfc6edc24a43eac08345e4331cfd4192faf710f077f5b2a5fad169b15098725c996587b96261dc18b96bc18f2a63c62e34"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/son/firefox-49.0b1.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "b8605cc6851440a615cb8a29d6baadb90fc783270253c25992299b1ced630094c891d41a49a9802e47aa2f9e1656875825dabb31450d7765658e5fd4f3815b10"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/son/firefox-49.0b1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "c17946e4d664eefbeed3a3e3430b4c5b9ffcb69628344568b354092fb72142e7da107b1a88d1af89caa7ae63a0cb76814662fdffc9e179213df4e10a3290596b"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sq/firefox-49.0b1.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "ecab80a09b8c2eb75f38c14c169ee88f78266973d21da9295d5cdbeb329a43e3978feca7bada4ee049b24cb914dcd2a4ebaa95f42ed6966cf614c55a229862a2"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sq/firefox-49.0b1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "5931bc9ddb86a39fd0edda4cbedfa6838549201efb882eb9a3c25ea88031fe4aed971ef327d6c356c99a0610a19e99a6ec49e755888b00882c6039f2c0e4cfc5"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sr/firefox-49.0b1.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "57895b4d8a0319d25288661b145d0aa59afbbd36edd8fbdf777d95f48fffa53d3dea546f465ce2070b801bcf751b03182711e5f74ca01f72258427fd37b2f038"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sr/firefox-49.0b1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "67d96d069f43312a4c5870c2a9715e9aa5e7592b12302a773c8d6fd9f9979e63a5053d54f326d66374f216d1e69203fafef436be6b015269513f8f4a289aa796"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sv-SE/firefox-49.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "f7b1ddace365492563a3eb985067e0c19270725a8db571b626000593b7e89130345b61199d50d41daadd499ecc6858fcb46115dac455cc62ed21460b916eaf41"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sv-SE/firefox-49.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "7ac9fbd7b3175d82e73fe176481c3611eaf313fd006cf1191b79860f215af8847af88299fcf673d9e9a52db4a68a4ea4e95b632729c7b221f38e35926d60bc93"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ta/firefox-49.0b1.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "05a83591aaf1d5fc15b9a0445e2d5a20798329b3842992ccd82d22e4c788bbd34cdb46b09b48cf044369742f2b6244857e7d00b68160d094fe01465b746e0493"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ta/firefox-49.0b1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "ec3cc0ae6d3765e9942436fadcb6208672a745df670a9e5881d243812b86023e8181f5b1b6d3ad3a2dbf8b93e80e3c8b2eee4622b511566b3ca7902b454d698c"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/te/firefox-49.0b1.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "ab9a5d17a70bd8685370898ad86ca867bb9a919169ef4c8ee6dae07836f4dfa58d3dead4565462b6f12d3c39c16b50ef99919f850928de0527c55563edac66ed"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/te/firefox-49.0b1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "e3d216ee3ab627f7f86ef192f63a63f1e20bbc22df4947f53e3d9f8902e3871b7fb797eb409f0cf966be4da5b1ae05461c0b0dab7788a6c87069f940e1cc5498"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/th/firefox-49.0b1.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "4df9b93ba7bb70fa0c7c3c4e9a88cbfd8197c6bf628d2107a2a57105307a50cb08d8fc114e456b125164668c6f48aef1f0e4b71b52eb045e6b8be792e8b8e38b"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/th/firefox-49.0b1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "51ed80166e1224db790dbdffc60d0eda618eaf67f473fb60ff0bb6a6f15d45fa8d44a31c6d4bc747752dac8fc3075371b4798040afaa594b713c331a91633724"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/tr/firefox-49.0b1.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "7db1ec390a2d4f120eff21fbaee7700d106c4fd5c1ee1216bba0c7f896e6708bbc1da4c0f1f3ef1dd6f830ed58256fce36616950df9eae3307d2bffba6c3147f"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/tr/firefox-49.0b1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "7f1295dbb8c66e22dd818e9fcc910957328dee42ffed8ad3f987b1959bf6f1c01f8f94657dcf0c2593ff747308c6fccf14fa3716fb4b189fb03b77332300823a"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/uk/firefox-49.0b1.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "81b1d6cd6e5666307ea592992084f7289a5eed5a732070fd65532722f6a345cb78de868e15f3e74dc15d97cfb57f346b7e36559c5f40769391f6616c897b218c"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/uk/firefox-49.0b1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "752a9aaafe23559f2cb15e6652012803eeca5e3b584dd5515fc496d62671090272b7154f1e5f701a2cc6f848b5d2a1050966c1b9cccfab7cd16fe88d66a101c9"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/uz/firefox-49.0b1.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "44b6ea23bd56ad74892f00f1abd3aaf1d0e8d748814b509f791dc0ac4d303c61cb3f5d9988c07028e9dfe88ef8130fb300c131b96fa1f1b5fb4693c8a2dc0c4f"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/uz/firefox-49.0b1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "94a7da589c758fc5766ade665f15af4704aae4e0729fe0a92235804c42a280bdedc3b0d2d23f153243765fb803d05023c1f4900367fcbf1b60ec5a9449f99226"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/vi/firefox-49.0b1.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "e1674665330ce86c9ce6379e81f71ce7e1dd58f1dcf7ce4141a681e1135262565021c0885e884065b5f3637884ef25f7611c7ababa614e0f3e561051925fb168"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/vi/firefox-49.0b1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "74da3a781ceb5937e42f3aa8b6f2aa3481d439e67ab16e1745a9248efe96129c6962583276e06e417b7930ac65d4681f6362eef4cb916a5943f50b7ef98aa4a3"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/xh/firefox-49.0b1.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "052c729f9a90bb02e60dc5d0639fb9639669aba511fbfb5cb727500892e58519f3b6231144741a163622a5bcbe855d38b530780350c5caf33d43d297769b0aa0"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/xh/firefox-49.0b1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "b0c436603ed7ab7004e84f2e0654f04c5e5f3fb7866faa7548e675e8246adb2a60528d476292be99206a3e1b6342ced48d80031c8caba11f01a1534ae17901fa"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/zh-CN/firefox-49.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "c591789133b5c73026d1f5131581f91c21d8c6ea402dfcfb80ff1dd5e07f7985274ef8682fc7a576421b05721df9533a14bb34ba95193178e62b6e195fae0ae6"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/zh-CN/firefox-49.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "762eec0143e00d41d909f865dfef006a460a5b046b75f1132b63d76dff6380d40284a04b07415785f0bbadc457cf66f3aed1bf47e34cf5d5909fb6f8fddf58ec"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/zh-TW/firefox-49.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "b7eacd7854170626e9135d2bd5360b9d2073afc64ecc9f963de8b03ea550a0f6d2c4bae48268d2f9d0c09e7747dcbf8d06eaff4951cbf5953c237a8461b163df"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/zh-TW/firefox-49.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "78968866d80798b3360d3860db039b4f5ab4d62618be681188799efa675ed83b84b4b266dee84ff26d27afdbb8a08f3a3bf73f3bc85289473e7e7836e4a92cab"; }
- ];
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ach/firefox-51.0b8.tar.bz2";
+ locale = "ach";
+ arch = "linux-x86_64";
+ sha512 = "c251fe3e50d7bb85a46e86afb9d041b161061e6718cbfe6114172a098f35eedaa2f221a3f7bcdb2ebe210a5ebb5cc33fb50b1dd04da5256cb32646678d722b28";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/af/firefox-51.0b8.tar.bz2";
+ locale = "af";
+ arch = "linux-x86_64";
+ sha512 = "ff8af74fdf27e72169193a81e62b99ce831bc466e50ef2d843dda03894fe3cc764ba69021c839ee09ab48b7b3a6140f1ed01c045efb01f75342bcbc333158a49";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/an/firefox-51.0b8.tar.bz2";
+ locale = "an";
+ arch = "linux-x86_64";
+ sha512 = "20b5965b70cc773eb2226608fef18efdc24fe22f2feea43f39fe9d09afcb89db15caa8149a908bbca3f26e8d6b4f3651d164fb97f2dd2ee67e33b8e43635871e";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ar/firefox-51.0b8.tar.bz2";
+ locale = "ar";
+ arch = "linux-x86_64";
+ sha512 = "b1816f401757634f618e1d9929c2a341adfdfad42bcefa8673c7d8c511c46267054352558f3a83d399c68e7f80faa1c2cea519ac24618479828c37b4067f8e78";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/as/firefox-51.0b8.tar.bz2";
+ locale = "as";
+ arch = "linux-x86_64";
+ sha512 = "049a8f3782a34d8432204ef6119a2909ca4e6eba83f760c8f35f1be86595483e47823088e508a1389d68ee366e14431686db7edc44d1fd5934f887aaed85bc4d";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ast/firefox-51.0b8.tar.bz2";
+ locale = "ast";
+ arch = "linux-x86_64";
+ sha512 = "b2c48f6009e01924e75d7671a819b4af51b87a3a08576812bc7f89b2273d047a3ca914147b519dcc50f1deb21acebeeebb05fc306fbbe016f12e3fbaa885bf16";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/az/firefox-51.0b8.tar.bz2";
+ locale = "az";
+ arch = "linux-x86_64";
+ sha512 = "315e47d4e4d6d985f4390d8a40cb736ec871ecb30ab76db9235bb040eac9b73c3a1e709d783db2363c97f6ca91e3281c4c88e10c4d9fc62131fd8c105d7269ee";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/bg/firefox-51.0b8.tar.bz2";
+ locale = "bg";
+ arch = "linux-x86_64";
+ sha512 = "b31bf59b6546741ab005c5ca11115f1557923f467e801f16049e83881deb8a8f6b775b425a8fc2a608b51170fa00a4b464c9e60e306267fb50b2144b23948613";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/bn-BD/firefox-51.0b8.tar.bz2";
+ locale = "bn-BD";
+ arch = "linux-x86_64";
+ sha512 = "5683955a4d1e678d9893554d9cc534a61f2cb0242e2ac068424eba238f1ce89e58692cdb35e43d58cdd71c0c0683a5d61920089ffd100416e6a2448ce43f2004";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/bn-IN/firefox-51.0b8.tar.bz2";
+ locale = "bn-IN";
+ arch = "linux-x86_64";
+ sha512 = "0220a226f53b7a99d123a1e72a6db88e726748c9d3e0ed46a51ab36b2ba5213dbf2cdef55b8a8892c97ee656905f01920563e344a412142993c719f15cb0bc43";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/br/firefox-51.0b8.tar.bz2";
+ locale = "br";
+ arch = "linux-x86_64";
+ sha512 = "046d7c42a294fe636cbdbd13da8fccb879595ebda6353ed91981ecae39f670f1650f33b1ce0d3705158a437a22a718d5d381bbc37583702253941abe25ebc477";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/bs/firefox-51.0b8.tar.bz2";
+ locale = "bs";
+ arch = "linux-x86_64";
+ sha512 = "a2e0df77bdb46f501e2760df79589ebec8e1bfb85e07ddee1d89c797a34781efd57e1790127d6cb38199bbe01680e5b04208f2c06b22a9bc684c87042f825267";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ca/firefox-51.0b8.tar.bz2";
+ locale = "ca";
+ arch = "linux-x86_64";
+ sha512 = "e8a4a37a55a882ce638e51ad5d4a08ac815fb5cd556d0e8db3982501ee2f9c0ec141132ffb0eebbdae47be78f74dec7fba730638c8ebe38ce82ecdcfb570adb6";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/cak/firefox-51.0b8.tar.bz2";
+ locale = "cak";
+ arch = "linux-x86_64";
+ sha512 = "aefda93ce59fdf238c2b957e45463c6f75e511a4331596bafaa4e8a99139f17ad2facc22befcf2fbe105651e9b003447bb62c3c2c6ffe4681816baa400f68a6f";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/cs/firefox-51.0b8.tar.bz2";
+ locale = "cs";
+ arch = "linux-x86_64";
+ sha512 = "9eeeab75b2963959db947165f46443f686760f655dedae4de3d174a340c88830fbfcc0fd1df23740e6abe6d7f4552f06630c93f28246ff907fe6eebc1437d943";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/cy/firefox-51.0b8.tar.bz2";
+ locale = "cy";
+ arch = "linux-x86_64";
+ sha512 = "659ea6606bb307893448b0352c175761e6bae90246ce157eb2cb9373b923ffede18eb8526330391396f9998fdade7db135a54f8aa14c4f52daeb9cddc44f344e";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/da/firefox-51.0b8.tar.bz2";
+ locale = "da";
+ arch = "linux-x86_64";
+ sha512 = "22647561d07e92d82be5bcd2c5f2e7a08d6491ea582464f64a8ba686496b0267eab6c07db49ae189f996b8cac9d0c4c7789c3230003d05dbc5fa8319acabc4fb";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/de/firefox-51.0b8.tar.bz2";
+ locale = "de";
+ arch = "linux-x86_64";
+ sha512 = "313446d8dd7764b98eba2284d71d8abb47568577f312718f02a73bdbee4938477ed407d3d638fee4dfacbb43d4125806c882e0c96cda43c9fc5b09e7fc6656d3";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/dsb/firefox-51.0b8.tar.bz2";
+ locale = "dsb";
+ arch = "linux-x86_64";
+ sha512 = "4e0bec424f15dec37ed21a46c79f9672d380f9d59e3109afd4debbda2cfe58bf8b17f75d905babcbf7bce5cb8f7f3312bd938ad945e163d3e11be42b9dee2fca";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/el/firefox-51.0b8.tar.bz2";
+ locale = "el";
+ arch = "linux-x86_64";
+ sha512 = "c10b58b13a85bc1cee23ed23ab8f62dc79247d025ead6efbc4165895568c6d369574fed7cd2d294bbbdec56e7673928ffa4db77720d871011b7757aa90789e18";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/en-GB/firefox-51.0b8.tar.bz2";
+ locale = "en-GB";
+ arch = "linux-x86_64";
+ sha512 = "1cfe32620ca3a3fc5cce03ba13c6acb174567f99879fac86705e10d0036eea35c912064827676fe5dd0ba3da5bbc624795c3f7bde7546f15246b1acc1cbfbcda";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/en-US/firefox-51.0b8.tar.bz2";
+ locale = "en-US";
+ arch = "linux-x86_64";
+ sha512 = "c8504535fc15bad6fdcf5aeb11a54ef26ef56d14076ac6fe06cfb530c1952118b957fc3cc6ea2c046af3a5ca90dc87655ae67d7baf66e46064382ba529045362";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/en-ZA/firefox-51.0b8.tar.bz2";
+ locale = "en-ZA";
+ arch = "linux-x86_64";
+ sha512 = "80b40ea103d5691cff9df8373231acb151e6bda0526d27d59bf226f24e8287eae335b1224429b61676c8c9f3021ba77a31cfd3bfc68948d6553978fc570ac6f0";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/eo/firefox-51.0b8.tar.bz2";
+ locale = "eo";
+ arch = "linux-x86_64";
+ sha512 = "a9809ec0e031e7e127441c11003bc81d8dc701e3acc45f137e7e68bbf1ebdcb5cf40267e9f8e7431e62506678cac04f732e73978ad566cd51597a1cb45eb0ac7";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/es-AR/firefox-51.0b8.tar.bz2";
+ locale = "es-AR";
+ arch = "linux-x86_64";
+ sha512 = "18851295d00c2204b75c8e3d2d07a12ecdb9456d8ce41606178054b64ea5b7e9ebd3832db76412d2d5a26941494936c811084216525c56e4f017063734d7ca44";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/es-CL/firefox-51.0b8.tar.bz2";
+ locale = "es-CL";
+ arch = "linux-x86_64";
+ sha512 = "9a7dabef38bb5f0909f033950f4e0424fc2c0119f4bbc0de85bf76f29413b2984e0d56522f900055cd9e79916397791f0597229a19d2d6fe0f8850c09f9bf3f2";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/es-ES/firefox-51.0b8.tar.bz2";
+ locale = "es-ES";
+ arch = "linux-x86_64";
+ sha512 = "52b87c75267dc27aa9acb9a49ce9e59bf989f76827c078acb8d9166f60f0d86f6a0e937aba324e8e9e9ab5e0c721f75f0330199e16540809d0e8e9c068826406";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/es-MX/firefox-51.0b8.tar.bz2";
+ locale = "es-MX";
+ arch = "linux-x86_64";
+ sha512 = "e57f22ee791acab3792cce3f52823d5fdcced5befb2808cc717d0da4a876a517d52b2e22f4558c33ecbbff01a799d70e2e67ead9140630a0111d73ffa5e54de9";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/et/firefox-51.0b8.tar.bz2";
+ locale = "et";
+ arch = "linux-x86_64";
+ sha512 = "572a6f67b10f1a4981d7f0f131bfb9900a20a094f34cb3eee717d7694e3c1b2a949dbe262a10b6ed22cdc97c3a99ef885a4f34d15268c6aacdc7cd28ceb16f8a";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/eu/firefox-51.0b8.tar.bz2";
+ locale = "eu";
+ arch = "linux-x86_64";
+ sha512 = "8ce7450a27a26954701585a2d55616d98658295c122071641209274a2555e0bd45e57e17be715cd69e00187169501f7c8fdf419a3e1626c4a1e5636f36be26b9";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/fa/firefox-51.0b8.tar.bz2";
+ locale = "fa";
+ arch = "linux-x86_64";
+ sha512 = "f42a0effb6ff4210707371f6693e2bb25119f7535581c488760c237a3019e58fa270543f6981348f609c776bee54e76a220c449b7169d7032b2817ea1255eacf";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ff/firefox-51.0b8.tar.bz2";
+ locale = "ff";
+ arch = "linux-x86_64";
+ sha512 = "7718bb71ff031975bae785130c86c1fe007698177b04d55008a5175074f9ba33841e3939f80dd76034680d7409ba281162540757b4365c03e10fdc21317b3df4";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/fi/firefox-51.0b8.tar.bz2";
+ locale = "fi";
+ arch = "linux-x86_64";
+ sha512 = "9f5cb2d9ad20d788d715eae64406abc5fdf9229125f8a88f44de574c836af2943a7844ddbd96eb6770a5e011c5e239009aaf022ae6c0a14fc1c01dd2a9283b1f";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/fr/firefox-51.0b8.tar.bz2";
+ locale = "fr";
+ arch = "linux-x86_64";
+ sha512 = "d9098b1b61bdfa82db7acc0f24fdd8e248f9fc0ae1c044829a27c45ed99c933fe7e8eded84cce9d454dd544b0645b2e871a00f3677868aa4efc00bd82dbeaf5b";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/fy-NL/firefox-51.0b8.tar.bz2";
+ locale = "fy-NL";
+ arch = "linux-x86_64";
+ sha512 = "146b24d3670822394130e270b851beb3a4017818004ad5d6699b8424ca5d4dda16788668addb7f42b21980a6dd39a2c3546bc36d5bf2298b831fa83e957beefb";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ga-IE/firefox-51.0b8.tar.bz2";
+ locale = "ga-IE";
+ arch = "linux-x86_64";
+ sha512 = "b1b38c876e9226abe24cc4379ae8a0d489db7f91f332560f922b3998d0c564f42730ab568277f4159bce95c1024634f20c918b97e84fa7915e4b841f9d0b760d";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/gd/firefox-51.0b8.tar.bz2";
+ locale = "gd";
+ arch = "linux-x86_64";
+ sha512 = "e3b3191298f2a08ff52314aaf9ff9689e8ea83128f43010fa90ad8a24caf340e24223c8f5109fec2286a68c699bcfa98fbdca0c10f62956dfd768a473e0a77a6";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/gl/firefox-51.0b8.tar.bz2";
+ locale = "gl";
+ arch = "linux-x86_64";
+ sha512 = "024747e36d569e323964b9e0c3a3922563c94c5679774a9cfade272d8378dfed987c291bc55554b0e0273938a3cf65f48b5924549f6962dfffb51caeb053b64c";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/gn/firefox-51.0b8.tar.bz2";
+ locale = "gn";
+ arch = "linux-x86_64";
+ sha512 = "e0487d5ac3730b09315f1b5b486fdd8359c78ed7a741ead18ab7d4951f9e079b80c1066a54f2b86988bcc8edab62971f0cc99e7d7cbaa97122d90e4fdc08298f";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/gu-IN/firefox-51.0b8.tar.bz2";
+ locale = "gu-IN";
+ arch = "linux-x86_64";
+ sha512 = "e9ceb5eea20eb9881c87e47700dddca0060628c28f7a8bee4df1be45d7b0f9f7ced122e7bd1b16468853512f759691072a455c13ab98e642c94f2f8794ca6b3c";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/he/firefox-51.0b8.tar.bz2";
+ locale = "he";
+ arch = "linux-x86_64";
+ sha512 = "68ef5903758f59df5e3bad14903734d470ee19cf7e3f34f112ff5be5d11b28e19cbb55331552a7437ba3bfea1d03d527690d0efecf0ca9e824c12fd2c5992269";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/hi-IN/firefox-51.0b8.tar.bz2";
+ locale = "hi-IN";
+ arch = "linux-x86_64";
+ sha512 = "c0bb9bab0b5ff7571af336febf1ecb07427400ef72d6a49fed3958a48fdb63a5cc8174b4365fbbecc11d4f7b646ef32d2204241d2c17290dda4b99bb971a1dc7";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/hr/firefox-51.0b8.tar.bz2";
+ locale = "hr";
+ arch = "linux-x86_64";
+ sha512 = "16e07aaaf4bcbe83dbe40ab688e4f40d02792e3793afa1fdbc90be6d7cce87ca3c8ebce27585eb24e899348f6bfcf3b471c73a0f09d0007c62e224710bbdf538";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/hsb/firefox-51.0b8.tar.bz2";
+ locale = "hsb";
+ arch = "linux-x86_64";
+ sha512 = "6968bcc314f05af065a7a8dff0723579c760d979db7186e0c6dd7a1ddd5c5135673ff940ec471b57f2eee550e5c357342115a2799f1dd48c2120d3404c5e0510";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/hu/firefox-51.0b8.tar.bz2";
+ locale = "hu";
+ arch = "linux-x86_64";
+ sha512 = "498823b2075e70459b71b60560ce7e458a8619e249fce237d91cdfa2a3992e279223586d82af35c2804eddb05544602f06925c8d24c76f9dc8aa37f8c5fa40b6";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/hy-AM/firefox-51.0b8.tar.bz2";
+ locale = "hy-AM";
+ arch = "linux-x86_64";
+ sha512 = "3b86b1efc5b958b999303de303df07967d4a51f5b8853663bf3e07c19762cc273cb26c073d8bfafb873f09399e6299472a210148d6dca2494580f727fcb7ce35";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/id/firefox-51.0b8.tar.bz2";
+ locale = "id";
+ arch = "linux-x86_64";
+ sha512 = "27a7574ff31cb8bafec7d2882b19d944829ff1508810118dc4053c602313c7f5ead2dc6328c14313c8b687fb5bc369be0aa5bef78193251ade7461f178ed466b";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/is/firefox-51.0b8.tar.bz2";
+ locale = "is";
+ arch = "linux-x86_64";
+ sha512 = "d990e47ddbfda4c4a22a1c9f60b0aee13cad35de496c50c13d6f33fb6624e948a0c94a1f883a8f6ab94f0310fd3d3db1554b502c4faed8e05844c06f84d7bc23";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/it/firefox-51.0b8.tar.bz2";
+ locale = "it";
+ arch = "linux-x86_64";
+ sha512 = "faedb800d78be5cda15858df073099767d521bbd71915733cb8558deb2fe3a6e90a203ae946795ce6f55ad7a6d35fa0acd016c3466286548e3d198a499d24bd9";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ja/firefox-51.0b8.tar.bz2";
+ locale = "ja";
+ arch = "linux-x86_64";
+ sha512 = "3063eb49a6076153cabf57d7006c6e41306c652573a4d037ccba721fc4069b9fe7a3ec1f65ac8b8f596a4b7493209b8b46f9338f4eb3141793caaa47dbf7e821";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ka/firefox-51.0b8.tar.bz2";
+ locale = "ka";
+ arch = "linux-x86_64";
+ sha512 = "24defb6af2daaeb42c850d876feff49504e3e93ef2e1a4c3d1b85a8a86c4e8cedbfdb86693bf7bf7e4bd2e096f6ad53ea877b6c1505842b731ff2cfe7a75c134";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/kab/firefox-51.0b8.tar.bz2";
+ locale = "kab";
+ arch = "linux-x86_64";
+ sha512 = "0c41c51f725e02e1fae284723547911cac5958352bf36f2382a8f293001d086e2667722e06fe7aa3ddfcdb24f60e6307b9f050eb15d4d58b7a9e0ef9e7a89b37";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/kk/firefox-51.0b8.tar.bz2";
+ locale = "kk";
+ arch = "linux-x86_64";
+ sha512 = "82cc8c6063359fa1a28d84a56500a0aea2fe7735dc695e0bb5c57445284e0d4a4b0cb76cd78e399023af83fbc00bfd20f0b17098a264aa6a230d925b5453112a";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/km/firefox-51.0b8.tar.bz2";
+ locale = "km";
+ arch = "linux-x86_64";
+ sha512 = "a2a4d80aa6e9096cc8d11c101128e712079f3b6d3da9da3a9268e6e433274ebac4b0adb07da1fc63f57673dacf16ba91efce38bdfa3db9c4b4d1454fa4ecfb63";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/kn/firefox-51.0b8.tar.bz2";
+ locale = "kn";
+ arch = "linux-x86_64";
+ sha512 = "5c202454bc5e221f14aa1ddcb04df9d489e1c036538a747315848b238ab8a8e569fa35b27e906bbbfa00b4502bb0f6a64d317744d5d3e82b430f2c0f28ee3d60";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ko/firefox-51.0b8.tar.bz2";
+ locale = "ko";
+ arch = "linux-x86_64";
+ sha512 = "88f96e25f721e005acd51512e5f5323eadaaeb0fed0bc5c0e919661109e8800c3b940ba131fc788a82a8e6a35be37f9c7111c189b2e9d1ed4ba1a5a3503748ad";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/lij/firefox-51.0b8.tar.bz2";
+ locale = "lij";
+ arch = "linux-x86_64";
+ sha512 = "9b5bd55794df871bb7a622ded9bfe3b85d2edcff1a1a4bf5237f17dba98e3af53f70de48636c0bbcba68c5c19fac08873607094492d03bcfbd7550cbae9e4178";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/lt/firefox-51.0b8.tar.bz2";
+ locale = "lt";
+ arch = "linux-x86_64";
+ sha512 = "be075ac4bda511c2bd81e726003f4ee680f35022e84365fccae090305c45dcc586162428dad944bd59b7e3c1f836e8b07a2a78e5a28d0eabb6aa44877398650c";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/lv/firefox-51.0b8.tar.bz2";
+ locale = "lv";
+ arch = "linux-x86_64";
+ sha512 = "0bd623b3203c1403ca187a3b25abe0e438ddda0c6f5d4f947c0643ae3f492c649cf830002f7211853050b15e179a482677898ef0d93d32c5afe34ad6e7040cff";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/mai/firefox-51.0b8.tar.bz2";
+ locale = "mai";
+ arch = "linux-x86_64";
+ sha512 = "b406ea5ddf4169961cb11104186a809ca7c8a69b124e85e796703326a37ee18473e4f0b430d5da2dfbbc38f7ec370951a5dd0c73be4f9bf48da771bb603bf38d";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/mk/firefox-51.0b8.tar.bz2";
+ locale = "mk";
+ arch = "linux-x86_64";
+ sha512 = "ae182c6ffd7fcb3acd396e8d9f4b2baa65942d78498acf7a0f3efff69cce62812c2e60c937611c29116a45c5799625891f39e25ff499b7d3e4f453f790d8e8ce";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ml/firefox-51.0b8.tar.bz2";
+ locale = "ml";
+ arch = "linux-x86_64";
+ sha512 = "9dfe1593bdbedb6262e7cf50857036a624a3ae13bfcc853dd91fd800d74f831665d8c89832b5727a9bd2bae3b4123104dbaaae1bdd39918f2c06be2fdf0a5c0e";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/mr/firefox-51.0b8.tar.bz2";
+ locale = "mr";
+ arch = "linux-x86_64";
+ sha512 = "2744d4fb88f2713b956efdb6d56fa1ef7e003013cb9a526ab2f9e8cfeb915fa3651978a3d863cc3c4dd62a447bb8cdde402483701b38cb206b99eff5fe5272c8";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ms/firefox-51.0b8.tar.bz2";
+ locale = "ms";
+ arch = "linux-x86_64";
+ sha512 = "4a313418db320dff4f91f817cba054fb65b5e97a434a6150d4f3373bb788b18bc02b194fc8349e5f41e1b8ebee94f0874431759fe79ed32fe7f5645f25c4e297";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/nb-NO/firefox-51.0b8.tar.bz2";
+ locale = "nb-NO";
+ arch = "linux-x86_64";
+ sha512 = "41085294ea372990b058e61942de5f2c972511bb22a1719e92275e4258d6c0c0a71ada6ab21475c1b32021fddf5b149f1dccb469a948050d901b2ddfb91886f2";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/nl/firefox-51.0b8.tar.bz2";
+ locale = "nl";
+ arch = "linux-x86_64";
+ sha512 = "45ed2265c4d6a66142bfe117794bd950e56821d377a5437c9d0cb8405e7605de617cad3e92ec6aa71129117690591fc95ba5c4d9e662fafa408c3e018845e40e";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/nn-NO/firefox-51.0b8.tar.bz2";
+ locale = "nn-NO";
+ arch = "linux-x86_64";
+ sha512 = "1c981c33bea1ecea733db9c278d92ef42809a4dcc0ce8f9064e08b303a56970099b4f3591103fe262a777c4ded9948d9cedcca6d2046512851544c8da774a250";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/or/firefox-51.0b8.tar.bz2";
+ locale = "or";
+ arch = "linux-x86_64";
+ sha512 = "3c67ad9f3ae800cd2e0665f35cbe92f17337c5f2568b057b9c9baa7aa8c91ba4f5b1e7718f288a2cc982ecfa43241e992e35c798e833fa56c636f8c7296d5a55";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/pa-IN/firefox-51.0b8.tar.bz2";
+ locale = "pa-IN";
+ arch = "linux-x86_64";
+ sha512 = "9778843430f504faae4f8e138490a92c14f5f0f1c47c642f7f1f81c90a37c4cdf0660ad5b134429d6a86f61bbbed0f285a41ba315b9c318799a90f3208cc4a3e";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/pl/firefox-51.0b8.tar.bz2";
+ locale = "pl";
+ arch = "linux-x86_64";
+ sha512 = "336a3afddebd687f62753f0bfd6b7e57884cbcb4c536de2d2a85e9ab22a696bda55795d5511ce299d34eac20abe91032450ddac97fd2be9c4b8db6b4b0fe6c6e";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/pt-BR/firefox-51.0b8.tar.bz2";
+ locale = "pt-BR";
+ arch = "linux-x86_64";
+ sha512 = "1908080393d171ea86a05277a4a0d67c0c054fdbc60c5a9ba76fdc92071e45ffa57750bca8b1f56c65a4a45d296399c1cf3e9c0db8593ae57e7b8b53a6969171";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/pt-PT/firefox-51.0b8.tar.bz2";
+ locale = "pt-PT";
+ arch = "linux-x86_64";
+ sha512 = "eaec79b2cf363f613cefb2cbbeb3a5b607ab608d7e82ac21aaf4b591475a85374f49f34c912b569ae3fb8224f19b93d753298ef8f6db820fdb84a70b306b16d2";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/rm/firefox-51.0b8.tar.bz2";
+ locale = "rm";
+ arch = "linux-x86_64";
+ sha512 = "f6fa58d42c155552546b7500d6a0081b3c02c3cd300c0744e4a964b97970f1a87e9754e126de346880447b6af9853a91f157ef5285a2db1a8fd677c46cd0f347";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ro/firefox-51.0b8.tar.bz2";
+ locale = "ro";
+ arch = "linux-x86_64";
+ sha512 = "876be7fb744a6887890671e00d84387c71e5c77ece611646e721eda3659654760094e39544a2bd3b6e80b075e7d24acfe1d7e86dcb4003efd867b2e7b81e3366";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ru/firefox-51.0b8.tar.bz2";
+ locale = "ru";
+ arch = "linux-x86_64";
+ sha512 = "52f58ee2af336e18640b1edeb54f2c632104a1cd40952509b512af5dc838deda531e850e0b56d605bfad046af34db1158dbd69bb25380b80a178f32083d148dd";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/si/firefox-51.0b8.tar.bz2";
+ locale = "si";
+ arch = "linux-x86_64";
+ sha512 = "0b36230b9d214793cbd75f282f537e73e28ed37efc9f17e4aa0f5dbb3bdaee5b5569708d99f4cff772767e074a2b85a7079e48acf7aa31e955e6ae6658a779d6";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/sk/firefox-51.0b8.tar.bz2";
+ locale = "sk";
+ arch = "linux-x86_64";
+ sha512 = "6595aa0a2601005b0488e8ad02f0f5a8b96c4419beaf9a88660e111bb6e932cc98dfa16e511e0af2622360635e2139a8007bea5fd61708f4558576ad54da17dc";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/sl/firefox-51.0b8.tar.bz2";
+ locale = "sl";
+ arch = "linux-x86_64";
+ sha512 = "56fd9bb355c5dfc680a7a91a1686285a32e147b1b0a72787106fca5244277238948ce9635f97b7c3ccd59d7999c794d4224bf4172384bcf2a02e0aa9d4716633";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/son/firefox-51.0b8.tar.bz2";
+ locale = "son";
+ arch = "linux-x86_64";
+ sha512 = "6475248c31a1d5199d6a4dcba9c98eb3a0c4bdd57ef37c5fb611ec68807658ff9de9056c0a5ad9e016e55d8ccc3ba7987948b2b2f47d6c3061e3f4d13051cf27";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/sq/firefox-51.0b8.tar.bz2";
+ locale = "sq";
+ arch = "linux-x86_64";
+ sha512 = "41b602396bf33e36974c97ec25f120ee7452df5d26caed74a10835f0fa7a9302aa87d0fe09fafc2e6670d8ce859a8757a7e7c70657b29a7154b1501e478510a5";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/sr/firefox-51.0b8.tar.bz2";
+ locale = "sr";
+ arch = "linux-x86_64";
+ sha512 = "dbc7df70483246003f27acd833c881b3ae6ddaa9e93c7e612334923e63a1a4bcf35c082d355d67425fcb72123039ee4b33a5ce5f75909ea6cc3990d76dc21c41";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/sv-SE/firefox-51.0b8.tar.bz2";
+ locale = "sv-SE";
+ arch = "linux-x86_64";
+ sha512 = "082f21155e8c68f8e1f786a3bfc3f832637813bda06881f1b6ebe8a1be85bfeff03100d4a9f311ea8bd6ec802e55bbb674eddcd9551db6a26ae32a6a97535bd4";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ta/firefox-51.0b8.tar.bz2";
+ locale = "ta";
+ arch = "linux-x86_64";
+ sha512 = "51bf00c2014222e0d1b30d83a483882930d87d5f281d6b33712616769060dd4b1c5ffa92d30e0e61effe2392490dee43e1d49cd6e28c28bd3b94ef005b87846d";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/te/firefox-51.0b8.tar.bz2";
+ locale = "te";
+ arch = "linux-x86_64";
+ sha512 = "83a879a6d9b96963e3370068961559cd530695cfd7db200fb8bff7d79ed01de0357e211454f9735b667a1c65ad7338da913646709d9c212704f2dad0486b3d24";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/th/firefox-51.0b8.tar.bz2";
+ locale = "th";
+ arch = "linux-x86_64";
+ sha512 = "d49d76980c091d354638a2c887cef68e762ddcf9d2a7c1ef74d1d735791949928a6fafa270711a0f776e51410b35c9b396015288ceb5992969af88dd3dea990b";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/tr/firefox-51.0b8.tar.bz2";
+ locale = "tr";
+ arch = "linux-x86_64";
+ sha512 = "642a6be0577f16c0c4ede21a82cf6c3866011c3b663f7ce7c15961eec7f01133fca8bebd46dc2cb9b91116ab7cb1060f04e9b4e208eaf6a1ddb3e64219a2d5c0";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/uk/firefox-51.0b8.tar.bz2";
+ locale = "uk";
+ arch = "linux-x86_64";
+ sha512 = "bd72d88ff7f82b195f6ce44ab8d9b7541e0564ae7b6cc6bb9676a38a9bb2a2e23561f07006749de5598da1c6aadc1e90d0ad2a5eb1be0f998b4d36534a075afb";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/uz/firefox-51.0b8.tar.bz2";
+ locale = "uz";
+ arch = "linux-x86_64";
+ sha512 = "242b5367c7e78f0c753ebf4f8a4b1d1fd42e236f7417a3dc441a9e72c071fbb9488b226214cc14991f5d12c514e53b35de3c903ddbe5fd4aad31e53f1a6516cb";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/vi/firefox-51.0b8.tar.bz2";
+ locale = "vi";
+ arch = "linux-x86_64";
+ sha512 = "d2cf85b0592b3116de4848665c5726f40d3ee2e7b92c808a7a41f0760041fb5aee1d61b626d9fc427a8b0bbf697828ed86741a1d319e27694b51dde630afff8d";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/xh/firefox-51.0b8.tar.bz2";
+ locale = "xh";
+ arch = "linux-x86_64";
+ sha512 = "c865f0b18d427aa364f512b0e5cf02c126f156bffc4db2ab50f32fe9d28a949644fc672fae9a651a28ce6119191b6b0cbf7dfef3e102266b790fd0290d3ecdcf";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/zh-CN/firefox-51.0b8.tar.bz2";
+ locale = "zh-CN";
+ arch = "linux-x86_64";
+ sha512 = "20fb7a5ed74e3badb56038ef16064b1fb92c6bf274341db0aed52427e313558846f34372cd019730ba0593439e6fb127241ec02906a76b5a7139c7ac45960783";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/zh-TW/firefox-51.0b8.tar.bz2";
+ locale = "zh-TW";
+ arch = "linux-x86_64";
+ sha512 = "955bc613dfe9a968bd298b6cf038bf7db615ce456de31da656fb54c7f3e8126391154b49b1948a95871ddec04d03a51b543b9248498b661a998d40249f6e8bd0";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ach/firefox-51.0b8.tar.bz2";
+ locale = "ach";
+ arch = "linux-i686";
+ sha512 = "cbceeff2ef8fa20f18ae5106a6cec638bb064c7b32fdd9bca83776bd58f3a579babd2a6e933e0cee9d0ff2e553358e136ea478b629317a1892f62c4c52f47e22";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/af/firefox-51.0b8.tar.bz2";
+ locale = "af";
+ arch = "linux-i686";
+ sha512 = "76c6eff9a98743a64d387f3a58830b7583510444fff7bcec5daac6fbe56f068925491fb2c8114302f862ddee3d4bce7df4a1dfd1057a918f584de4774da7ebc5";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/an/firefox-51.0b8.tar.bz2";
+ locale = "an";
+ arch = "linux-i686";
+ sha512 = "6152904cf2cb33e6fe63b3c573bfabed1915b538d028be9fcf7ad3c169c98899becee772bb803a2b6830457a0d93bbacd49e8c0b962fd1898e8225463387e092";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ar/firefox-51.0b8.tar.bz2";
+ locale = "ar";
+ arch = "linux-i686";
+ sha512 = "a83ab8633fa7658669daf271db339ed5812d0a85a9eaf313165671f11ae6d50ac92cdd8414945dc6b374a8a46b68df241812e8c8396e9256521ab81949969b6a";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/as/firefox-51.0b8.tar.bz2";
+ locale = "as";
+ arch = "linux-i686";
+ sha512 = "2a76a7eb0b3015eced2a4a83965d314753e44232bc333cccdacc8a0c207b5113aeb7b97fa972dfdaf6e79eda03d8e18f4d8daa6ae3f8059d75e1245ff5618173";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ast/firefox-51.0b8.tar.bz2";
+ locale = "ast";
+ arch = "linux-i686";
+ sha512 = "91d8801a2fffaadee3635643a813d588650b318d9e074ce3284f97795408a9d513ccdc573fb083e523959470095ffabb8023f250e7b3abf7f94853f126ff42d7";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/az/firefox-51.0b8.tar.bz2";
+ locale = "az";
+ arch = "linux-i686";
+ sha512 = "abdaf4dcaf3ed2813b389fb91adee89f796d30152374110bab10b6aa1b328a406cf9e572b2d41b5ad9827928f8d5249c9d6abaea5b0698ff2840f66ffb71b656";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/bg/firefox-51.0b8.tar.bz2";
+ locale = "bg";
+ arch = "linux-i686";
+ sha512 = "65a76933c06f7d8bb71ab24e28f6e755090f8eef8cb7ac741d37c8532d20aa35eb119dcc0f7e28a97dec34a3720b79f869f8adda079b49dd270227bdc081d1ae";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/bn-BD/firefox-51.0b8.tar.bz2";
+ locale = "bn-BD";
+ arch = "linux-i686";
+ sha512 = "e6cb0cf7469a125da031b2e9bb4d2dfa90df169e6a61f03d482e44e9beb19744a038eb1922ac31812732d0e72419211894bd5029e16091741aaf45c00e72c14b";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/bn-IN/firefox-51.0b8.tar.bz2";
+ locale = "bn-IN";
+ arch = "linux-i686";
+ sha512 = "4018dd322a92660780cd4e9ef9c8631593c34717d2d1ccee1a340e34c8465ea7a5fb196f39292c3f502f7458bd4790971a443cd9c16f28e1112417c8eed35bed";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/br/firefox-51.0b8.tar.bz2";
+ locale = "br";
+ arch = "linux-i686";
+ sha512 = "31f75272fa7a747031697505505f8362589f46986f840fc8325fb95c0009356d4fbeccd33e20e923c49df91d7af40c948ebdbf35e6d2d48b734055e33b1a19de";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/bs/firefox-51.0b8.tar.bz2";
+ locale = "bs";
+ arch = "linux-i686";
+ sha512 = "888c6b2e2d79071710d580da39e33dbfa4392b9995bdfbe16a7c4377f54e7b9c81cdd4864fdd05d2f376e1d6650dcfb5dc94fe67e3bbbca55471ce2f62cc4589";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ca/firefox-51.0b8.tar.bz2";
+ locale = "ca";
+ arch = "linux-i686";
+ sha512 = "87971a8c4bcf96a67fc370778274e2c35356b6239db4104740c16b281a45d45b03e4c8627c14f1c6f3ac5702784134c743f07998f3db2b2a8d4a2e6cf9c0b97b";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/cak/firefox-51.0b8.tar.bz2";
+ locale = "cak";
+ arch = "linux-i686";
+ sha512 = "047e10a19ac8fae5474820ae26429711efff76e84d9f58b0f4b8a36d7f5c45fad6c46402448c454c32b3466de3618e2b2a392bd186361466f7e87717fcda4108";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/cs/firefox-51.0b8.tar.bz2";
+ locale = "cs";
+ arch = "linux-i686";
+ sha512 = "7d7b4583e3c6c4e906cde2cea8cb7bda2ce4cd007640b3e681608651e6f414675b7039c1ff13678947d617607cef407382feefd44ec1fe1534b9abb0b1dd0d7e";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/cy/firefox-51.0b8.tar.bz2";
+ locale = "cy";
+ arch = "linux-i686";
+ sha512 = "768429d9772d8e39d4230fac01c4bc6fbe20c7c2efd326e78cdcdf74382e3a38bee9bda90a1d97b61035cb35b5be8f337fd80d15d4f185a6a668f68afd3b67af";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/da/firefox-51.0b8.tar.bz2";
+ locale = "da";
+ arch = "linux-i686";
+ sha512 = "a6e435be5ac73d683ade3dc29bd6d5e0c4ebea30f8521036650981b510d4df014891f8eb65a5a6a39855fcf5e45d1b393617d7c16071812952c635725bf206ee";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/de/firefox-51.0b8.tar.bz2";
+ locale = "de";
+ arch = "linux-i686";
+ sha512 = "7ea17df3c926546f1eb7ec0880f7b0b63cc8201044b444280b31d2646999ad36ac10ce74e19794ba7c1a026f860c79e83ce6ead339865fe31a021bccd85f04b9";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/dsb/firefox-51.0b8.tar.bz2";
+ locale = "dsb";
+ arch = "linux-i686";
+ sha512 = "0e75929ba5879fbbc269d1fe8e18627ba54c5f74edd3179360998c9aefbf21d1f3c3cb0860990e7b1b0a5f5037ce9a4779c3edb64912f4f13c80501e579cfa3b";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/el/firefox-51.0b8.tar.bz2";
+ locale = "el";
+ arch = "linux-i686";
+ sha512 = "b682e47f225a270ab421b3642f7c28085d9f2f1de1e68867ba09e69fed3d9b5908909be46bfaac6e9d0d1243eaad3cfe2bbeeeae6a5b9696b0ffb901a98db50b";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/en-GB/firefox-51.0b8.tar.bz2";
+ locale = "en-GB";
+ arch = "linux-i686";
+ sha512 = "aeac6a542c1a4f91ee6bf01d4c916f8da4628b36550d80a166dc46c5c9b1a010b5201c87613e4d59640bdf9d2f9d029d0112bf8b62c7707e99b928c4ec18babe";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/en-US/firefox-51.0b8.tar.bz2";
+ locale = "en-US";
+ arch = "linux-i686";
+ sha512 = "1315208cd55f48ee05fcfc98c92891307442dc0bb34bb636e14a88701a1fef2229a62a0e8eb00e8028f460518c95c1369a198666cf67c4b09a0e69c2b76c75b9";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/en-ZA/firefox-51.0b8.tar.bz2";
+ locale = "en-ZA";
+ arch = "linux-i686";
+ sha512 = "891b4a076239132976a4cc51a3a374fe244b6a9119f76303253d6ec9d62b8230ac9c04b657bc741b13ca291a9b75a7b38a4aa25471e4faa6f34f06000a7f2fb8";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/eo/firefox-51.0b8.tar.bz2";
+ locale = "eo";
+ arch = "linux-i686";
+ sha512 = "f805e9bb3d2241a366026354433670c2792c16c74ab2f5d3691081f682639b23c4e6d1e91e5e81719601c571e74270d8b5bc4f24e7babfc77ee435c6a2125ba2";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/es-AR/firefox-51.0b8.tar.bz2";
+ locale = "es-AR";
+ arch = "linux-i686";
+ sha512 = "df78b4626f41afaba10331cc8921dc8f196aa2c8669366ae286a75e8850a647e7288964a8a323c742926d7661aa122072dcad592654dead9f57b8c008b61f7e6";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/es-CL/firefox-51.0b8.tar.bz2";
+ locale = "es-CL";
+ arch = "linux-i686";
+ sha512 = "71a340f8b004f3907eb763bcd817338be19955ef447241a6a680381823591324df9b9771425255693b49513a8f4475fa1ed8558e5a510bcd370bd225469a5f69";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/es-ES/firefox-51.0b8.tar.bz2";
+ locale = "es-ES";
+ arch = "linux-i686";
+ sha512 = "a34dc5ceef8875bd5d15c61ed9ada2f62b52cbe42636675cfb6a3df694a0fcbbb3b0dd61c3a0ed5b18e7ec427dfbf58887b91a0ada596dca04b3d2cd066123a9";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/es-MX/firefox-51.0b8.tar.bz2";
+ locale = "es-MX";
+ arch = "linux-i686";
+ sha512 = "a178599eb6454eb9a463fea5704b49c720cd2f9df033bd6f271322c75a5f2f52e82661c82f9ff9097af28ba617e2393979b28209758df3710ecdf72d0304c5f9";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/et/firefox-51.0b8.tar.bz2";
+ locale = "et";
+ arch = "linux-i686";
+ sha512 = "20e3af6d1f7fb7f154e366ee5e031889f3f24e04691a3d2915f4405f33e7220dae91e6e635ae98451048c254b7a08900851f013e7979c013f84b643635ecfebd";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/eu/firefox-51.0b8.tar.bz2";
+ locale = "eu";
+ arch = "linux-i686";
+ sha512 = "d13833a0eeb5b4c37baf6d1f85adcb3502b67219aef6ac5b5d25914fae90cf78284830acba0e8d6c76d8ceef7fbe3332d673be125325b9bf53f24d4b070e6998";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/fa/firefox-51.0b8.tar.bz2";
+ locale = "fa";
+ arch = "linux-i686";
+ sha512 = "fc4a1d2c1e635de2094a8fdf3b082c0407bb937f089ae33c0f429e0c0bb41a7c0cc3158fdd1d01e81cbd01213b452301e2ba83a9dce1810c8d7c8adb035ba903";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ff/firefox-51.0b8.tar.bz2";
+ locale = "ff";
+ arch = "linux-i686";
+ sha512 = "1e4626d053e7abf236fc795f59e7dfd8053048fa1d0d8f4585efe7ea872a99511f9053e9bd6a1ae1af22cb3ff399d16d33c1b45a7b3c6557bda49062d1c672cf";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/fi/firefox-51.0b8.tar.bz2";
+ locale = "fi";
+ arch = "linux-i686";
+ sha512 = "dd8ea8dea6f76f3c5dee63abdc187f69e949e0b6b11126d4219b38d1314ba6ac77cc789e0923fe9efb26167200187cb236a783f7aadde64f20798d44839236ef";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/fr/firefox-51.0b8.tar.bz2";
+ locale = "fr";
+ arch = "linux-i686";
+ sha512 = "9124a3c541879fa6f886555c93b1e07f431eef0d0b864cf414d2bf5d3cd749e30c65db4fb85a16072260f656598066cb8957d667aebf07f9067646e11fa09ad1";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/fy-NL/firefox-51.0b8.tar.bz2";
+ locale = "fy-NL";
+ arch = "linux-i686";
+ sha512 = "2ff6aed7c4b172b5dd801d180a7b7e945a4f39b8b8001e673bfb16b868a2079a2c741ea1a0b44c6588468546e883c6057fc4787eac64ca9b10860b7d538fd72f";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ga-IE/firefox-51.0b8.tar.bz2";
+ locale = "ga-IE";
+ arch = "linux-i686";
+ sha512 = "163994a889e92bc84999e0c827f7ed0d162b43b1046a0391a851bd826730ce1199fa54a0e5dd549b3f30e197a8535ac5b4e1cb99f7f7a8706f7ecdd5bc125cff";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/gd/firefox-51.0b8.tar.bz2";
+ locale = "gd";
+ arch = "linux-i686";
+ sha512 = "324c856b4f0505bf5481ee57a2549594739dcec8b2a57ff32156c724adc001dfaaa2202b0b66a30565061f4ad8719bebb382ac5961c960f4991e9ab6488f2195";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/gl/firefox-51.0b8.tar.bz2";
+ locale = "gl";
+ arch = "linux-i686";
+ sha512 = "1b055c927c318d09ade13b64e50cb6ed03e10676535c9171ff3867200e8c79bd175b08b89377a4ef86f92f91977cd8a6cbeb48ac8beaf6576707d14743299227";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/gn/firefox-51.0b8.tar.bz2";
+ locale = "gn";
+ arch = "linux-i686";
+ sha512 = "7ef12effe16f92e87d98c71cde4f3f7303674b124a41d174e57a9a4bbca0c6cd33cf8f39bbf72fc693355b5a054fc8c6ef15228751eef52a1599b280c9a17801";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/gu-IN/firefox-51.0b8.tar.bz2";
+ locale = "gu-IN";
+ arch = "linux-i686";
+ sha512 = "6437e9fc0e171f48c335fc7c6b7ba327dd9419dcd293449ecabef1a6a6546dc70c38099abdd42e5f087290a256362170fec02ca53ee33e8883f4c654c9382e29";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/he/firefox-51.0b8.tar.bz2";
+ locale = "he";
+ arch = "linux-i686";
+ sha512 = "ed8e6b961458652c273e443a29f4640b230044ca03d6da22a374704c800bbf8df4f7e984e9d3ec936153263cf29ee066c4fb6578ffdecf9955b7f65f10c26828";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/hi-IN/firefox-51.0b8.tar.bz2";
+ locale = "hi-IN";
+ arch = "linux-i686";
+ sha512 = "091595a3b68c6951357f1a8e417a8ebed56c41fc1548c8aabe846980c4e3a769795fc0fc7e4cb1af47be2f4bf77b691269018d8ac2052f5acc5111b752fbafb0";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/hr/firefox-51.0b8.tar.bz2";
+ locale = "hr";
+ arch = "linux-i686";
+ sha512 = "4dd4646bedeffd0219e1577e61f4e17f5c2b67b78cd8f8001d033dd7d4f906d0ac8d3e6d5500fa8a4aa049be0f7aeed967909d6cfa13b97fd1b9f93ac7d7b687";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/hsb/firefox-51.0b8.tar.bz2";
+ locale = "hsb";
+ arch = "linux-i686";
+ sha512 = "8cc10487146e89e1728529271b6a9e3e6ce6260d495ad0a013c5489da06425ff9adb88bb521ce8bb90c0ac5e21ba126147d23cefe716b2708bf084d39d70c800";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/hu/firefox-51.0b8.tar.bz2";
+ locale = "hu";
+ arch = "linux-i686";
+ sha512 = "5c15c474ce885c88d863f1f22e73d300e0defeaf61009b939ea6c2e62f16a6fb3693a3dafdf264e83c618263153d3dd81bfcacbe5c9f701a28530d17b38d8189";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/hy-AM/firefox-51.0b8.tar.bz2";
+ locale = "hy-AM";
+ arch = "linux-i686";
+ sha512 = "fdd30dbeeb08a07822de29eb0e6ccb9df895675546054c75b4bfb0cf1f427488cfad9e2a1f541894cf366ddd1bb03e8eb4a75c318a1f80b2cc967a5b4ded8b39";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/id/firefox-51.0b8.tar.bz2";
+ locale = "id";
+ arch = "linux-i686";
+ sha512 = "54734428db8860a7ae9c1543c341a5dd53f6e966f290a176e69f4fa66c2a4bcdd25075c5ec5f311adc033abb85e525b2b7426e113743632ebed07abaf31dba4c";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/is/firefox-51.0b8.tar.bz2";
+ locale = "is";
+ arch = "linux-i686";
+ sha512 = "6ee38f9506403f3cb57c6b7f971c599ea1a2e77cbd5424bae209390a20b322f0b527ea4a0be93bac8976cadb5080d22e262d6797b4e9257aec232e768909c235";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/it/firefox-51.0b8.tar.bz2";
+ locale = "it";
+ arch = "linux-i686";
+ sha512 = "71a1d593554466db36e09aed429d07ac9ed563af33959c899319e96e7d757e8dfe912a8d18b52cc198a0c4a1c45226406bb56996bc199b67f79c6a3aaea7f6b9";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ja/firefox-51.0b8.tar.bz2";
+ locale = "ja";
+ arch = "linux-i686";
+ sha512 = "7d38e749f69ee99bcb546291b09a0a2b51b969bd4fcea50dc4f386cb951ab8a025c2ae8746c9e1d6398024d7904b63497421fc16f4f061babd0efafd17ea52af";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ka/firefox-51.0b8.tar.bz2";
+ locale = "ka";
+ arch = "linux-i686";
+ sha512 = "813069de2be9e1b299bbead6e2078d86d3a382bf6d502c5f96a9c10c9571f4dc79127b450760d994e8fe41b3afd966fc70cea60e798432c7b8aa900d3d715bb6";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/kab/firefox-51.0b8.tar.bz2";
+ locale = "kab";
+ arch = "linux-i686";
+ sha512 = "e1c562cf189a60b15c94fdd681007b4a64fe3e275900c3c78d492854fa28eb61ff30ab65ce7d3537170f28d51ad543e1b306b94d1ef6280b0b03b466fae9edf3";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/kk/firefox-51.0b8.tar.bz2";
+ locale = "kk";
+ arch = "linux-i686";
+ sha512 = "be54a4085ecccf9d2dbb8894872d73d3d261a8a75c755fbb91ac4c1d8bd3ab696b95a25c87f0d509ab250b53470b20aad3255d128296928c591d45b2786c1cf3";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/km/firefox-51.0b8.tar.bz2";
+ locale = "km";
+ arch = "linux-i686";
+ sha512 = "6369eb361d1ee31d33b9780072c1c49926fc4314168e5883ca71cf864765d7758d51db55f5ccda231e24ed4b65d2665b5fde7a3fcb1524a04e7057490e8b2308";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/kn/firefox-51.0b8.tar.bz2";
+ locale = "kn";
+ arch = "linux-i686";
+ sha512 = "671165858cedd7f4ba9173cabe9532f08de780c967f6af085e73e3ac97f156b39000b3b672bb690cc40691d3b9b6b9d20c08883a1f2a1da689a71093096642a1";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ko/firefox-51.0b8.tar.bz2";
+ locale = "ko";
+ arch = "linux-i686";
+ sha512 = "04cd3b277dc483cddcf6fbb79687b3ec170d33b0eee46717d645358df0f224c86f36723442e4d28e4460e663b3357f3d3c7a7aa1ec594013a8d91d030e08313a";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/lij/firefox-51.0b8.tar.bz2";
+ locale = "lij";
+ arch = "linux-i686";
+ sha512 = "e62b1481001d5d63b65e07b527dbfc29b435f659db7237b411105711a601d9117d62f71dd93849b5ebb8dd0dd4e5981ffe9f318aff2e74485580471f672d5b6c";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/lt/firefox-51.0b8.tar.bz2";
+ locale = "lt";
+ arch = "linux-i686";
+ sha512 = "f7cb9819f955f7b32439a7ffaf0cb57351bc25be579646d00f945f04152f64c9174bb49c99ec49b2d5c053634c73872a5b4a9615fd66744d0b5c650c9bbc67d9";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/lv/firefox-51.0b8.tar.bz2";
+ locale = "lv";
+ arch = "linux-i686";
+ sha512 = "e7cfab908f9ea12c77ff0a76d2283e205c9b3751eb16a5dc06171e2cc3315193c6010faca943341e1a6496b48b3d90520308c53d85677cc18014fb8560f7714a";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/mai/firefox-51.0b8.tar.bz2";
+ locale = "mai";
+ arch = "linux-i686";
+ sha512 = "6088910c06e1310097d09c6bd582e20928de56fddec03d7338faa9b9651900919315c15cffc601a0e4878ef7c8821d40d5e4d7e6998786b1cd50f21ca0e2dfc6";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/mk/firefox-51.0b8.tar.bz2";
+ locale = "mk";
+ arch = "linux-i686";
+ sha512 = "d4ab8618c7945843cd0c9234ffa68dc61adfc3759a99bd174f66456038614497e3b389b0af452b3958c12e9b2755ddbed33e098c9e4c07110daf0bc5c4b874cb";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ml/firefox-51.0b8.tar.bz2";
+ locale = "ml";
+ arch = "linux-i686";
+ sha512 = "05d3de5e0565316ccad5ad407299f6c31071d48edf1ec44492e61b8764040f22a6b23230b74f256554f313575084c9d79504d3ef85451c9f73c12edd663c57a4";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/mr/firefox-51.0b8.tar.bz2";
+ locale = "mr";
+ arch = "linux-i686";
+ sha512 = "1ba2e3529f379c8e77941ce42a0100cef1f2daab31d8b1a0b23bed898ce0bdc4cb3a873aae71c1c3f5789f35edf7ffd88e11902154a3aa4f3117ba1ba782b0c6";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ms/firefox-51.0b8.tar.bz2";
+ locale = "ms";
+ arch = "linux-i686";
+ sha512 = "7fe116ab0d79e7de3faeeebcdaedebbfba94ce6320b563ad79de7f3d5459cc113a1f10b6b2fb3c3b074d4a027f0cff9106e078c2945a62e5f3b828459c1e8d83";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/nb-NO/firefox-51.0b8.tar.bz2";
+ locale = "nb-NO";
+ arch = "linux-i686";
+ sha512 = "9625821a4ce710ba5f1b5f7416086d4e33c67037e40dc0ad9a5d57049b4fd5bef9fd1b1c4c02cf6910465c641242a5ab9e596c962f5f4ace66b07cf4f0f85405";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/nl/firefox-51.0b8.tar.bz2";
+ locale = "nl";
+ arch = "linux-i686";
+ sha512 = "5ff420c38ec644f622aed733c599a505498bde48f2a573492d647745d7f7c5cee44b009eaccb8de458af813260bd19f9baa7f9f1e2dd946cde48f09510a885cf";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/nn-NO/firefox-51.0b8.tar.bz2";
+ locale = "nn-NO";
+ arch = "linux-i686";
+ sha512 = "12ccce434da504753b38449959c97952767fa5af7aa2b0f58777f8775e4dac94d55d67e8d575f68e55e084bc65cdae101ad92b4654bcf345782bbe914d01f655";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/or/firefox-51.0b8.tar.bz2";
+ locale = "or";
+ arch = "linux-i686";
+ sha512 = "3b456b222d39b5a69761da7cd33504fc64ee76d5d8e6e4ca26be158f562bad27a3322604a6542195aed1181f578a650b05200b1ba75d5d8a05e400014bf25660";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/pa-IN/firefox-51.0b8.tar.bz2";
+ locale = "pa-IN";
+ arch = "linux-i686";
+ sha512 = "3472c5eb75dd40b68995bfed8542546a9f35e04ca8a7fe17465a99a94846ea696d1cfedcca2d59a47082de6d2261f1701950be3295f063e69846cc90d531f5e0";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/pl/firefox-51.0b8.tar.bz2";
+ locale = "pl";
+ arch = "linux-i686";
+ sha512 = "0a883e16dc997c748a6d76e32455473ffea6612dcb88446f331e43f9d247f01ae93e49827b1e222a2990e54e201c58aed2150e800080fa47b222daaa69154bd9";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/pt-BR/firefox-51.0b8.tar.bz2";
+ locale = "pt-BR";
+ arch = "linux-i686";
+ sha512 = "34e6870557e30a75838bcac1e268796f670b8f5dc4e49cdbcc6e34cab5f8c3e4996cc73149d13a5178ebadd1f052ac5c2eaecbaaf0d3f4245080e71f8b86c856";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/pt-PT/firefox-51.0b8.tar.bz2";
+ locale = "pt-PT";
+ arch = "linux-i686";
+ sha512 = "932291baa2091d12d9832483d14a6e05568fa8d1d1c41f42d066c5efc13d7e511afcb953945334b9e7a573776bd2263c9e38a64f73cb44f4f8a32509e5fe5119";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/rm/firefox-51.0b8.tar.bz2";
+ locale = "rm";
+ arch = "linux-i686";
+ sha512 = "7258b1c4a865d593e820220f5b48bfd1a8b9c4a7bdeac9b15208f5060ca501e03b72914b2b53b65164d2db606b092252f0abd6fd83f781ef0f330d4bb487dbb5";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ro/firefox-51.0b8.tar.bz2";
+ locale = "ro";
+ arch = "linux-i686";
+ sha512 = "5fedc4a3dee59bcd804eee04ba07ee4b862e6ea8198d1a5c3383cf36667e2f15ef728f21138868b84c15f59c7b11760fb5fe293e8545840d1e5c98945f404eb7";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ru/firefox-51.0b8.tar.bz2";
+ locale = "ru";
+ arch = "linux-i686";
+ sha512 = "8e6a4f786d5db808ac5c63d4abbe4a53b941845a48fe2fb8dfbefb46e01e1053d591aa8bda63ee83785ef3cdc481593c86c804e4683455a2e27fe594b96a650b";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/si/firefox-51.0b8.tar.bz2";
+ locale = "si";
+ arch = "linux-i686";
+ sha512 = "39c0c3487242a54287af42c9457ebe8882112954dec168630b8914896e3900e9799691bb88147927328c4c5f4b2078bf68e623e09ca2f62a4b7efb4e625bb283";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/sk/firefox-51.0b8.tar.bz2";
+ locale = "sk";
+ arch = "linux-i686";
+ sha512 = "e87215632b5f0264a04fefd631def717c3f6bdfe31817dbe855d7c6195b4f340af043bf613fa9f89ca4af4893cc6effb876eb51555a089880970315f7ad15e2f";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/sl/firefox-51.0b8.tar.bz2";
+ locale = "sl";
+ arch = "linux-i686";
+ sha512 = "7cb036e5926b2ce9a03b27f37359b640f824f32a918ad8e9959683114755949ad7d2069f02e0206c2d67633ec9763ea612ec3e3e44dc5e881d4e275d1767cf30";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/son/firefox-51.0b8.tar.bz2";
+ locale = "son";
+ arch = "linux-i686";
+ sha512 = "e74ea45d6b5dab67229472ab524abc805c5e1c91b7ba627d95f0fb5eb1310aacfcd73a4a5fbfe8d7d5546aba9d254297494b34efe81aecc7e261cce23b9e0de1";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/sq/firefox-51.0b8.tar.bz2";
+ locale = "sq";
+ arch = "linux-i686";
+ sha512 = "8321933b4eec21e9297e446d62f63b4a7c69eef3952d99aa32828b76776c34efc9cc174ded4637c586a383558eebd2ce43a63dcb7608ea0a2568c03fa363e0aa";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/sr/firefox-51.0b8.tar.bz2";
+ locale = "sr";
+ arch = "linux-i686";
+ sha512 = "a81dcf72785936754c04fe2e549795f612af671e360a653860dec811a65ad8e19cb6cba5fb205ee5925f364e49a358d459c354e26b23746a2e5deba41374115a";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/sv-SE/firefox-51.0b8.tar.bz2";
+ locale = "sv-SE";
+ arch = "linux-i686";
+ sha512 = "1835da3f930b9daa37dc14785feb0d145aa9640278a4119b2a8f6168bb5bb385187914a625fcf3d88c3822ea62f338c2376c08831a2c4d8203a4b6c0bacb2d7a";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ta/firefox-51.0b8.tar.bz2";
+ locale = "ta";
+ arch = "linux-i686";
+ sha512 = "0a7f219eece161bb3ae9ef280457e94470d1929770123a9197c08eb320ca2119aac66cd7fc5181e4c0c1359514d0338d306db1322435abea70538f9c55d5d7a2";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/te/firefox-51.0b8.tar.bz2";
+ locale = "te";
+ arch = "linux-i686";
+ sha512 = "10a412a83c75b8a7d4adc800c858d9f0adbbf7b2c08cf8a3d5dc494ecf38cf8a83cd3a462eda7eabdec73e194264b698f40a705458fb0916829b783c511fd3aa";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/th/firefox-51.0b8.tar.bz2";
+ locale = "th";
+ arch = "linux-i686";
+ sha512 = "d5bd9c86174be82336f711d50dc75e6f252a468083354c0a1dff99f4c72469a1a789144ffab2beba65d3e43a2e8812955176f426b560bb000607bb683eed81ac";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/tr/firefox-51.0b8.tar.bz2";
+ locale = "tr";
+ arch = "linux-i686";
+ sha512 = "7ec4d2419a1afd9b23351ed896c92ba7812f4aac083e72242d21e0608c32dd5ac157c8d08a89991fd051f6fa0cc56507739b49cc94731a4aa83219d9c76cfc85";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/uk/firefox-51.0b8.tar.bz2";
+ locale = "uk";
+ arch = "linux-i686";
+ sha512 = "eaebff23162685126416f9974ca6d4d20a8dfa320818c76716e695c6d9984e4591620185fc5bb4ea97c2ab0d042864525f9704d7c3e0fd222db3eb60fbbc63cd";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/uz/firefox-51.0b8.tar.bz2";
+ locale = "uz";
+ arch = "linux-i686";
+ sha512 = "5cc21748974536c0f2e73dbd486e2bba1e5d44b4c198d94a6a4d8c3c0be925e89264a7201031903e1c4a41e4bd2c9fb558117ace9acb8f52051224c35b3558ec";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/vi/firefox-51.0b8.tar.bz2";
+ locale = "vi";
+ arch = "linux-i686";
+ sha512 = "42ad1640ffd4c1f35addf69156992f87e1cf5925c8e5d5a1ee49a34835d28117918d3c7cc7087e258726f83e16e3e8fae14f6b8530d308b29606105c8a2f337d";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/xh/firefox-51.0b8.tar.bz2";
+ locale = "xh";
+ arch = "linux-i686";
+ sha512 = "14f18ee698bf639d4e51c13f58257af6a4a87e912e14dce51b2052351005f66df501e5b28408079d6d6221e2419da55675d298859c65b6c40b94108a7406f5c2";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/zh-CN/firefox-51.0b8.tar.bz2";
+ locale = "zh-CN";
+ arch = "linux-i686";
+ sha512 = "66ee019ea1694d8e16e16a39799fa0bf1b6fca66a39ed5435865c7d3fd9ebd93496d20c37d750a1e70006e11672ae1a603ea81781146a10086604dbe39c3f2d4";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/zh-TW/firefox-51.0b8.tar.bz2";
+ locale = "zh-TW";
+ arch = "linux-i686";
+ sha512 = "2575b4111e6061f941237392f23254eabbe7bf7c29a5113fcd61780238fb22f5b9d8ca9df0243f29d40b69f65ab5fa59d8ed83fdaff96ebab0b0e648f9adc0ad";
+ }
+ ];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 7a87b1df386..0b9ff9db219 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -38,6 +38,11 @@
, libpulseaudio
, systemd
, generated ? import ./sources.nix
+, writeScript
+, xidel
+, coreutils
+, gnused
+, gnugrep
}:
assert stdenv.isLinux;
@@ -62,10 +67,12 @@ let
source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources;
+ name = "firefox-bin-unwrapped-${version}";
+
in
stdenv.mkDerivation {
- name = "firefox-bin-unwrapped-${version}";
+ inherit name;
src = fetchurl { inherit (source) url sha512; };
@@ -165,7 +172,9 @@ stdenv.mkDerivation {
'';
passthru.ffmpegSupport = true;
-
+ passthru.updateScript = import ./update.nix {
+ inherit name writeScript xidel coreutils gnused gnugrep curl;
+ };
meta = with stdenv.lib; {
description = "Mozilla Firefox, free web browser (binary package)";
homepage = http://www.mozilla.org/firefox/;
diff --git a/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb b/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb
deleted file mode 100644
index d049363f2cf..00000000000
--- a/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# TODO share code with thunderbird-bin/generate_sources.rb
-
-require "open-uri"
-
-version =
- if ARGV.empty?
- $stderr.puts("Usage: ruby generate_sources.rb > sources.nix")
- exit(-1)
- else
- ARGV[0]
- end
-
-base_path = "http://download-installer.cdn.mozilla.net/pub/firefox/releases"
-
-Source = Struct.new(:hash, :arch, :locale, :filename)
-
-sources = open("#{base_path}/#{version}/SHA512SUMS") do |input|
- input.readlines
-end.select do |line|
- /\/firefox-.*\.tar\.bz2$/ === line && !(/source/ === line)
-end.map do |line|
- hash, name = line.chomp.split(/ +/)
- Source.new(hash, *(name.split("/")))
-end.sort_by do |source|
- [source.locale, source.arch]
-end
-
-arches = ["linux-i686", "linux-x86_64"]
-
-puts(<<"EOH")
-# This file is generated from generate_sources.rb. DO NOT EDIT.
-# Execute the following command to update the file.
-#
-# ruby generate_sources.rb 46.0.1 > sources.nix
-
-{
- version = "#{version}";
- sources = [
-EOH
-
-sources.each do |source|
- puts(%Q| { url = "#{base_path}/#{version}/#{source.arch}/#{source.locale}/firefox-#{version}.tar.bz2"; locale = "#{source.locale}"; arch = "#{source.arch}"; sha512 = "#{source.hash}"; }|)
-end
-
-puts(<<'EOF')
- ];
-}
-EOF
diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index 9d895a383e1..8e424ea80b0 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -1,192 +1,915 @@
-# This file is generated from generate_sources.rb. DO NOT EDIT.
-# Execute the following command to update the file.
-#
-# ruby generate_sources.rb 46.0.1 > sources.nix
-
{
- version = "49.0.2";
+ version = "50.1.0";
sources = [
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ach/firefox-49.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "34e58b3394e51a48e168513e73d916e76ff8cbb733cb85483c3f71076b31fb2d2fd72cc19994339cc23ec84989caf23514e84a393946ecbd2765ac388672ae27"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ach/firefox-49.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "fb640df0aa14ddf92db3f8cf94598b7321b2b9f6a0360de20a2c8a70e697e3a0e6f13b13704ce766766c8a7a428e4601e8cdc3044d64558976c81e34cb5b1a2d"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/af/firefox-49.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "8772744f9ef9ad3a0f37fcdddb90b08a105d65f347e6e1fdf66955a95a3e12e5e18dae2b1f75895fa73914744c0a9d98556e84c6a1813f4dc9d22d7633749688"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/af/firefox-49.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "475ad078d26386336954a747ca32722422122638632c75d8f8302875b5d3ae9c6271352e700ebfbf7bd226fa5d740c6eb4aeda83e6df712aa03583d54e7cfedc"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/an/firefox-49.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "782e1a0d98506a66413f4420609e51ef8b49ff711b89345b806f243414fdbb1d179b1ad3e74f25e0aeeac0103ca75fb497cb2a6a94e1b138f98c593350a34c85"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/an/firefox-49.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "2130aefd45506e9dfa56183955dae528edca747bbd186b108a5fc31cd0271017ec9d8d2f88ac061e2de94b3c235876d6c20f65c11c4a6ae95625db3633553d74"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ar/firefox-49.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "aa3d9ac9cb446b63d1275a4bc2172a127a002f07a2c98771fe09e5585e2617a9bf8bd3171dfec839a47ffae10b47a65c9c76403449207b745e8b587d5356ba10"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ar/firefox-49.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "4e1649a2feeafedd73f3b7a137105dc6fde8cd83e49b1ca58c65367e262e9abbe3b2be73e0b778503b33458dccc99a9ca8bb3f9a6a01a7989c20ac8a262f7bf8"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/as/firefox-49.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "db178c3bdcff6f2c8166d28a380bf47c457c53bebb5d0bdd811af96d41b2233c7e487ac17a61a479979f494dca78800c289ce4e1f00a371bbd4e1478ecafedbe"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/as/firefox-49.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "bc37a83dcfc488a32421a784559f6c236230c3ce189888c695ee2f476024f5d60dbf83782eac5f41824a63cf6d9c7e2f775717dd664ab311b1c4337c0a9489c6"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ast/firefox-49.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "7699c57014e5a8545fafe2a11c8dfb066d5f0c9fa3257264df78d2926b86cdf5dd44846ff3ce755eb13f9e34b60a78777b9ae5d0799890ad93bd390109ca055a"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ast/firefox-49.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "a2f0af3df56a3a99afa9f8144760545724f48ea454f84d51988773003d3550340402736a592cea1bfc3b4b728f8d38eee53fd22aadb6fc032902b14a5692b153"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/az/firefox-49.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "20f5911c186a9e11ac9f1913bbb4a5c4d6cdf99e4225c8025df0967420b18452cc10f8bc1d6508607b27ba067b2e9dfbeb68bf3ed08469d87997121363990705"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/az/firefox-49.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "85fa4add0e7dfcb5209c36a56438aa1480462bbaef29340fc76f710de81a419a3d6a58ccfc28592ffecc0464bae51b75cf0e658d078d7a18251849d5333a98e9"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/be/firefox-49.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "b93544226bca7eac5220878f34b23e1a9a740dc2bfeef4bec90057bd0197d77e6eec142e04f072f227d379a085660f3d19e112e3f55233dd82ad59e9e91f6635"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/be/firefox-49.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "fe752476db9babd70882ba947b860a810f76dfb9f2dde8ccdefe72ce960a7676440fbefc261c3b70a6d6ded6874166b81c34ad62c159b1e55101b804e93b02e0"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bg/firefox-49.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "b0436dc79fd6064e5d455d6ecd5f835b6b1cd855aa147675502468c9a332698b4d91e505eb92a45bf2aaa8479074eeda745c7340852a071a4ebe4b19a6e9ded4"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bg/firefox-49.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "892af8626ee894bdf6408ebeae6c5239b5531a52b0f107cf7f207f4f87225a0f3d690aab233e0e6db9628b29cc572d65fbb4ed3f3ba0c15b54c54fca195929fe"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bn-BD/firefox-49.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "371dcf9a6cffa6fa5a505d390e082d6703a4ca906be8870a07d28d47a00f94808ee456409e24d50d1ac75affffcb2b1f341aed638a0c6d54407f7d7bf1484e07"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bn-BD/firefox-49.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "866629e3b07bfc6884c6974d411b553f48edb18ab3b01d2d8b74e72b2d0c1bec4d8ccf451c00dc3567f939d78f7b16837c8b9c54e875a987294f7c9e88d85395"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bn-IN/firefox-49.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "a87004782631b26012dbac62f6a3c2dd5303a65e1c3a23113e9a20419f280450a4bbc7008d3e78448db65f6bcd670011e27a76dc5f930d96e480e1fc6e8a3e3b"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bn-IN/firefox-49.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "4195e49bd40edf6aa3767be6c706d66e5d2a22c6e8effb57d101684934f5497d01abdc7f897c296e9129710365d0b34cb3f6f595a244d03bf0b25cd725433c11"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/br/firefox-49.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "a2977e3e4d926cc21e2dea941f34a7b75f0d99d454ae9de6a97f95e31277402420fb3efbf606098feac0832355b7ab36e2da90ca7b85cfcc3a9065bcbcc90c55"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/br/firefox-49.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "7c26ed2e7b9e37c97e4186fa02610205e4b4b4540a29efe0ecaa0851e65ffbbeca3b26b47ae99b8f87baf2212a8c5b6ab69cbc51ee4d3ef6805cd37cb8a936bb"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bs/firefox-49.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "08f93fb2c29e2f090702570a9390088954328f22a69d50a2eabccc3893e1f28ecde95011b3c0ee1f2082a447d61f86d4417b5e54b39858b666c69b6ea546257e"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bs/firefox-49.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "1b4d4e9f74532974f7cf0382c2e4ca6cbee1dda11037df203f5a643305876e9bb33965ecbf68935b9ad626e77f86886b3deeebfd9326251f3dfe2b11a70c24fd"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ca/firefox-49.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "e9b270bd2b2b2e48dace759ea61d0c78e4b0eaa4f9e44d418e37c55fb8ca96ca16304649b1d57b30a31575c2dc3abc4b4e40d89ac32fcf8beedba055bd38049d"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ca/firefox-49.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "d44b1c0b434f92bff6edc4c514d5263f2d48e31a741ab10f8ca3a29c831b24058c1952ec09d4f2e2318d0b851281b0d228ee7941fd07e4828939b7652d86f08e"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/cak/firefox-49.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "6b687dd14de728612de1ac96534a57ee1a82bb5e069cb1a5715ca688d19f33fe00079339a7fd93e13674c3fecd645ffebb36ba84bc597ed047ff4f3e51d9aa68"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/cak/firefox-49.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "35a68ed2b047a70253af24112554e733274bd531b5cf85bd82893d8abae19f56eb9e712b564ea44a3c72fcd9887338a314a02f9dfec747d5eb51fcc5b91e8e7f"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/cs/firefox-49.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "c206bd2c38e38ceb7722aeaa607f29ecefde9c9a7dce67f3685948e2bd347e18807398b050d65a0a0f7aa75af28eb360733a2b55a1004845d24ca00276f8894e"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/cs/firefox-49.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "7b0a0236d16b6443cd701b6b87347839d218e458a99b62cb8a85e47fad46d7dbcc778042906db189532e37f4392fcdc08c150e81baf838e47af1894a9a3f03b7"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/cy/firefox-49.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "0d1a025f349ab6a87d82fdcedb2b5d5227fadde3b071d54347e66e4cfb9200b9a3e689898b286d5d9e92d05989e817c75e8ee633026a81e2c36fbfd89bd63ebb"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/cy/firefox-49.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "e52b74c7ed70df4d9d182ddf43d3aa385f8d9d3020a51553b2abf03ba1e1002c56571b199f8e96155eef25bcd296add90c59eb389e5f96b9b671a67819532a42"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/da/firefox-49.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "9760bc438dbf5d318d34767898e4c585435694ba051fc3e88b9c21fe64d2513ae306d30655c021af6feb43de62576630dabbdf84dc379978ad7f27293206863c"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/da/firefox-49.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "cbaa47308c0718da93615fff7fddd026d9396dba581b9a095bb86025a63e0eafa900aef6ef306888cb6c8371d9c5d5fca7f8facfc3f603746d17b3acfabbdd54"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/de/firefox-49.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "5bbfafea2170467dd84a297dc3308d73b01b41c89bac3fccde203205bd8a2ef6b699d239df22938d4edc71e6074b4d797f4ecebe6140ecf28e75e07a35bd86c0"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/de/firefox-49.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "2b86397fa086b15afb255f733ae12e821ab57b5045e3cb5e47bda703bfa170ef879c966049c2bca5c15f76136af250489c49e313674e878e1d0815d02e5e5d84"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/dsb/firefox-49.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "e761e49fe6d38ff37688b6b700c943ef5461e99990ddddb6b642403b9ed99cd815286860907245d27c3561f1e26d16b757a631ebc13de05df61b86bcba272f1a"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/dsb/firefox-49.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "ce65e525200dc1b6890c1ee5c847e2c720680b28221c700367d373f0eb262f10aee1831348c27b03af9218cfc14b40106130d62005107c674b5e4e89bd8183f0"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/el/firefox-49.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "559e97300b603e1159beefc3d58715b437a9741cfef77f8c36955825e103d3510a88617601e95ab230b7dc27185b6ac091aa7659b7fb059a6c4780ed5efd3977"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/el/firefox-49.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "ddfdce0ad9215c2a41e659c8bcb0aa7f04bd4906e5420ea47c64158a15ab111f8cb4bb410fcbaa2a747e74621dc8fd13fcb63861f5bce06bb045c4170501bad4"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/en-GB/firefox-49.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "cc32b9418874f1fb60d2103a03a99bf56d2565be31e530e19ffdc4fa3f855d6baf8ee6e03363b1ad3beef624c9865774abae8563c7744e995ab13a3c4b50ca3d"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/en-GB/firefox-49.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "85b3f54f69de86a3461e977934a21ce1226af04c3df07635e592b1531c06084a31d5fe50687990d982994cea747c1a32e4f6ee65c90954752c05494c5a144583"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/en-US/firefox-49.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "fc7309f05662a2bed24566076047a7ab328bd098c3764c7b8ac8f58388be7225a26d9e917542b712338b29cfc06a603569750d607818946e2880f66aee8a892c"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/en-US/firefox-49.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "cad0ee863c3362e3e2798ad9c3026d5ea5ed8f46ad9409922fcd8e4a9fff9fa7d383bd32d7e0e13aed98116f85463060a99044398a7673fd2015a97eea06ed1f"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/en-ZA/firefox-49.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "1f5411b427384132e5a4922249d1cc5596942840ddb3225864e888651dc50dcc601de59d52caae242e3c09733113955162a061446181ab85a582047baef019dd"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/en-ZA/firefox-49.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "7846e2db723636407eaff1f7d8327f683ed2e76600e0b2ff4cdbf4a2f5ffbb54bc7f8004a4604abe128fe15809f7ac257cb4c895c5a8d434e20fa896f73881c2"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/eo/firefox-49.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "71544335b093db847bbb75d95d85ce79fca7ef628172fae7a4aaa42f1860ec700472e75cb42b5cd7ecaddd62e86cf99cd105b2afb03f6a523cf8ab430398101b"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/eo/firefox-49.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "1712059dd0583535706f91819aa664732120b9771a2db9c19374b82dd99c3b08c5f96747936c4e004182e5a4c7226e38aa567385a91810b2d6569080881defb4"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-AR/firefox-49.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "7641053300343cae1ba6167cec8f35f02f7536b1d711dbe3522a52c3de841d4a1ad8798295ebf01805a7897118797c641cef380fcb00b59ccc6c609023df242c"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-AR/firefox-49.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "1c25707e13c94039cbd2f05c72c8cff35c26f31566a89f238d27c5277362a4c9b26f57c85b35ca9740b14a8771c9dfd54346b1db8d843827d61184d9ad7063d2"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-CL/firefox-49.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "d9a10289461272833bdc1423b0e943633edb352ec3db52511f64c35b9f36c8a9b807432799ad140d6086a839992bdacfd864f0110756d5991f288abf1e9060f8"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-CL/firefox-49.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "e96dbfeb2c5d17f0e174d7975e57ec964c8dc6c4322b510a1819eabc081f371f43b63bc85085c8ff0bb0380afc9c2583ae4bc0aa4224dad99e0134746b96019f"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-ES/firefox-49.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "db99c4ccdb514ee68291fc41f38a0c0fca22bd235831b4c079a649e6e5b5a6b87dbd7512ba44c72dec31a173d128907298866b4855ab7259168402e3709e4114"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-ES/firefox-49.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "0f2497e1dd719905494e2290f2dd09ac51b51058fbc27b65a23eac3e2d5e49adbb88a845e51393154ba69e2d5e67d7cd1911753efaf43838587ad417f39da251"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-MX/firefox-49.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "d612e453d1f952c65a5352f54f52189cb8b92ccbb7bf8a191efaa7f919748dc8538f07152b3182839ccb3f66171d7e1d48a1927a3a346e51dd23018d144b0453"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-MX/firefox-49.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "f1c47ebab9dc88932ccb93b24b7411080dde9ebb335b1d8f56041d1841f8425d104d0c1cb765f01222325ca5be10208f8b3326ad5aaae474ccee3c828648b4a4"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/et/firefox-49.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "683ec0c1eb4716b9b8ae897052a1208492a24ca6803ce890d5ad4044fbca57a6d8c58581c54faff5753134b6144d157202d047e0b80cda1125df0d9e495e7457"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/et/firefox-49.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "a3da302a585a4cad943a71a8f6fa9376821e4ab4953acd56ffd3f3993fd9e8971bc0ac1b2e5c37a8ade28a0fdaa0b47b277abed18f38246cb1885de532186afa"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/eu/firefox-49.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "988a8c2411dc43e4599c9db2a94e220738049e2cca4fc59ca073e2c215a71598809d5102356fa36132b5ab0e5a552183252ecc17688ad83a76eefe726f62e7c7"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/eu/firefox-49.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "873ace38cbcdcd022f932c1753eb9b4c9124a41b2589e89a84f050f90383483b6fa8d793a830d79860fe6f20295b5a8971775136e70877256f9b23900c7b236f"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fa/firefox-49.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "0a1119a749db6cc2b277f4c1037d8163b6f35a0bd76ac0c121941502a821ea9c698822096037c242f29ffe85aa58fe97da821eed0b8995ef8f94f373567cef95"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fa/firefox-49.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "68aba1cc55f22c39af1c68e4e77e5f8eed5005a1f7c4903b03a3cd711a9583a99042cf82d2dbdeb74b897ea1d840888ef7a417d9f6142b626d8c2f3654e01794"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ff/firefox-49.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "9cbef7bc67fe071cf40734eeaa64be8ee0b7f3c5428cfeaf5b81eb4eef5c4fb38e36af6de389164b2b0a65f2cfa0d14b2e933883d343cef1212f03f6da9c1801"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ff/firefox-49.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "d8b5362bea1305546da3681c98452594c5b15ccb57945efdb7b6971cfd07b7b940c9952a8db8143ab9bc8ef55f034ef9c8a162ea9b8dd4a82af033f99c34d9cf"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fi/firefox-49.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "4f07573325b6def42bbe66e7dac08396520b66eea71230fcb432724cd6187c11d21325ae6084ed6c8c416b31f2a582fbb0efdf98905c566cebfdfae002875714"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fi/firefox-49.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "f5dd198d264426ca8e759eef8801e31d90f628788451ea4802397a525938790a7b83a68fdba6839ff669239c79915f9596cc7f0ed48454fa528833041d9b7e85"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fr/firefox-49.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "135da7e143fda33c6821002a0153cee11dff432bb75036731af68296142558f371d595f448dcb74b848b5e7a9318e80f2d0627c1554d9fb47de6143b5d2fd046"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fr/firefox-49.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "b57bcc4602433cd703ec660b57b3b7d72c5e859b69d8b12c77a8250a09c6148fcbbfbc3bba59a984d8dc3ab284c11dab9cec1ea67e9d1f56e5f0b177e11358bf"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fy-NL/firefox-49.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "901833140bdb0eaa7375fb9f83a395fb62de11df2b094b65e4fdf9c1c1b55e1fbc61330fab861214c843bdca5722f1f0f5c25765b15c883434fbc571d86768e5"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fy-NL/firefox-49.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "3aadc1c35a8d498b336fc9f6300a467efc1d51161dc15099fe8d588deb4eb6f4255d2730ac21c9cbb98b136ac5f31993458368892969d0bd00423e778fcc09ea"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ga-IE/firefox-49.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "42f85212a3826f2a80c957ab717e918b0f3ca622cd057ef091f5ad749bc6b3173db3e8d0029ad1cd79d33b1d0b88eaa2b8e3de22ff76895cf1abe3f166610c83"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ga-IE/firefox-49.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "e2103c5af60b6d318f8f009418811f0f7c27933ccf1b72ca998b8e66dcd61c3e833a8b3a9f078f0ec212202cafdba25f8054cb13f999a8aae88310ca6439b797"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gd/firefox-49.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "b00d74f2f954395027d48a1c91325ac21c0bbfc2d20a44242f5bd8f74780d6e2fa46e4344113592b5b4f6c8d106406eb62d2373f3b8adb042cc8fcebc3237f98"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gd/firefox-49.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "fd1c042d586a59ba35d77095cc8f9a72a74a68c3e90318050854433f74b79a62019535f0baa63e33c7687cef401ab1668694ad1fa54a6dd731c77ccad66f599e"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gl/firefox-49.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "e339859eaf9b2bdd8b4c09e2b3c22f35a8b72bf9a5c3fe4756576c34318cd1219c663190596196801acc09652e8710c8133e91e9abf30a1fd9e4c2721a9270db"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gl/firefox-49.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "3beb1c6cdd6372615283af42074c4356009addc9ad41d98b01d008896182831c6275dc2398dbd477b9befacfd88a84415d2a45ef2f03d4748de8c5837fa4e7c8"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gn/firefox-49.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "dbf599e7eb564146977cc59587b40bcf02c0e6b0e853ab71715635884d883e0427fd53df6950e7da9bcecd979bcf5f9c5a08cde9894e8b68d6faf42467baa020"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gn/firefox-49.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "0e6f7818fa7c22483ef976684730b93e5793cbbcf79ff96645f9527b41d1bdbec8b0c25aba7ef5a3c4895888a9374dbb259ffa7ee95a1c3eb3633d46848711a5"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gu-IN/firefox-49.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "c439babad0a48b8eb495b65510f33879038b950ff11820f7cf9fc7363092e761a95c9e9b7b9b51b7621efd4b39ae4ba45bdbd0ecf9fa14aa2bcba656a38a1106"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gu-IN/firefox-49.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "48d9c9233115365bbdd5fcc4d5a59f5e254394b030387f4338086552734376bd77a7d4405ba75807e78b332d49fc04dbe4f2ce9c4d4fc625eeaf5ccf2cf29a14"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/he/firefox-49.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "a74cf826abb5ad09b4ad76e5292eed081c904560fa7579c8ea2663bace3e23f630f7410782e47b44bb123693b5a053513e07e3377b36770d3deee4bbf8334b4e"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/he/firefox-49.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "0266dbce27dbd09262b892d4bb6f8179cc5f710ad27618c6f3fc2f4a4850d715c12162729d17b87b60327b057fcf5e8ce0e8d64c7fdfcd56f41f0396e34ff5f2"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hi-IN/firefox-49.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "ffe0bfc30861ffbbc50fac77fff688bc716e4485c11134757c6ea1096ab6a76311d69480f47bbb6ee9d67b6c00061436d8d402b31e3c97b86283cf0a027d1b49"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hi-IN/firefox-49.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "9ade7154bd38c9fac3291574d0ba956ef39c47d49d24c4a0006ff28b6065ee020074287e093742bc073b3d5f9e32ca517f84054ae5df72e513a7c4dd1da05903"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hr/firefox-49.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "0d1d75e61fd2e70e09168e1cfef9a936868d49c31a0df036b15a98f5eec353c122748369eca9ccbf696621702ec3e2521b76ce92a6c9ee0cc4ac7e20ab6beae5"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hr/firefox-49.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "da7ba8fbb68ea0028408ceadb328fdd59b2df2514948cabf14da56ae548441b697598eb199772e65fd6fa001ce5e116fe8bdff9818c54110dd4a9574a021400e"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hsb/firefox-49.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "f3bb00b3725fb8c5817923a2a40af5e21abe9b85304be2787987132822af9318cb7b1c7f1f9657543e1b8e07f09870411e00c061ddcf293c5ea0634784197390"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hsb/firefox-49.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "7119d7730d4231d2e1a9c3da810fa1f030afd4fcfdd19df2e7879ce294bc114468324bec41126aa3a234604d30d4fa7517028ceb9c4258b470b4c45b6e796131"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hu/firefox-49.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "41f68050eab542a96482f63769b3cd760b5a61ef06c5e11af78be7428d287d06e61bc5367b9cbf30a96cd33e785c21f939639e64071ed1828e0a2e9bd834b584"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hu/firefox-49.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "295f9f02994d40c658f70819d42ed9e5066b55675acf4f639ffa88b5b922d586b9bede8a20608a4c6e7533b206dfbd5b4c78d933d05c0d45e6d248c7e8ede611"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hy-AM/firefox-49.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "80a2f18d1f2a306005761c7df5a7eac3d5c1a0ddf8a556e9ad641ae1d0f099c359d9950a1e29f9444c191d27659242935b8ce760d80118096c4334047ef4c3a3"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hy-AM/firefox-49.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "318767607dff10d4ddc5b18e77756eef267a49c5a8d866c88f971cd126577632c9385c7f9981282f2720af82a7c050db098312e07c5d8e7f442d6610fa93f935"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/id/firefox-49.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "33355c4b3a5bfc0737bf8d473bfa0b91eab12ebf1f7960f2c06e2b70940e928712398147eafed5e3e72ebd1cae3ed0df262bdd3fbd9b8314f52afeae1540ccb9"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/id/firefox-49.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "dcf596d4013b5d370802b0f717e327d2cd2c6fad377e77e3230d2d1f9b9cb081bcd6af514a56aa06bec625c5fc55213022eec4ed6fc45289dcd459205deffead"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/is/firefox-49.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "4e8bc5fcf1dd6e059bb1aa79955040f3a59c814b3bd3812c59df83a9ae7e07d0b9bec64c14ae33ee9f6688ad027e3545d54a435fda8a340f11f4bdb96200b5f0"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/is/firefox-49.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "5368d47f4676eb165b91bed0d9e53f0f0e9bfb4b0edd821e17b689267b90d7932c84b8668c1e5f06f7ee3dc6a66fffa2516446f1ad40faaa87d7fd521053085c"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/it/firefox-49.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "23d8b1e901f213a84123192796cc314ef6bcf664f31c15aecbf1112911a4df76aad41b93806067437cbd40c0722b54ee1139911b32057efa2f783819d39fa2e7"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/it/firefox-49.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "378e7765f081bb2abd25bff5bb3a89046a9f2bf09390c2830f916f8c7e811d32359cbaea832d433062fdd31b9251242361483851e91a15070b0420cc7a5d6344"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ja/firefox-49.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "f20fb6d3bc76c5ae40b11547ee1f4542460f781bc19a88fdd70dd95e5fb74de2adc3e642283d2baa7ef26cc49e5574addadbb5b18a804dd77b9c83900c15809a"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ja/firefox-49.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "aec4ba1d3c33bd586649b219a1fcd7beae8e51bdab1b44c311414cf141f452550a41e6a5044fb2ed9a184938f49e2196f97bda93e0cf5c7400463222da1e920e"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/kk/firefox-49.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "b7e72ef90953825ef50d98acdb0040b9a452e5e7f3661dd1e574eb045cf8679375afdf6695e866a9e70eb2d46c38d3eea5918b8373bddd6956ea42fcc3c50a3a"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/kk/firefox-49.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "c2c03344eb5cbfdc3555221fd66b245c38ee9fb5df40806ca475b1b5a94ac7c488816d18946c7cea0b8a556519d4d40d39224ee327ec59fd399c3c8e761fe575"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/km/firefox-49.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "1f79fd7893de0c5c773912ce5c96ccd81f29fa5ff879ff882d96dfd778b12c05f9476fa8e01a2f84d35dafbb53aeaeeb53f9a06a7abeb0b93482dd8c430891b6"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/km/firefox-49.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "ccd6987dc3bcb13f483c12015933801b6e4e85d0de1f9179e7e959ee7f6d75bee79de67551bde5ade7c5d0afdd58aa9367fef13f9caf0f31c9626742e20f03ba"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/kn/firefox-49.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "c63724966e962bd383ae8ba0dca744c547c9a794f0f96f1a51bb2bad04a786ae3f00a09a39d679c28db254c37a99795f474042fb8dee46754ddfb0a7c50297bb"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/kn/firefox-49.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "8916c80f522578152783af409b5df23ea554f4d711a1d85de1445678372eb856a2798263b2e638d72a5dedf3870fbde5c23ebefe7d051bc5c781f0363447a112"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ko/firefox-49.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "da33a16e3f8b414cc32b9dd3b4993d8c3645fae0066e92f50d659dda50de664ce6a15c0959f0b3883c7ddb23e14620e5d045fc0961da4c6c57bf638ef238e871"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ko/firefox-49.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "fba1f0fd69974d679c52246b9977f4d03d70c32ef4c77831d3305eaa30c4e19cca36692bee92aaa5195a4db34b162b909dd4b56370a4391aed33897b7f36463c"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/lij/firefox-49.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "28879f30f4db7f26f5bccf9219dcefcbf79437dcbe84d2ba7a27406d4ea4e6b4f3941bf2944400952c37df861f65db98ba60581df33a49a3b513c260ec33afca"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/lij/firefox-49.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "d0eea75c2bcf8f1040025807ff496c7e48b0949b633d475367b9721cf6c3447d2a30137afcdd54217f1d226cd67e3e5413d348eab9b63f95f3bb96b43e5fa5b4"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/lt/firefox-49.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "0991e328fc606eea0c7b67dca5a19c2c94a925d20e998994bee262a90fd69ba592936f29fe88ace97607c1bc3207f5f30ffafb5044a6e088967dbc2880bab154"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/lt/firefox-49.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "eaa6aeabf0f1c00cbd08d69e2a03d332ac9b022711aca0b09794ead8989fcc714313e8157de1884cdd3364b1fbeeaf62d31d61aab9baf34bfe97b5f56a55682b"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/lv/firefox-49.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "113b76cc2e5f0467b7cf02091857dc60bdb1fcb965089ad8a7196dbb15494642d161836d79035c26c09aade1ea1eb5cd734dc23ff80402b5b1b45efae9770892"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/lv/firefox-49.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "531f667d61dbf8b6cd90c918464e8456f907c964899b5819ac91fa6493b446ced18ada61c5a2227cc7bc044851142e03388e1b924cfc135cf5d61d1642369104"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/mai/firefox-49.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "42ba06b3c89c9702574f89f225663dc438bf4d2c8cdc698e80e46bcbb292814fec2487b540a3b4e4cfb484c146a34bedfe3cde0af504b9453ee7f7dea6688c29"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/mai/firefox-49.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "6dd7fac8a46343a0abf3958a044e534e0669894f30611aeb753a77cbb0da607f240672d1912490a3d05f312179d02ca96339e92f104298b9ccad45ab076bdd3e"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/mk/firefox-49.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "fbe110a9ba35be23b38511d5caffd2d1d0d365d881403b287980727987fe2b40ada8d6fa656faabc4eea4bd798f13ccc00de90091bf14cdc3dd4cacb28349f6d"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/mk/firefox-49.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "831d7f10a08bb9e6bb5ca163c8e172f9a4855b2062fca66c4832192eda45b20d64585f88ddb08268328e00f2d678b943e5d961f630cbd9730fd788997101ce8a"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ml/firefox-49.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "5b7e6f3c8ae0dccff269c97b8efc3a77e0468f0689a90afa61cddf8e88c3f3f4c3d9bf5ca0100376dc7d23f4d676739a2582235edee8bea836366cd38a4f4fc4"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ml/firefox-49.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "0a6ed3141038fdbd9c4a68dbac0178a3735d6777b60cbab679d6115e4c3b382bb59c6fe964924695a23975b44c064ad997d3f2f053b76dd8a0f241f157a86a54"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/mr/firefox-49.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "ab8d8f2984e94a37116a49453e0662a56fb83b981ef15627f5e328dc7d2bb595f09d6efa51d8840ea351be48aef311c177ddb24238bee6a5b7bc3996f7f888ba"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/mr/firefox-49.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "7bb1f611b4304f514183cb445b2bdd8d74140a4758b4c3a9664d7f62137540db191eecedb52287e45c269198f3d952c3e617d3bdbce2606dcce3f12efa59f5de"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ms/firefox-49.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "c6ff426bd09681209a36776e2a4b4282f3c4d50b3c9509b1e964da536527e03ece806b6d615e035a8f7425752d4796f11bbeb51cf8ce10b7c4b2770096366d94"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ms/firefox-49.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "dc7ab98a4d65df6a7e3496bc4ed37db622c8c26f790a2072f869cae8e4232ca2a3a7e299af25e7bfd855516e2de41745ef2cfdf2452e4d98bd60881c0845f44e"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/nb-NO/firefox-49.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "e4a2cb87bdd925faf6518e38fc7ccfed781e679df22c5456239cc5aec0afb5aa48f774225ee6fdaf82c6de56ef53c8738f8396c76a133c5eeefbac6a9ab96af7"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/nb-NO/firefox-49.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "5f0e719b40e67832968a1e8c9df8c3ddf7890b3e82ed555a3a2369637202e5f4c9f2a0b8faf7a2f6aa6719b033e3ad4f27dae3d6b5b0f0333615a8bb636320d4"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/nl/firefox-49.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "cfc57c748e0f940ba164b13c64d1129263d890e489ec0753900696947f869ecb1793f69a1f8b2cd986eecdd857ff7e94c28985248950f6a15f6ab15acd9046ca"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/nl/firefox-49.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "e7bdfd3976ae41a5f9fbfbd6b177f5f6815e68d9069e8916123574afdacfd28e0032211e7b1760275bded18bd3602ebf5697702edf89990c3ebac3efac381861"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/nn-NO/firefox-49.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "85fd914b626e27727461dc269c125539793e1a1c6001ea035c636bfee62d42ade799fb89bfba0bd4a915c5b33f6dd4569845cce3f189df1cb31ed2052fb90c30"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/nn-NO/firefox-49.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "6a478dd27c868c5e5ec0cda838044ca132eb89d93dee8556591c5651ad9ef8a6d89522498dd5d004e8e84d7ae40c09c69faac63591270b211a60b37667196a6a"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/or/firefox-49.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "335e08ee71febcca07e7d11310ed407a888aeb840c2cfc960a13706ce7ef1ecffcf6f8a21f65e1ae1606e88a3b383f9f3bb8d3110a8f3ae768c0c4277d3cf5fa"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/or/firefox-49.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "e4c4708c363346af1e7e58664baff9003e890aa934ccbdebaf682ec4b140bed7ab9b93cf657440401672ef1cfb79916d63f164066cc8ead18546de4718aed9ad"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pa-IN/firefox-49.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "67a60e43ef5670dc2d669efc62101b87a1caa97c8bf8052c66396efa75c11dd90717b78b7dbac17cb8207549d26ea41d8bdb2965ea249618258de5892c4a40b3"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pa-IN/firefox-49.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "c77dbfb443da63d0503a9c3586d01517b463071bfa8b739397b070ce80b8fde2a6ae86ba4552a2efe995eb7eb47cef7f6e2688526c7455c9d308dfdbd229ae6f"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pl/firefox-49.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "85f6e5525f0e1b6d691613903f1646c84bcb7758092101c5b64e2190221e5d041e66938845c97877dc79c72aacaf9da6d6009bfaf9745d7138b58bf957591880"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pl/firefox-49.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "0dfccd89d0c8a58a37b66e3034491139ad5fb16102f229c45f5ffcfabe77fc2f6a3a5d01f38c2471a770a1c8c8cf884e3a65cc793efe298366098280eab9da71"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pt-BR/firefox-49.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "8b4ac20ae1fc5a7370199c6dd1e56f2bdb8f394b84e61410d4d33916de3aaab13d1c36d9944f8d6676895838aaf5e8a8beb0d5eadc82429a827214f528968aab"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pt-BR/firefox-49.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "2c34abddecd5a2b83d8abef842b165ebcf601b7b90ffb8dc80a265b5297ab33da193ba450210be025d9ac8f826b7b4227063d66c9624bbcee06f01c787406a91"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pt-PT/firefox-49.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "e5a1618114152348b19bc88f7e584d8bad09fedc893ccda0b38b55a1c449ec7f53f74dbae5901414edf74e4f3946e997e79da1ee597db29ff2f884460c2596a2"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pt-PT/firefox-49.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "6cce28d554977a263c4d38675f88bfaccd4272c75ab82543b023f57ab503dcc806cb4f824681aef47dc788ed9fe85d54b0b1026cb0dcc4031267715929269fa7"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/rm/firefox-49.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "f06f72078658dc8f28fe376af8459980b1ef0470c7fd9557afb3cb4052a14e4e57d6e6131b5f158859ff53efa76ddccb10b95a5731a3c42654907bb8e776db85"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/rm/firefox-49.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "73b537df635d7278f8251ee0de6ddaceb1f9f843187d7b5ec5f0a7ccb8670cf97020a4ad9d22a4479b12dd0e81c36b94f557fc99f45dc70e6efe1914395d788e"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ro/firefox-49.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "8ce0260f462af9e2035987af36d90bf3b410d450cc69baada0326962b8a682c5b0e905c7d8a4d30875e4a6f09ca21a04c38db21955d3834c7edd3b5b72758e8b"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ro/firefox-49.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "d195066b01b39292121e4016a93d5e2ca02e0f8c3941f371a8033bcfaa4bef2966244ab0def982b1d8814b8d4af95be14b3e4ca3b900401f142aba9376e9387a"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ru/firefox-49.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "5860019163bd0bbb2f2a45396f74618358f294bc0a18cfdef148c28dde288050432bd4e1f68cab46b1d08e822f8850f5d940e6ab153a929052e5569199cfc2db"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ru/firefox-49.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "67c6e5e5fa32458db4fb4849796dc042a3f8f8a681c7cea52160f21841776dde9b746a068b090dd21d8db790b37d2306d344fcfc173a92291f73dd0b5d28b293"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/si/firefox-49.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "b218ca70de786cc046146d237283b808f54896c5efb8ca3a9ed2f5b6bc3201abba3ce0d01e3af453b097035b5a19ede69e8ce2543a84efd836d72cbdd3f60070"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/si/firefox-49.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "531f00041cb3eadf78b21f4bfef4429462b4bb3c497209724af5cfd75b879e2dfcf0f64135c79f6be1fa4c9b61a8735f18d6b74d4d6ffab0c252c2e02eb88ab9"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sk/firefox-49.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "cefc02bb41d10e463af03b086da872e1cb191c5c44da2b69d0b3005c04d994cfd7c9a05205c2a74b46cf4fd920e12c3fd439da85b6ea8301a04ba07f0387b80a"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sk/firefox-49.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "8334ff7e81e83e2a478705e1306fa8d1fe30edace143b5e84ddfafbb8d1b21fcb6875fcab4b36fc7f264fd738dac2821d21c0abffe71899691092ec67403ffe5"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sl/firefox-49.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "2bb22102e3597987f81d02f0f162b94505d191c580016af1ad425d7722ec3913ed17d86292eef094d3631d4e0bb8adfcafc5372dbf6c17ce4fd73f4ce8695742"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sl/firefox-49.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "97c9d25d58f0fa546237e9f10ecf9faf52e98242aa233e105233fb36ef97de76719588032d1fcd6b85cf2bb2f096e158a3c02774eac7cb026788d6e336cb5015"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/son/firefox-49.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "8ceeced6f4800f66499a30a2ec2275f70006ab875a7f1c14c095da0400cc7b9e93251da2156df07f2c861f5ce30adf5cbd3c263b6173ba71cb201d0dcfb28aba"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/son/firefox-49.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "8808edd0aced9810f191ea4e160aa316db12dfa663e6e085d848cbe2379d664a7c9005d5f9ee024d441398f47a87978d5182dc1b4b69bb9fc5a3b8be83f44457"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sq/firefox-49.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "cf278fecf4a9c7a2590ca4484643c0e430e2f696479d3c50f06068b8191d2353b93c254385c59bed7b077aa83718561c0b387890093f2f026133362a5f2c45d2"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sq/firefox-49.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "5b89d98d4bd5f618472bf0531839a5faed960fcb4ecbfd03f894f1aada0f73126a6f9351e1096379e606c6e7ed1665457da9eec05132b5838340be254c091873"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sr/firefox-49.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "3a9549e949628d170e04e696db4f8b436ca240ecff99aff8cf7431391b73124b3278a04f5d758a1b3359de6fe264ba2552072582a8b385c797fc01049fbbd3c5"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sr/firefox-49.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "45e4d83ebc97cd5da01e97a6bb083b3464d4b423dadc255ae49c927143be92843dc054357aafb6857f95fe004659833720453b049660f6dd6a75b4d433cde3f7"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sv-SE/firefox-49.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "a203c9c80b4c64fec9ebef68279f70b23e1ddfe6a43ce5f6bcad48c9ccb3fbd1835b7a5783c1b4aec3e389301240007bd1fd402db692d2d9000dd5f28384feaf"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sv-SE/firefox-49.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "8bdb4da9149743ec4e66f37e0346c46bd011105d09a6517ba8ec35eda4d47d06ea8763114f736cf98aa79b0dafec42e8c8f8285ae87ced63f51f60e2c7088cf6"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ta/firefox-49.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "b6d1fa74bcb003f2c5a3dd57c226ecf1a7a99d2874ccf89a525ca23ec5809f12f2d1fee20ebbe9096d9fdd13714d93a46b8ce83544c582a94cb9e39f80fe3ddc"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ta/firefox-49.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "0ed976141674b93154cd0f48cbeb70d5349a3642066bed36b53f9c9e8e78fd2c0409e4bff7de038d07480e0fed87fc96485296f4cda9a2a3b460c7dcab622ab7"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/te/firefox-49.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "60c4e8c2a1d61ec87a6ce0e0a77a61412d3f9e28dd3310666da0c8ca58ccd93765f20315e8c4866138ede58465626fd16fba5196808fd716dff9ed9ccecd0e95"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/te/firefox-49.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "85fedf1de1c5ceaef81765031e8d5e24145bf1851331d82a319ac54ab0b3abf7f896d69262c82615015e8854649321a9352037c59baf0827c2d3d2d7f40fdfba"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/th/firefox-49.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "cacc9b4ccee14f1bfb8c9828c69903933d92fcc73c8fe7b83eb5057e6636b4cc35d231746ecea4e319e7537f7af645fa0c0f8dc5bbc70a333f83ab06780a4ac5"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/th/firefox-49.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "88070db1c08bc68231fd32c4ee812ab4c225a3b53a09773bc55ad82381813b822d12fefccbb4dce6b41bb89cc57ab423caf8051b9ecdbb9b9f8e55025d90ec4a"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/tr/firefox-49.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "effa5261281a2c45549943d2ea757bd0f2a6100921566114bf6186695f906ee6a19a84992643f4ba5e434b397d4da976ef137cc3992965d269d3f8398def88e4"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/tr/firefox-49.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "759cdbed5de7367fb04a412122423b863095743f15e310ec4b4416f89aa8b76cb74fbdbd05524ab0d6ca8f420057d9fe937c7f44e44d5079d35afcf8835e11c7"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/uk/firefox-49.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "57937cd67abd7aca0e5ebfed3e890237dd305a45499dea46d31d8e4994195af0365e27981ba624068781df5b0f64437148564604dacf83f96ceb32448503ed41"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/uk/firefox-49.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "94ffa3c69613db6124278edeed6df2d11880a47941c8761eefd86b30eaa6f6b60e83d5fb5df25156613ab74f9f0491e58794042dc1df74909c14089b8cb3b232"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/uz/firefox-49.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "b5280fe0b3d5afcb37afc1c0d18d583f698eca1cd01abbe22ed9c3726db9327e9f758079856fedf23b533a9d64fd47ae9da733a1138ac715b4c0ff043618b89e"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/uz/firefox-49.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "d6c658a6c76606ee2861b89f109e1de707e32d1b3136bc92de9f60f2257286b271a0594517d53bcc727a86cb457d33a27bc9574de60c4059b2a203fdd5601a2d"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/vi/firefox-49.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "cbe65faa2d20a3740cf1ce97efa29f3e9e1697feef0f63f26d9f7577dc626114834f8435c3b7c7d3989bf3f985d5ac518ab59f6ba9eea4fa86b8f5a20dcf7cc2"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/vi/firefox-49.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "919f2fdbf20f39698264a7760ce8df4c7d979bbc91a44ac6a2a258c2ceafa62bcc945dd07a3fb4a4535f47c4e90dc34e06ac0d58165d6ea8edd451bf147aa818"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/xh/firefox-49.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "f8c3c5424bf6bb41ac9143b20a57bb1e78688ad9ba9ba35a5fe00c524354ca9e65db3e0d4dd2b3447c76a80332b9f4adc16fc5daeab61e35ecf868ea935228cc"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/xh/firefox-49.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "1d331b1b1c1bf3f84c7378189faa17ca112869b0fcaed57184d5f40d05c9d336a06fecd84bac2a2cbfff5494f0eab472fb4678a82af4541172b240f5baff68e7"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/zh-CN/firefox-49.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "0f59002f5d5ae044a07d3c6136a5db19d4c3d067da8617614b8e8b68f266475fdccc32e1bc59bfd3195dff3e475a4e3f1cc6d505b560b8322744277b5d88885d"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/zh-CN/firefox-49.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "1a18d792941b4a0d49c1321cd53d397a9c667de62cac58c75229c0b10327cb4e39b7c5df294be378aec581647de1f52c17a309724689f010d37141aa5691cd2a"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/zh-TW/firefox-49.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "d58697f7898bf018958d5fc9389b4aa65c81c61fc104e51d758b0a15e19febf22c882b740f12536dfda3ba776019859637b66aa4e302735b31abcff098762175"; }
- { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/zh-TW/firefox-49.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "4a53044f7e44e5239587256d24f8149ce0d4606bd53ac6a3f1ec48ca6950a67c1892036730ed7743ae53905ef3c33aa4e192805c8a279ced68c3202342439a77"; }
- ];
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ach/firefox-50.1.0.tar.bz2";
+ locale = "ach";
+ arch = "linux-x86_64";
+ sha512 = "fb941dda8a38f2e8474b4c1b235b4d3b2364a3e4b70f929cb40a6bc96a8859a830b072a0b3bb03bf7d551bec6eb0c46e41a93f7ebf4fb73a21949b824ab09084";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/af/firefox-50.1.0.tar.bz2";
+ locale = "af";
+ arch = "linux-x86_64";
+ sha512 = "9ca21be569db94f528dd74ae269e9a0929f9a73b399ad619066c45f38fdd04b511fd8126bcbdca7ad0d6aeb7ec82d597287ef168c04fe1c7a47d9dd4fec3674c";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/an/firefox-50.1.0.tar.bz2";
+ locale = "an";
+ arch = "linux-x86_64";
+ sha512 = "1899bd8140e847c6458b23bb0652bcfbc3cc1a6a9520ea10546d6b2f6719715f18ef5e79af07b68fe2cb5f50bb7f7c85376f17081478990a7ba907c45a31cc95";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ar/firefox-50.1.0.tar.bz2";
+ locale = "ar";
+ arch = "linux-x86_64";
+ sha512 = "d3c5e6c263ed1a0cbd535279d03a446ed6e59471c7949d381265056e7dc6bcb7df4abbdc13601b7b681185f66219676a6662e217510a13136d89dbdd6f8460a2";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/as/firefox-50.1.0.tar.bz2";
+ locale = "as";
+ arch = "linux-x86_64";
+ sha512 = "3b0112c8830fd9e90301efaff5d8414cc3edac9382947520ab1c283ebc4dd897ccc3102d12d35eee60fefbdd13329a02f056375fced5bf45a51895a7abeb48b6";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ast/firefox-50.1.0.tar.bz2";
+ locale = "ast";
+ arch = "linux-x86_64";
+ sha512 = "b036544990cc08fc0588730780fefe9bda82fa1ffe53b0d7cc0cce60f5fbaba261fbeb6117ecc4b18985751572a5c08f8cc30e9b35291841694a180e0d5e75c5";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/az/firefox-50.1.0.tar.bz2";
+ locale = "az";
+ arch = "linux-x86_64";
+ sha512 = "4beacaf3cf371bf7226095916f3e0c8f4941e32dc2ee6b25368cee6569dd102131cff4fef53f9ce88706172e838dc0a916bc741ae22bbf3eabe293fde3350e67";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/be/firefox-50.1.0.tar.bz2";
+ locale = "be";
+ arch = "linux-x86_64";
+ sha512 = "e249554f4ed1f1434b3c0b51736c9739817f39db8afd70cf60a7e3ce5a78dc6a23ae903b991f342bdb93b4324c5c5309bec4e84313beb5af94d887249619fa79";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/bg/firefox-50.1.0.tar.bz2";
+ locale = "bg";
+ arch = "linux-x86_64";
+ sha512 = "cc4ecea41635b921a652684d7bf10f2e200aacb0c18e50a95f0412c049db26042c0cfbf6d40fabd3db5aedd7ffdca4633827b5f17a27b56766b372420536b593";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/bn-BD/firefox-50.1.0.tar.bz2";
+ locale = "bn-BD";
+ arch = "linux-x86_64";
+ sha512 = "75483d1f7a5bf3fe54de817222f78aecd4621cd1a53c330cda74348ca6569bfe3bac6b60d628abe4632c0e68b9a9e6f0c24b69bb3ac09e52023ee352190d1cf3";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/bn-IN/firefox-50.1.0.tar.bz2";
+ locale = "bn-IN";
+ arch = "linux-x86_64";
+ sha512 = "5b378bc2874cc2fd0f3c739048c894670ed7dfb6e0f37e7de324261c5ed62bc75e62a26a1b2b4392858d86bf2314534841eb8676aeb0bd0e4ce6c23432b4b4a8";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/br/firefox-50.1.0.tar.bz2";
+ locale = "br";
+ arch = "linux-x86_64";
+ sha512 = "eb33bf820530e267a5b5c322951563cf66c886bd71f30d6aa8cc43a2a9b16b6e58d207648b68fb1f2c0d1fd645aba6292c6d8674a3fef7c23f3d2ef706973ab9";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/bs/firefox-50.1.0.tar.bz2";
+ locale = "bs";
+ arch = "linux-x86_64";
+ sha512 = "aaa4221204b3f736e31fee50c30e73a919066f8cd1f25bf4fc42532edd0a87c557a10f11e275e8b8d2396fe876b8859760d952a311caf0bdfd967e813144b86b";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ca/firefox-50.1.0.tar.bz2";
+ locale = "ca";
+ arch = "linux-x86_64";
+ sha512 = "e98b08fb0cd937375fd7473617fd234659fdd08d1299f0792efb9757b356447c479335bea765b0fad902d3b055569fe491a30b73d3f1c3d32c76c3cd1e621ab8";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/cak/firefox-50.1.0.tar.bz2";
+ locale = "cak";
+ arch = "linux-x86_64";
+ sha512 = "e8a5ec70d52574929edfe93064f03d254e894a790093b2ae86d3f34376db646366a6970d06eaf3f3fe5cfdc89a8f11d0c289061f41d66d7602c0a841cf589428";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/cs/firefox-50.1.0.tar.bz2";
+ locale = "cs";
+ arch = "linux-x86_64";
+ sha512 = "3b5e7ea9571eb8ec0f66ca9d062405e3efa874cfa6d39bc455a14f1f25ce1923b276272deda191ddec085d52042ca8cb633e89a8e908ecc428b0d8c3877b08cc";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/cy/firefox-50.1.0.tar.bz2";
+ locale = "cy";
+ arch = "linux-x86_64";
+ sha512 = "78b0e26cdff7f123c6ed3721066ad7f5e9f55d0aee5d1c87c12927ae87fadb8f3e1021193134a83fe5c23c62c68cd9536151999c1ed66a885e12a4dcb4b12fb0";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/da/firefox-50.1.0.tar.bz2";
+ locale = "da";
+ arch = "linux-x86_64";
+ sha512 = "de0f78b0d69c292c482edde52f728df7c3d865f31b8b9633d4ca5a66b4fc5f272402a0715baf5efcf14eba683f8ff633c172a5a198906991ff1735db128816b3";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/de/firefox-50.1.0.tar.bz2";
+ locale = "de";
+ arch = "linux-x86_64";
+ sha512 = "f95e36a8393d233409b1c3ae6b56b08fbc44d4603bc932cbdd1897650d1528f57cade92b1b1cf3717191c95db54380ba3c11fbb46b25c14a514e0a00fa5b2a3a";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/dsb/firefox-50.1.0.tar.bz2";
+ locale = "dsb";
+ arch = "linux-x86_64";
+ sha512 = "a06f9172490ac731f06701fb7f8414438c1e520bbe5669e8dae54697dc9cc3aa03837ee8f84dd1b69751a4e8d82b34f88ef3c43a37ad9fe6e0c8b1afd18956d1";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/el/firefox-50.1.0.tar.bz2";
+ locale = "el";
+ arch = "linux-x86_64";
+ sha512 = "78e4a2fc29487347eea47069e022f13482925ce15f37918455a96eb68fed50152ef6a9a93773c4acb680957eded79c0b20883d86f87ac28895d61d777dc07cdd";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/en-GB/firefox-50.1.0.tar.bz2";
+ locale = "en-GB";
+ arch = "linux-x86_64";
+ sha512 = "53deaf16fefcb954b34ce8577d0ff40d2d497c591765a16c7befa6ded348eb997e1523e873775a52a74e47c41ff06cbad3c612722036b6dce538d768d1659886";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/en-US/firefox-50.1.0.tar.bz2";
+ locale = "en-US";
+ arch = "linux-x86_64";
+ sha512 = "f81b63d9737c672958674096a69c941351caa335d481dbe39ebbe051153f0680f2d3ab4832267eb27ede36b8ce8242e43374ebb49d5cd3a0c44a813efa8c7a22";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/en-ZA/firefox-50.1.0.tar.bz2";
+ locale = "en-ZA";
+ arch = "linux-x86_64";
+ sha512 = "6e1247ccce230fd044f0fbc64deb345b7d82cd347595fee084b8ccedaf31071b992b988346a8bfc5e5af8a2706a47b7e4ce2681e67a11098eefb7895a73bcdd0";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/eo/firefox-50.1.0.tar.bz2";
+ locale = "eo";
+ arch = "linux-x86_64";
+ sha512 = "c27c51252c8312f4280dcedb94906296c52c96c26dcfa21fa392c80b0d1277b8d7507daca312c69192cfd6fa70273f66a3319788bc3ae8b8e835af365f3e8fbc";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/es-AR/firefox-50.1.0.tar.bz2";
+ locale = "es-AR";
+ arch = "linux-x86_64";
+ sha512 = "ece5c060bbc1809a5609dffbc477ad215245eef1e341232d2516859f1f15959d117e2728605ac57bc94fd6ff6a5b85a892275552ac0b006783d4a1d0f02fa26b";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/es-CL/firefox-50.1.0.tar.bz2";
+ locale = "es-CL";
+ arch = "linux-x86_64";
+ sha512 = "2df20afb64fa6d25678bb6dd91f7c042c754aa241af4e3f728d54526edc342b4e6e591d8586e9cfbcde5baeb932e092c00feabe5e3eff1f00e5065a80f0fd097";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/es-ES/firefox-50.1.0.tar.bz2";
+ locale = "es-ES";
+ arch = "linux-x86_64";
+ sha512 = "5b9af2b2664caeaa574ca92d4a63cd0a86a70278f63596e6a7fef0cab3fa4dd22d1c00408e067080979d9b9017f2edd9a3e1e22b3a75710017ef94bb1ba82bb4";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/es-MX/firefox-50.1.0.tar.bz2";
+ locale = "es-MX";
+ arch = "linux-x86_64";
+ sha512 = "610462c6841615e2241a3edde60333fe3ada9897dc7ec8bfeb1771025a5f9aa0acf9fded1459938c70c7fb478f659817606a133af4b38019a3dfcc7fd3b3f9dd";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/et/firefox-50.1.0.tar.bz2";
+ locale = "et";
+ arch = "linux-x86_64";
+ sha512 = "2fa4a1683102849ef33c7a149b7628a3c783ee2466d733b328fb8ea4e1ba96917b128a00ad9a8fb75cec181b0208635667bc16d959b28ac1a4af7c96af10e07a";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/eu/firefox-50.1.0.tar.bz2";
+ locale = "eu";
+ arch = "linux-x86_64";
+ sha512 = "0b53f26346f16dc06478bad62a0191fb2c9c9fdf2864e0d5332540eaa81a4c22b0492128df5c8d7eea9d122482986b3f97837538436730b4ddfcd1c02098d1ed";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/fa/firefox-50.1.0.tar.bz2";
+ locale = "fa";
+ arch = "linux-x86_64";
+ sha512 = "6e6d92624e89214a4110bfdfa181e46847759bb0735e18ca0fcd4b9e333b40b91f8ca48e271b3d1ff4fadc05cfce9824435dbc429f56dfecb6d98e48ea0a31ca";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ff/firefox-50.1.0.tar.bz2";
+ locale = "ff";
+ arch = "linux-x86_64";
+ sha512 = "59865504f50aa5e5aa2bfafa1159623dd54b91e3cbcc0cd76ae84e8da063e6db11e2594b9448e5ee75fdd15188c5ba9daf335eafa13601ad942e8f6f4d2bca26";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/fi/firefox-50.1.0.tar.bz2";
+ locale = "fi";
+ arch = "linux-x86_64";
+ sha512 = "6e07761ce3aa5e42bf887ff13a35619e3e20209b94ed890b505c1f0fd79712a2daeab53ea344378c18f6f05c4673e1f146e8f6a44d325ba387ea6967188357cd";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/fr/firefox-50.1.0.tar.bz2";
+ locale = "fr";
+ arch = "linux-x86_64";
+ sha512 = "0abd50bc0a7d5a79b98900cbeff95827c46dc53163ee6cc9220f234049ec43c09bbb8a283c54a1a41387be8d0ac761fd9e215d37ad234a0bdd088b07e339757b";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/fy-NL/firefox-50.1.0.tar.bz2";
+ locale = "fy-NL";
+ arch = "linux-x86_64";
+ sha512 = "2a272b160a2cde4d27f3f3da7a1d6600f4b78af11ecfcfdb3f3596d6a4a1f56b19cec7fee1066afea050b951e1eb7f3245dae28b0a91ac4110010c122609dd58";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ga-IE/firefox-50.1.0.tar.bz2";
+ locale = "ga-IE";
+ arch = "linux-x86_64";
+ sha512 = "730f2c608d9770e2e4c154d6f1ec223290018d2412a1a6103245a71ef17876cf304acbb16e11915cb2e3564c08099a9207839dc8caeb0553cfdcbb869f6cb09c";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/gd/firefox-50.1.0.tar.bz2";
+ locale = "gd";
+ arch = "linux-x86_64";
+ sha512 = "cde56f2453d780a9d0debcc012e9a139d61c1d78fcb2a4a7823982321fd65ffe6b538fbaa7a0e5dd69db6f1f3139e5386bd6e02ca5c065510a936fe35583872b";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/gl/firefox-50.1.0.tar.bz2";
+ locale = "gl";
+ arch = "linux-x86_64";
+ sha512 = "161ee7b027f64698c30bc5147599853c4fa6b8f8629d33e4f11380cf4431835489e834cc3a7b42a676d9da6d6231e1e1bdc5f81f410ccf8f55f33c5ec3e07b32";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/gn/firefox-50.1.0.tar.bz2";
+ locale = "gn";
+ arch = "linux-x86_64";
+ sha512 = "b4637e7727bc726acf3c1aff2c199fef896eb98f95a04b5b899b9800d0fa2cc6b23ae0c7b5a5acb591e49b03dcab22ef73840f129d9e82dc49e5636234fa570e";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/gu-IN/firefox-50.1.0.tar.bz2";
+ locale = "gu-IN";
+ arch = "linux-x86_64";
+ sha512 = "b8028122a8132110fb951175d51d07c685c212cc56128788c75bd0c0d21452752e4fd03e6345d80806c8babffeed04f7cdc89b1b338f7d56e539b847c0da7f72";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/he/firefox-50.1.0.tar.bz2";
+ locale = "he";
+ arch = "linux-x86_64";
+ sha512 = "57adfc574ca5160ca5f95f98c76542109dacef231ad8cbcd4c75467bb599e922d6590cb3214f4e4946a947b36e6130b25f12cf4c641b2ca91a36aab5e8489426";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hi-IN/firefox-50.1.0.tar.bz2";
+ locale = "hi-IN";
+ arch = "linux-x86_64";
+ sha512 = "3a71226d56c373663401d144388d5c74e583ae34b4d05bb444703426991162392e338f11e993707a83943c0fe85b8a5192099b932afa03b9d3ff6a17903b1271";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hr/firefox-50.1.0.tar.bz2";
+ locale = "hr";
+ arch = "linux-x86_64";
+ sha512 = "f919ce865004a64bcfd834475917ba24c1bfe0bf573e578984199085c073abcfce38b4e838d684f4cdf5bbc2408f84758df9f81345da6e0824f290ad311dc6c3";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hsb/firefox-50.1.0.tar.bz2";
+ locale = "hsb";
+ arch = "linux-x86_64";
+ sha512 = "4641225b3dcf328dfbe12af68698a4504d0882c1029a36aa617f57ddf11e0edd9cd10add1d887d2154a59e6fa60bb8b13bc185529df166c72195200ef94a5dd4";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hu/firefox-50.1.0.tar.bz2";
+ locale = "hu";
+ arch = "linux-x86_64";
+ sha512 = "1f34d1d52d28413a46d5f9efa8d8067c41ec5af861f9fca49a5b59f03e6e325455883a2ee4f9c5e3629d7a61a3f1106f24b4bf4f9a75e6659cad4ec511024ce7";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hy-AM/firefox-50.1.0.tar.bz2";
+ locale = "hy-AM";
+ arch = "linux-x86_64";
+ sha512 = "926a0a1e036303c53fb0a5c65ec2a0285d562c86eb7396f84fa5926a3b9e67ea7872af6d8d436322ca5a939d1626adad80230abfecdeefd51d5cb3b27e16cd5e";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/id/firefox-50.1.0.tar.bz2";
+ locale = "id";
+ arch = "linux-x86_64";
+ sha512 = "f3389014409d143a35c66d57974a77d1d811c3ff9d47f6f13b7c40c0f24154d42bb7e4908589de21b3430d44a108f3765792f7573c78e510292d824f96cc77e4";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/is/firefox-50.1.0.tar.bz2";
+ locale = "is";
+ arch = "linux-x86_64";
+ sha512 = "58f320b32ba9a83a6a8a4f4d108c3bd87a4879da7205dfae59b24a3550e0bb90917b431b15a18e38da0d702ee8f2c8756179ea07082ff6e0aeae9f51a3820246";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/it/firefox-50.1.0.tar.bz2";
+ locale = "it";
+ arch = "linux-x86_64";
+ sha512 = "60acfa5b847b5390fb5b733f4a35a0a9c426c4126c53f517eae3e6fea3c6c7c88092063ae0d5d3be05a1dfbab32a1e392aff7f18c6566f827cdc6d21b0e22c7f";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ja/firefox-50.1.0.tar.bz2";
+ locale = "ja";
+ arch = "linux-x86_64";
+ sha512 = "3d668102a2f56547b49add2dacbfa1a8ac285007d47585325002cf4250465dae809b50ff1d1d13dcd3f05ce6afaf76b607a696004e60d33caf52d2d531297550";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/kk/firefox-50.1.0.tar.bz2";
+ locale = "kk";
+ arch = "linux-x86_64";
+ sha512 = "c35217a07255fcac9bdbfb52777bae3609c22984733297722c62b8391350fe2d68bea20b542d6d2d7f55fc18aa662da226bf83a62e0017c315b92eb460021cac";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/km/firefox-50.1.0.tar.bz2";
+ locale = "km";
+ arch = "linux-x86_64";
+ sha512 = "fab7429671c3b866ddb7fd0d25101a4a83c6a1ee3822a57517b9c6288e35f6a4339f5a42d93f865a9c6ddf1a9bb5e2e23d8458b39acc34bc2701d68522feef03";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/kn/firefox-50.1.0.tar.bz2";
+ locale = "kn";
+ arch = "linux-x86_64";
+ sha512 = "2ea7a6094ad8f9b8179028820d79d003f5c04e9bd223fd2df19c7b5daa08ba631176775e9586c7507291aa34fc1c39510bd8851b1fd9a7a08c1786f689949839";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ko/firefox-50.1.0.tar.bz2";
+ locale = "ko";
+ arch = "linux-x86_64";
+ sha512 = "701a0873b860c62d18ab778d1b0e5c3719cd3e6b49ca37083983f9e3f988d54ebcb2ff27138d7a5e76c940f64f445f96143b0f836af4b9611999b3f49670b8c9";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/lij/firefox-50.1.0.tar.bz2";
+ locale = "lij";
+ arch = "linux-x86_64";
+ sha512 = "b394da463400ebbcb77cda8ed102f42eca419e896f0b95432e565f126e9e20aee0d9790888c691b9f7291322a3f49d44a58349f611ffc159d514a5a68f7013f4";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/lt/firefox-50.1.0.tar.bz2";
+ locale = "lt";
+ arch = "linux-x86_64";
+ sha512 = "55ac32604ec630d2540a7cd2d2a46c4161650f1a3607c2e45ee8006e6bbec0039dd4927ef28c9efd70961f7f5c4d9d6fdc83dd60b670aaaff26c31594c25c813";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/lv/firefox-50.1.0.tar.bz2";
+ locale = "lv";
+ arch = "linux-x86_64";
+ sha512 = "df012ca9e5026661622b1d0a1230399e970809f2d8f9a3d81a9b05d438e7f20c706cbf739a229b82296db15bf8bda89c266051c56c7786a673e38600bfd81164";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/mai/firefox-50.1.0.tar.bz2";
+ locale = "mai";
+ arch = "linux-x86_64";
+ sha512 = "df74e2c1465b74602ba834cedbc3e07671a813d5979e6a0d85c32e504e01136a05f4915253f785f0b03fa98a4c284d066ff2101737f40490bfe9e30165b712e0";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/mk/firefox-50.1.0.tar.bz2";
+ locale = "mk";
+ arch = "linux-x86_64";
+ sha512 = "68d80303625c9bf86bc2b86a38d9a41643416bea77445630b10a4219d725a9800fbd973e683c7dad46941fa089df6bcf1d07ba5fcf2c3739eede865eed038a97";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ml/firefox-50.1.0.tar.bz2";
+ locale = "ml";
+ arch = "linux-x86_64";
+ sha512 = "bd1168a7b3e17edc28dbc051fb2951d134c85637b0e0bfa2ac2542211498a8018f8c8a74584d2ebfc24336dc803ec04bfdb11d5975f261f8ad92cdda6dbc1067";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/mr/firefox-50.1.0.tar.bz2";
+ locale = "mr";
+ arch = "linux-x86_64";
+ sha512 = "d62ab5e147d55ef1b02b4b4fa5b10986f4a8db2c6154d519f4704a6ad4eee99235219b5d825571c8e08128ecac84c1ec0dc19d124c83d608b4afb4606786e474";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ms/firefox-50.1.0.tar.bz2";
+ locale = "ms";
+ arch = "linux-x86_64";
+ sha512 = "e254c8a787f2dda76cc2929665b261437d35351d6725af6d1dbdcca514638800d199827edc8cfeafd927d4f0f758cd246ac47b9cef3011aa68fb0baaaa17c882";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/nb-NO/firefox-50.1.0.tar.bz2";
+ locale = "nb-NO";
+ arch = "linux-x86_64";
+ sha512 = "b9e53d23338b7d825e0eebce3764862abacaceb5bb40f66c3d0d67a3fffc2c1f60c168385537bb042bdc45d77453977ca3c95660cbe3a27c7c87b68d047ea782";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/nl/firefox-50.1.0.tar.bz2";
+ locale = "nl";
+ arch = "linux-x86_64";
+ sha512 = "0c8de38bdb5ee3636a7a633c57e9e3445374514014221086b9db106247ca08111c987aca889a416997ed6678cae81d1414636d0fc9ff4e490444041b53cb54d9";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/nn-NO/firefox-50.1.0.tar.bz2";
+ locale = "nn-NO";
+ arch = "linux-x86_64";
+ sha512 = "4617abaa89c7caaf9481aca13e61629619b1b4a889a2ed652434c8c01d5b8ad9ad96de167f9d3687d303a8aca49492d7b6d7712f9497ae017200962cb229f855";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/or/firefox-50.1.0.tar.bz2";
+ locale = "or";
+ arch = "linux-x86_64";
+ sha512 = "27df7d794fa1693fb79aae60ec72004cdc3fffa9eeb0662e71aeb639e46b6a4c740e08227e5e334e6c0167aab95de6310f3142bcbd3eef089dedd5eeedd29f8e";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/pa-IN/firefox-50.1.0.tar.bz2";
+ locale = "pa-IN";
+ arch = "linux-x86_64";
+ sha512 = "33101ba56588e23bb5cbd66bf8fd90e66e2fa382f4fa6b3b5d9fc6a1372957ff4e01a7a01b697ee694c589573c9a5f1e605f205bb17ac63c5b5faf8545879376";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/pl/firefox-50.1.0.tar.bz2";
+ locale = "pl";
+ arch = "linux-x86_64";
+ sha512 = "373d3355e980a3dbed1cdf8099ba31e370b270402181e61f6e1a829c2f2d9b7b73a9ebbe074e59f21ac3f934898c9c23adb0a5c09c7637fb6c67c3093bd46fbd";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/pt-BR/firefox-50.1.0.tar.bz2";
+ locale = "pt-BR";
+ arch = "linux-x86_64";
+ sha512 = "ccd935e398095d3b79e2a86b8181e1aa1988fa6a1e12c879d50457756b62ab3dea3087e8de77c7cd98dead6b0078598d22ead36285559af041254bdb454eafad";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/pt-PT/firefox-50.1.0.tar.bz2";
+ locale = "pt-PT";
+ arch = "linux-x86_64";
+ sha512 = "a8adaa40a2fa564663173641b3dc3d5642c8c3909a8c14904213c9e1cf9bdb4f03dbd44412bed023b02e6eae63bf56fcadfef0907a168879121811bffb9b9ac4";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/rm/firefox-50.1.0.tar.bz2";
+ locale = "rm";
+ arch = "linux-x86_64";
+ sha512 = "ce37bb7d969c0fc31c2bfed7ac143e5a6d7d8035a748c5b3eb9a23dc62917ed9ad9b028a9db0b5dca156eb99cb36c763eee39ca893e5a314233e5bf4ec4dbfee";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ro/firefox-50.1.0.tar.bz2";
+ locale = "ro";
+ arch = "linux-x86_64";
+ sha512 = "339120884b8add14d36fdb3fc3ca1355074b0f8a0a87577d1616c392230342c7361859126edfd959e11ebabc6b86c496b440acea679c61e07df59e7e298c47ae";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ru/firefox-50.1.0.tar.bz2";
+ locale = "ru";
+ arch = "linux-x86_64";
+ sha512 = "59ade7f2ef86f412fa376e4fa6a9d7e72cbfabc10e687c7c0bb7e4b4bc2324d7e97e86075c1d7e12480b9f1dd8bffb5e4723f4183882976cd35c4ccf6f2b4726";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/si/firefox-50.1.0.tar.bz2";
+ locale = "si";
+ arch = "linux-x86_64";
+ sha512 = "4a74944879e40876515e03b1dc2261998bfa2264e074874f886a979de5b48e453c7cbd9a020e8854089b77ca5b5182fe13c685b33991e81c7c533246f87825e4";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sk/firefox-50.1.0.tar.bz2";
+ locale = "sk";
+ arch = "linux-x86_64";
+ sha512 = "b1440e76e19ef3ed6786f9a40330881bff498c7ab20030189c3eaed293e1ffdf991172251da1ac5d512da4897f2a46f3e0921436d86d9178d96387e33e82708c";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sl/firefox-50.1.0.tar.bz2";
+ locale = "sl";
+ arch = "linux-x86_64";
+ sha512 = "abd4e6da09005698655e2fb2bb749be35f8b9e8302ba1068e20d27e158c4ae57a0f1cb277a87a2229e4e815cd9d4656ab32cdf0614c01deab572e6c8749d4fb2";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/son/firefox-50.1.0.tar.bz2";
+ locale = "son";
+ arch = "linux-x86_64";
+ sha512 = "17d0444a559c7a5331b93bd314003d84f853fba791efc2df6867becabab9fb7d02bba964d208f44f31af1dfb292cfcbd4de7b48454a7e83668bec26139be40b4";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sq/firefox-50.1.0.tar.bz2";
+ locale = "sq";
+ arch = "linux-x86_64";
+ sha512 = "c416060454550ff04086aba74173500a41c4e592246eb524e682f082a75173a6752e982993df3ca096c176c0a75ed5f26a22414df5e794a042dbeb2a0de22413";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sr/firefox-50.1.0.tar.bz2";
+ locale = "sr";
+ arch = "linux-x86_64";
+ sha512 = "f615964e4d87b74dadb841993b3c62d6d683a66ff6ed1634311f58e9c7dc522ed9f2a271a043f7ebaff37f3c1a563d862d7abf22af1015d720979f7459e2ceaa";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sv-SE/firefox-50.1.0.tar.bz2";
+ locale = "sv-SE";
+ arch = "linux-x86_64";
+ sha512 = "4aab1caa825e685923c7c3a32ecf664e2e8cfc2389f48980f51eddaf696cd9056afd944a950dc60987adbfe977d22fab4c994c3aebe1d14c7514369f6898aa7b";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ta/firefox-50.1.0.tar.bz2";
+ locale = "ta";
+ arch = "linux-x86_64";
+ sha512 = "6e556f182e0652b79c338fb0d7bfc9da9eee5ef5c68115e748013404ba4409dbf743b03f8722b36ace38a8732924bb426e7a7af5059256ae1f0065096e68a661";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/te/firefox-50.1.0.tar.bz2";
+ locale = "te";
+ arch = "linux-x86_64";
+ sha512 = "ff201a9e66645e148ec740921a7bb1d1b9ffd4b6200d98d06be0f235e829c6a355be0615341f899b433836fc2f2976223a6e46c4f5172590b5254a26f4998959";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/th/firefox-50.1.0.tar.bz2";
+ locale = "th";
+ arch = "linux-x86_64";
+ sha512 = "0e9d0c10f21d3d41825194a3afe21cf4281cbf5825839f908d58821d40358ded4226b5dbe7a094b95aa087769de6179331a19a2fe780b4ee56c74ce137a33ac4";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/tr/firefox-50.1.0.tar.bz2";
+ locale = "tr";
+ arch = "linux-x86_64";
+ sha512 = "299f07161a3439902110d8929b5ffdc332562b956d25999235b3e212241d95ce94646ba3542d7138c6ac5bbbe274c614d2f49aca8a674d252b240265397fa48b";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/uk/firefox-50.1.0.tar.bz2";
+ locale = "uk";
+ arch = "linux-x86_64";
+ sha512 = "f108296c0aee994d558cc422403f45c994d2878b69180d3cf526abe4f5b29d8dc59ed9c58f72a0d21d2550a4d32869b96ae43a1ed251e885bc7abc47b22c3894";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/uz/firefox-50.1.0.tar.bz2";
+ locale = "uz";
+ arch = "linux-x86_64";
+ sha512 = "293e4d99572a22dc053cdc8f5ac40338eadcbd622ee1d47c2bab9914ee1d2507e89a8b4340a12d64c0c4b37f4ec312bcf94921184402852c2a7cb114da93983f";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/vi/firefox-50.1.0.tar.bz2";
+ locale = "vi";
+ arch = "linux-x86_64";
+ sha512 = "24355d25ecae3e5f18a0f3c7b87dcec8c18077292329a7ea38e5e9411c38812f394656d79f3fa653a70770ae136b3f5fbd1644a7657f448dfa78f8e795de5afb";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/xh/firefox-50.1.0.tar.bz2";
+ locale = "xh";
+ arch = "linux-x86_64";
+ sha512 = "0c917bc8cf0a5b66f85cf1511d3fb0b2f4c4bfaa10883d277e6d4bf399b4b359d8ec39c4fcdd6dd23ba3645047318eace530527796b4be58058cb15de69853f4";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/zh-CN/firefox-50.1.0.tar.bz2";
+ locale = "zh-CN";
+ arch = "linux-x86_64";
+ sha512 = "ceb0d7404aa7d8295920e99ccc77e2da7db6101af92d29dfc3c1f2cb4689b582542d154cbc749ad3b7a744f545ccc39e479db4fbe2c7d18c98bf3bf412eccc46";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/zh-TW/firefox-50.1.0.tar.bz2";
+ locale = "zh-TW";
+ arch = "linux-x86_64";
+ sha512 = "e942d5d6b8891d062b452f1a083de2849cc69ac45801aee0b5c413a786ce9d67555d94416d65fb6bb6e4b74cf11ae75a1036dfc661b50fda10b95febd86a80a2";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ach/firefox-50.1.0.tar.bz2";
+ locale = "ach";
+ arch = "linux-i686";
+ sha512 = "7546a3fb1cd0e06c9f6916c668cedcfa4671bc15a7ece8ed3ad8ebd1bce5c6ac84e2e024d7e2149844f1797d66374bb2c8769e67d1c4af941eb626c610c433f2";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/af/firefox-50.1.0.tar.bz2";
+ locale = "af";
+ arch = "linux-i686";
+ sha512 = "a6981413d7974e2ca13ffce9fc65c0f69242d6c6bfaa6253fb13fd8fc7e62059df718b4722a7a879dc8e352fd94dcf74db41765dbafc277e8debdd7e35a1242c";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/an/firefox-50.1.0.tar.bz2";
+ locale = "an";
+ arch = "linux-i686";
+ sha512 = "e123cd3a8c9c8657f09d198b7f113b84192174b021dd816b82ee4497e307794bda1399e5425456c2d990788340a58831cd261a4c5c67e5b0ea3daa3d0ac65f65";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ar/firefox-50.1.0.tar.bz2";
+ locale = "ar";
+ arch = "linux-i686";
+ sha512 = "618b9c24d37f4b82b1e51a5ceb5b2d3981c764f906e7959eb346adc5c974e464d4a691e50acdad7f9e0cfa5855afb6157e8ab600d22266a31fa444db9b7886da";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/as/firefox-50.1.0.tar.bz2";
+ locale = "as";
+ arch = "linux-i686";
+ sha512 = "93e53546ca9fc554decc0c1d6590b5b84a433ab392abf9fff9712d4432bfd47a1cc57439fc65ae9be91da6d38dd462fbb81fdd7304424e42d08eeb600d298eab";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ast/firefox-50.1.0.tar.bz2";
+ locale = "ast";
+ arch = "linux-i686";
+ sha512 = "e1115994008db11f3c69679372a3f07b6edde23dca20733b7f06a5b0c63dad2a264c02e9f94dc74976efbb3961155216111522c3f1ebca91929ae356f8218c87";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/az/firefox-50.1.0.tar.bz2";
+ locale = "az";
+ arch = "linux-i686";
+ sha512 = "93be21a2a79d2f4cb2fb5132856837b1ac8d44c699faf623d076b95b5e61126ea540bcabbf57e2752b49cc7b5116f3345a2a78cd07104d873afc2e2127f64224";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/be/firefox-50.1.0.tar.bz2";
+ locale = "be";
+ arch = "linux-i686";
+ sha512 = "ca41cbbe732e8e754cdb0c832ca7820d5320a8106bbb3e5d753f4a7f6eb30045b81cd84191f868076e0edca68e35b344d63ececa45eabff7102fe82c1ca19e61";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/bg/firefox-50.1.0.tar.bz2";
+ locale = "bg";
+ arch = "linux-i686";
+ sha512 = "4e0a3ff42a8502e07afca92ff98ae675213527e68c3907b177e53a580e0391c075a41ba4e5b87c27558f86b28c1abe2dcae191334c737d37bdbbfb25c33d0024";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/bn-BD/firefox-50.1.0.tar.bz2";
+ locale = "bn-BD";
+ arch = "linux-i686";
+ sha512 = "602cffffa7ebf0f53f3e466d3aa5d8f203698db16089e83c893092e9a0841a9a8ec6a46aa5df1e2fec020cd8a7345e4fe86fc20797ad65bcca56bb2f391390ef";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/bn-IN/firefox-50.1.0.tar.bz2";
+ locale = "bn-IN";
+ arch = "linux-i686";
+ sha512 = "2f7ab4b093b8be7dfdbdcf2faad88eb99e8b0e19ebc17efba44d46a332754fcf16e9317398e88c8eea73680ac85f08d2f0a99768fad160d79102e8e1fd6fb8f2";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/br/firefox-50.1.0.tar.bz2";
+ locale = "br";
+ arch = "linux-i686";
+ sha512 = "abc0fb371ae3144fcb3a5130b13c376169d8a3c3051493fb5fece9a4682757c42bf4717b6494d4220daebc3f1560397f1263706e2a3871d7ee5c0135cdfbe1a5";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/bs/firefox-50.1.0.tar.bz2";
+ locale = "bs";
+ arch = "linux-i686";
+ sha512 = "f62657ff653edae873269a4113a93dadbbb36920e9e30ff04407d28f755bc04e35223031a60018e69cd4c3b891511109b66e7baa83656b0ac37ef5e334f3a89b";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ca/firefox-50.1.0.tar.bz2";
+ locale = "ca";
+ arch = "linux-i686";
+ sha512 = "bcc4184d882075eb2ea875c7493ca4f276796672a029ab161b4f2168e879b46a6fef454e04e53531a32ed5bf82178d8d2ef15f9e43679625e4f7632e7cf51f32";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/cak/firefox-50.1.0.tar.bz2";
+ locale = "cak";
+ arch = "linux-i686";
+ sha512 = "88448d8c17235e318628bed05d607f30ab9db4e05f181a36e39c02f2df840a10990a534d5d5f8e16fdaeecfbf3e51bc7cd9f45b8a84b3447132bb57a87c4e2d3";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/cs/firefox-50.1.0.tar.bz2";
+ locale = "cs";
+ arch = "linux-i686";
+ sha512 = "acb9fe18d8a5fe97cdeeea24e8a6e56895a3be16c6a5f2099a69c32768e2f76a2c0fd081d3759a2c87d002ea5021dcc5f806195d3bed06e8514c383ee8bf998f";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/cy/firefox-50.1.0.tar.bz2";
+ locale = "cy";
+ arch = "linux-i686";
+ sha512 = "89119e29496981f8ebc85d512e5d58d8bd3678cc8ea4c90e544bde60881cf5f768b4060d710f8ba4d61dfbd7299a4437f5e7aab1140a03cd498af18c480e0b4b";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/da/firefox-50.1.0.tar.bz2";
+ locale = "da";
+ arch = "linux-i686";
+ sha512 = "285363c04cb6506400077f36867a65372fae80ca6b3fbed88be219c3814d3f38a650c78f36014ae205ba9e5167b5291353c799b918c8e2bca6f23374094db209";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/de/firefox-50.1.0.tar.bz2";
+ locale = "de";
+ arch = "linux-i686";
+ sha512 = "ea470ab934f49ff79b8cb04809f5605edb70d3ea9bc997c01802f09e3fbc8d045bb322b97b729916b6371b047f3b4ac14b25dca8e8befea401362c2024a2fa13";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/dsb/firefox-50.1.0.tar.bz2";
+ locale = "dsb";
+ arch = "linux-i686";
+ sha512 = "74bb1ab27970819fd9a368ac5f9a14add5378d9a7c39707e12146ae8082f39593ea53b5dd730708764515b0177d7ddb675b04a8a75f259303d30f281b44527cd";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/el/firefox-50.1.0.tar.bz2";
+ locale = "el";
+ arch = "linux-i686";
+ sha512 = "3d3eb83a16c94eaa0bcb8627239b74c0a261189b67b917d4e2fa9ac538ea353a998b691350797470ab8ab4a5effc65a35a36e4b3d372895bd691c63d439a4c9f";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/en-GB/firefox-50.1.0.tar.bz2";
+ locale = "en-GB";
+ arch = "linux-i686";
+ sha512 = "23a75b31d461ebb0a3960c6235b6c77471f3687e76f154c8d1fc8cce40ba571a9699e19a5310faa55c52b243e6fd88ec76ccbcb93dfa8b3521493805ca852d57";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/en-US/firefox-50.1.0.tar.bz2";
+ locale = "en-US";
+ arch = "linux-i686";
+ sha512 = "b1667f7c235b3fdbd3a2c3ee6ddd7976b4142983393b0b8e0443896cd0929d7a43ca484ba5922340410fa3c4868f555a4ab581c9664281a31b912c1922a1dce5";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/en-ZA/firefox-50.1.0.tar.bz2";
+ locale = "en-ZA";
+ arch = "linux-i686";
+ sha512 = "78238141da05b61b797440a04973187bbfb4d3cff7830385e163e8ccaa603368910be89ee7f2f4e65a47a6917835dff8f840a77a507c3ff0242baaf1b7cfb4f4";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/eo/firefox-50.1.0.tar.bz2";
+ locale = "eo";
+ arch = "linux-i686";
+ sha512 = "af424d87210909ad480823d56f20327b0e7879bb0ce7ab43994870a69e6e91b3181e480dcc2610064f276ccfccb71badca135f3d8e00ff16947c220dfe67ee82";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/es-AR/firefox-50.1.0.tar.bz2";
+ locale = "es-AR";
+ arch = "linux-i686";
+ sha512 = "cca38288b4ef6de4c7469cdcbd7cc29715993ca69c39febb877691b2368182a0efbb0111b45bb5a7ddf47b7c70f20638bc6dc7d6fcd46f8d8127d36bc29da3e3";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/es-CL/firefox-50.1.0.tar.bz2";
+ locale = "es-CL";
+ arch = "linux-i686";
+ sha512 = "104a3fa6bdf86e0e70c54bfdd8c0d388a8e91a9bae0ef973fc043247907295cc5f53c44f414fe8cd6e2f17a02eae14e366fa8c11ccbb45df2055813b17fd7712";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/es-ES/firefox-50.1.0.tar.bz2";
+ locale = "es-ES";
+ arch = "linux-i686";
+ sha512 = "be847e51e78991ac739bc32fb29cc0cc166f12f02b5ada4d4656d3447379eb9cd10f80391433607fb63e971d54a48591d60baa5cb963421f1934033e08525d7a";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/es-MX/firefox-50.1.0.tar.bz2";
+ locale = "es-MX";
+ arch = "linux-i686";
+ sha512 = "7a7464de3223e9cf1cd0f6b7767ea0fb7ee8db0b3b2c3eb9d284cd5ee8db77b9b0ec3c604625c8c6ffffc41bbac4ea47543c1508f7f8aadbaaeb9954b7e62247";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/et/firefox-50.1.0.tar.bz2";
+ locale = "et";
+ arch = "linux-i686";
+ sha512 = "907612ce5691ec5e4647e943ed58d437db872551da8490af3e5f7af44e7d9ac78a8c5eaf721f719af782c8b202aa24ee6a87640e54323b5eb823dbee39b2903b";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/eu/firefox-50.1.0.tar.bz2";
+ locale = "eu";
+ arch = "linux-i686";
+ sha512 = "29c76a0f49d87d162749f824e287f2c1b37cab465cdd5e5e991ce429273d492fc905772c25f4c812c6fb899249a9bb7346eefc91af9f642b4acdc70d3af6f338";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/fa/firefox-50.1.0.tar.bz2";
+ locale = "fa";
+ arch = "linux-i686";
+ sha512 = "0deec5372d5876861af20a60d8db9d4c5aaef8c133c81bc3af6d85d2de528f96ae1da7f5fc78a9bf34bf06d9121fdb6d74e28ad40ae2b7fc23b4a0c161e09722";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ff/firefox-50.1.0.tar.bz2";
+ locale = "ff";
+ arch = "linux-i686";
+ sha512 = "07c87801154ce44d37b1a477850bf9568651beabb4004d7cfe427c0ecf75fc85da91cffbbd60af773c8b3b7cd30e10937c9ff2fcf65409faf2dd194694d9b6c1";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/fi/firefox-50.1.0.tar.bz2";
+ locale = "fi";
+ arch = "linux-i686";
+ sha512 = "310b71c8e46fd7ab3127cfc0743c1d98ede8adbfd01a645089cb6e5752e8ff4e3da9f8f47ab5fd7d06284b3fd76b9780d60c2898d0868e30a76dcebf35c24b05";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/fr/firefox-50.1.0.tar.bz2";
+ locale = "fr";
+ arch = "linux-i686";
+ sha512 = "1bc1e595f12d04067b9985be57fe4ec17de89069e4d6b780c16231c4ea195fa0cd8e6daece265335fa56ac3dae9d94c3b76f93199cf1e0946f6d6ac75bd01a1a";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/fy-NL/firefox-50.1.0.tar.bz2";
+ locale = "fy-NL";
+ arch = "linux-i686";
+ sha512 = "d07b171d615306c6de663f4592450dea92cd7298e6994ea7fb5d55f01f260c2b66d1b4bc4109f44c3d007107c78feccaa6540ddb14dc8666e0192ff3978d8f5f";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ga-IE/firefox-50.1.0.tar.bz2";
+ locale = "ga-IE";
+ arch = "linux-i686";
+ sha512 = "1c234083d098c52a7597dd727c246ea6dfc177edd1e4fc021ad5868ce9082353036d78b9297503a5eb14dc8d500a7a2549d771ea2d3c849817ab791329925d25";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/gd/firefox-50.1.0.tar.bz2";
+ locale = "gd";
+ arch = "linux-i686";
+ sha512 = "0e88344c58c1b2e63b765949db63ed9e874b23e382f9fe833206cadde1d6c32d804d68a22f17741cc7964773858fa7adb6a6a42e7ed56dad54f2d7d0a71dce08";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/gl/firefox-50.1.0.tar.bz2";
+ locale = "gl";
+ arch = "linux-i686";
+ sha512 = "244cf85b95f4a1eed0369f4f41ba870f4a3fd48fd85979b005ffc19ab4c03e52da87ae8687f5e3048c33599baab46fa8ed8274db5b180936076fd63e02b955b2";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/gn/firefox-50.1.0.tar.bz2";
+ locale = "gn";
+ arch = "linux-i686";
+ sha512 = "20d51aefbc2f98f83fafd23a5800840d1bce7f0688f76d0ef322b2f1dfe44e75fd82c39fef23cc9afb15faa41514f29f8313748a2e969e2051b3824962de6e56";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/gu-IN/firefox-50.1.0.tar.bz2";
+ locale = "gu-IN";
+ arch = "linux-i686";
+ sha512 = "b07adecbbf8aaa8dce8e7d8e03b86d5ce3bb97646404433d89d82832e692efeb532df86a5a4276dcf1f63c705507e0d87f3d72440c49e5d70c9a08968f75fbe7";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/he/firefox-50.1.0.tar.bz2";
+ locale = "he";
+ arch = "linux-i686";
+ sha512 = "a6d9a10704ad4097af79ee05aae504a9a6ff109192241cd99c3be665f0adaffa6e5b7b39da859d61d9294cf899a5496ce0c82ac4012a318ad4aa96d6418f380f";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/hi-IN/firefox-50.1.0.tar.bz2";
+ locale = "hi-IN";
+ arch = "linux-i686";
+ sha512 = "6d78b83b289abf37267b08c72c3b3c42005ddc2f2b13c846012f342b16a3bbf9a891fcd6e24af01160d1749c1b7e76a9f62060970d52144405e4162d4c6297e1";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/hr/firefox-50.1.0.tar.bz2";
+ locale = "hr";
+ arch = "linux-i686";
+ sha512 = "e70daf40c8a0885c344a01d1cde03b34af23a2d9c76450f0723cc5ec1b577251dfbb8bfacd3eba866953c5b3dcd2974456305a9e171025cfbd43416f679f1cc4";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/hsb/firefox-50.1.0.tar.bz2";
+ locale = "hsb";
+ arch = "linux-i686";
+ sha512 = "8c137a61cb020dbfb1d73a698d76c4921c9a1dff5f836185caba29c22c81c7c0683cb4139b0642d4bf408e01d498de46022c36de78a3c0413eae048f2be69e72";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/hu/firefox-50.1.0.tar.bz2";
+ locale = "hu";
+ arch = "linux-i686";
+ sha512 = "1630ad84eff835e1f56e424000515e37d52a268ce569ea12fe5abb8afde231f2aee2293046ee8aeb338ccd81ec98c92246f4b62e000ece032349eedb2ca3bb82";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/hy-AM/firefox-50.1.0.tar.bz2";
+ locale = "hy-AM";
+ arch = "linux-i686";
+ sha512 = "dc2359753972d1eac82bc357461331d69e52bde41736ab5c4bd590491add2b592bd3e4f15f32db94922afee84af04500928ece6be14071b10ad1fc4c8b82314b";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/id/firefox-50.1.0.tar.bz2";
+ locale = "id";
+ arch = "linux-i686";
+ sha512 = "61717f0c508b61b874080e21f7cf22283b1d123e2301490af409c710ee612ee8e0e7709f3bee20891c0a76b3b2de05b4ba94885d1b3813e6612a1dd1f871d34c";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/is/firefox-50.1.0.tar.bz2";
+ locale = "is";
+ arch = "linux-i686";
+ sha512 = "57d649dd96889b533c336078b4d2380a8417a1f77e40379d51a80518ffe2024a303c2b9c42861436425098cbf2e328264972b82039b9fe13054ae3d33a93e737";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/it/firefox-50.1.0.tar.bz2";
+ locale = "it";
+ arch = "linux-i686";
+ sha512 = "b8bb4e379f4e21bdea2190695b0f74c23b72af5c6149e8790a433c09cbe3ee170fc68a375b71ea112d15eb00b948b6c30466fe382f86e8c5da85ea7479b355ed";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ja/firefox-50.1.0.tar.bz2";
+ locale = "ja";
+ arch = "linux-i686";
+ sha512 = "287d4ba06988e7a6022fead8af2d921fb761222cd0cbaacb7136c44e397b4620a6129f59f97d98d8a992caaf203e7c8fc130aa4e5e9c58b13a2700f63d786497";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/kk/firefox-50.1.0.tar.bz2";
+ locale = "kk";
+ arch = "linux-i686";
+ sha512 = "f96a9b418849234b41d181ad141dbb030a8b2f26e73944694c5a805a21778d708862df988dda8ab8fe28eca0aa342153db84d6af971461f0eb8072590445ac15";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/km/firefox-50.1.0.tar.bz2";
+ locale = "km";
+ arch = "linux-i686";
+ sha512 = "63af9259f4326d4dc356513203646712f26dd992d2150d58c4f1892d76f0a3944063dbfec0db68f67d20538aea3247313357e5a822e0a8507bfad2a7209067d4";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/kn/firefox-50.1.0.tar.bz2";
+ locale = "kn";
+ arch = "linux-i686";
+ sha512 = "afa965fd87ca7dcf5217011cf0aa53d89e1656d64cb8ad973a149eed3897eb577bdbe3359a5310bf9e11dc6e927883c08fb7ef069756313dfc75850378ae7820";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ko/firefox-50.1.0.tar.bz2";
+ locale = "ko";
+ arch = "linux-i686";
+ sha512 = "724726e85066350ba9fb0254462b198e198c20970664737c925ca41a474ac4070d2e746b671e8583339fb1935e9a05d6191856f5abaa6e23413efdb707d34d19";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/lij/firefox-50.1.0.tar.bz2";
+ locale = "lij";
+ arch = "linux-i686";
+ sha512 = "e17504c60dcf3eea34c9525b3ca537656fabf90a7d888284cd5ac014a939565ba50e8b3d0fd1c936dd5be1ac59ee9f61e2de22b5b1eaeb12fca0f59a094a06eb";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/lt/firefox-50.1.0.tar.bz2";
+ locale = "lt";
+ arch = "linux-i686";
+ sha512 = "00689c1e19f748e5676ea3b8ed0076f6a63698c57b171eb771d45e9d9ba5bcf359eeb827f5791c96ca6a31eb9ca166208fc63b4a211676b466656e537323719d";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/lv/firefox-50.1.0.tar.bz2";
+ locale = "lv";
+ arch = "linux-i686";
+ sha512 = "1218ec478e28229f0ef8d5a7a669ed6f69722602f75185c4817a9870b35b6955f87f004317bb32cdada379075115c12ad92f73f74818c182a480393961a85bf4";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/mai/firefox-50.1.0.tar.bz2";
+ locale = "mai";
+ arch = "linux-i686";
+ sha512 = "6fe97505743b8aa14b9bb3be57077c9da14c2049b2d0d455fc2b777b09bc42924f04c781073188fcdb3130bd5d1cba2cbc5c2ebd04fecc7e73ddb8f20f61c716";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/mk/firefox-50.1.0.tar.bz2";
+ locale = "mk";
+ arch = "linux-i686";
+ sha512 = "e0bbe68d53a08df8e2ac46b9b51567f69fcd11b03d19b6e84f86ca9f255c0920f89b011df5fd4ff300cb3fda65470fc15ad779757421eea2b3b6db6bc7ae9c1d";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ml/firefox-50.1.0.tar.bz2";
+ locale = "ml";
+ arch = "linux-i686";
+ sha512 = "0e6560b60dc8c0fa309c3a73c1aa3331aec82556e3ee5eec9014d8787c9a5f8311049fc7939ec69569abf689e349be08bce040bfab8bd2ee3ac0042753ce2860";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/mr/firefox-50.1.0.tar.bz2";
+ locale = "mr";
+ arch = "linux-i686";
+ sha512 = "cc31171f3ee669fb47dfe4e416c84ed58125b1a4787a92588c3650a2062e4e7fed28f2cc5c784fcf1d804c64fb335c2e16340d46f2d879b73e4465f8c662350a";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ms/firefox-50.1.0.tar.bz2";
+ locale = "ms";
+ arch = "linux-i686";
+ sha512 = "12d3bfa0c956b342604a043beefadbe5bff639fbe4b12614832ca36ac11a4046987f3be34dfeb5d3dbb4e9c1d8533645a8d78c3413f9730a72ae952bb07fd703";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/nb-NO/firefox-50.1.0.tar.bz2";
+ locale = "nb-NO";
+ arch = "linux-i686";
+ sha512 = "b144e104f01a075bd0d107f77af39664323eed78987ebc78a7a2917b86d83c2d6ff3bb35b6c5230e27c8164246fb32defea91e5b84672e20f5071e0d52456726";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/nl/firefox-50.1.0.tar.bz2";
+ locale = "nl";
+ arch = "linux-i686";
+ sha512 = "da466f3dc573096be1d55bdb03f926f0b94ee2ad8e326a3fdc29d519d00f5c0c9166b85c0c8c191d1ca7c992b05b68abff5f33882e52e43be3015a35333be3d8";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/nn-NO/firefox-50.1.0.tar.bz2";
+ locale = "nn-NO";
+ arch = "linux-i686";
+ sha512 = "85f83572953a0b54805b22f3a21cea70343092912c3b988f8408ac1df1931dda52a8686c32cdd7c91e776a17af0a390d6394b22fdf46ae1205a01499f390dc5a";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/or/firefox-50.1.0.tar.bz2";
+ locale = "or";
+ arch = "linux-i686";
+ sha512 = "1a0b08aa675bfe8b26675f1eac53389f34d02b0c28287d1a73e663ce5d747efd0bc4db5f0f29e3e864c99447e759fdf35ff573235a7ac9b815fe8b749f0a0e88";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/pa-IN/firefox-50.1.0.tar.bz2";
+ locale = "pa-IN";
+ arch = "linux-i686";
+ sha512 = "ee9c1c9cc27cd8470cee9a1600951274f9a663e4562cacf7452426c562815f393b726402b1356f9a60095e85278030d64f35cb1fdadd5c8cd11d6917f9c70d60";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/pl/firefox-50.1.0.tar.bz2";
+ locale = "pl";
+ arch = "linux-i686";
+ sha512 = "a326d11cb0df567ad13e6d543426c0a28d9158f7d8f0f519b208bddad26145e3eee6350dfb54735cfc05d656ed40b022fa132991a91f1de78eb36ee4f7333fcc";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/pt-BR/firefox-50.1.0.tar.bz2";
+ locale = "pt-BR";
+ arch = "linux-i686";
+ sha512 = "cb99dec511614bfdccf43b06e4babd28dbe0dfac464147aadccbf69bdedf3a093e625e4fcdfe0cf8db867b5854ce4c3c5d399a6e9ba932a9fd8574928962360c";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/pt-PT/firefox-50.1.0.tar.bz2";
+ locale = "pt-PT";
+ arch = "linux-i686";
+ sha512 = "2c4215b8bd5ee9ff78fdfda763c5506fb6a3c7056c9b4494d89f77ff4255c86617f4102f36bf534c0e3ff24ed27ef4a0853d24578bb39ae0a04f741422e6eba3";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/rm/firefox-50.1.0.tar.bz2";
+ locale = "rm";
+ arch = "linux-i686";
+ sha512 = "470b3ce93cd25c24c0c9a1581da7a48c101d7a93764423073b1934dbeb5a0fc401150009a622feba1f2f799501fb03e0af79a308c4fef08ac942c5adcaaf0d91";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ro/firefox-50.1.0.tar.bz2";
+ locale = "ro";
+ arch = "linux-i686";
+ sha512 = "7cfaa6b7b2dbe4dadc464591ffbb508e66b724eba76b6fa8e9547ef1092f1aa51f1846e9392a8531c7ba24aedb4ba49e7a2e0c1f41a0b97e6dbacdf1d6c34c75";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ru/firefox-50.1.0.tar.bz2";
+ locale = "ru";
+ arch = "linux-i686";
+ sha512 = "5915a55e881a57797a67d59b4ae9fd95da8bcc4caaa1ad7decb78a6de7a5da7ff35139ff33f7e4ed171615ba9c25ab7df43677a58cecbee530eed25d8a7cc8ca";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/si/firefox-50.1.0.tar.bz2";
+ locale = "si";
+ arch = "linux-i686";
+ sha512 = "a1702939f705a7c2b3b66efdd6dc27a4320ed019dcd62b59da67ef3f078be0afab91ee5158e67cb62691b1a4a002783f807d6133885bd0ac9bb05401268d5f24";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/sk/firefox-50.1.0.tar.bz2";
+ locale = "sk";
+ arch = "linux-i686";
+ sha512 = "43b72dd5ebcb1524c5b633cbfb73eed21aaf466227f29f4ffdd93f1c49dcc2295a38b57b3ce072c40da72184e1fb954a9097ea6d6d6df6807dfc5d04ff48b327";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/sl/firefox-50.1.0.tar.bz2";
+ locale = "sl";
+ arch = "linux-i686";
+ sha512 = "24840e76f00d6a07de581d06050f924018ae2613a6e4cba993073859dd05007b6c97a7d518a6c4b111740945357621c7325c4cd7f45adddceea270e08c1a09c3";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/son/firefox-50.1.0.tar.bz2";
+ locale = "son";
+ arch = "linux-i686";
+ sha512 = "004f8732e194d9c1972390d0ce0d04f9e8f91583676fa5d65bcfb1ee58a6b52db5176ce8a281a3ac94391b43aa637ed157128950e589a0f0a354622da6f04132";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/sq/firefox-50.1.0.tar.bz2";
+ locale = "sq";
+ arch = "linux-i686";
+ sha512 = "3dead0e008b4255585d22dacb6fa0aec125da6581b7ef4b1ccc6697e03a5afacd14d340bd8eb7bc0b38478bc6ca20f09364e9180313ceedf1853739ee181d125";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/sr/firefox-50.1.0.tar.bz2";
+ locale = "sr";
+ arch = "linux-i686";
+ sha512 = "cdbf5fa9d085829828f5a395114c3efae9b82e77e34aa69b622e611de8aaf54c525ad12ca445190ba5cc9c22d979be902e4f1f6e6a746b5f97570326cd90009b";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/sv-SE/firefox-50.1.0.tar.bz2";
+ locale = "sv-SE";
+ arch = "linux-i686";
+ sha512 = "ef8a625973d0286799e2a9ea3a5a10078d912a65521be8f935ec6eb207ba53942ec5d0e0c4c5c013ea2705307dafda12294fdf708dca35f72d5ba3eb48733238";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ta/firefox-50.1.0.tar.bz2";
+ locale = "ta";
+ arch = "linux-i686";
+ sha512 = "64652e5c68680f1ab15bdb5ec6487387789bd4b1a1537daa215094e57156fd4a1272311d8084435994151aff5e7ddffb16b93c2048989d9c2dc455f98d072b06";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/te/firefox-50.1.0.tar.bz2";
+ locale = "te";
+ arch = "linux-i686";
+ sha512 = "e516ee1f536dd98ab95a9a621cf4634f1ac70a3b5952cd8c6498890536b1630b362ebda8e69577eda4c0a6224f1a9cbf19453e5709dbca467e37597016eb5fe3";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/th/firefox-50.1.0.tar.bz2";
+ locale = "th";
+ arch = "linux-i686";
+ sha512 = "0b9ae06d78e94d6f9ee5861dc911eca02f39671d8f13f2119323ed7dc394dffbe99f2d23dd3eba955d46f7d4b9775cd9fc3311337d4339748c178aa67d7467eb";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/tr/firefox-50.1.0.tar.bz2";
+ locale = "tr";
+ arch = "linux-i686";
+ sha512 = "31be512e591504d3e8a776933f0926ae54a7797fa037e53a4627b1bb39ed61e4689cafee7d84dfb6b930ee2e4a84df158a97c1c5b201a3a8ea112e2910e65846";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/uk/firefox-50.1.0.tar.bz2";
+ locale = "uk";
+ arch = "linux-i686";
+ sha512 = "19614a4999f5c7509a3c0b1c6bb2bc3d9f408ff6727bcf9bf93bf91a59ec8d3c04206719fe2aa2319a0e62687df871bfa2fe67117219398e19aa5a6e0782c15c";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/uz/firefox-50.1.0.tar.bz2";
+ locale = "uz";
+ arch = "linux-i686";
+ sha512 = "22bb3b4a3a5a98ad8da002a220dd2779a46fd50a3d0ff41bec8312186ae34543da44fc49518fee160aa4b48176a0d3ba0dd0c4853fea9befc66911684b83ddb1";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/vi/firefox-50.1.0.tar.bz2";
+ locale = "vi";
+ arch = "linux-i686";
+ sha512 = "99140a71208a7912dc8b9fd3bd7f5454a0b032dee4d903304dfd14aa9abec0722fdcc6624f3c0a1c6e753bc6ab6ea512d6f8c55b5482069ed6c65d5579f562e0";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xh/firefox-50.1.0.tar.bz2";
+ locale = "xh";
+ arch = "linux-i686";
+ sha512 = "440573a5e364ecd59121b30f664ed23bd2fa80945562d1e5cc04303f12dfff23c96ef53ce07cf689d247a5120b9d7679533ccb6e17c27b29898154f0fc9fc581";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/zh-CN/firefox-50.1.0.tar.bz2";
+ locale = "zh-CN";
+ arch = "linux-i686";
+ sha512 = "4a2f5550c130d0992408d328afa3dbd37f80e5b63c2b33c095ab74e397ea394cb33f87214f1b0d3650c60450738fe3eca636ed51ca1c4e5dce9b58e0f09c30f6";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/zh-TW/firefox-50.1.0.tar.bz2";
+ locale = "zh-TW";
+ arch = "linux-i686";
+ sha512 = "6417da7af1792f241c8d57dd5bb05dac974db2b73a6274fe3159037bcf8ae8a23b3f1849f5b42a0bfc09f1dcbf949bcaa8b1e9cc633fd3726c12cde7e3cf542f";
+ }
+ ];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix
new file mode 100644
index 00000000000..d32f4dfcf5b
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix
@@ -0,0 +1,78 @@
+{ name
+, writeScript
+, xidel
+, coreutils
+, gnused
+, gnugrep
+, curl
+, baseName ? "firefox"
+, basePath ? "pkgs/applications/networking/browsers/firefox-bin"
+, baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/"
+}:
+
+let
+ version = (builtins.parseDrvName name).version;
+ isBeta = builtins.stringLength version + 1 == builtins.stringLength (builtins.replaceStrings ["b"] ["bb"] version);
+in writeScript "update-${baseName}-bin" ''
+ PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin
+
+ pushd ${basePath}
+
+ tmpfile=`mktemp`
+ url=${baseUrl}
+
+ # retriving latest released version
+ # - extracts all links from the $url
+ # - removes . and ..
+ # - this line remove everything not starting with a number
+ # - this line sorts everything with semver in mind
+ # - we remove lines that are mentioning funnelcake
+ # - this line removes beta version if we are looking for final release
+ # versions or removes release versions if we are looking for beta
+ # versions
+ # - this line pick up latest release
+ version=`xidel -q $url --extract "//a" | \
+ sed s"/.$//" | \
+ grep "^[0-9]" | \
+ sort --version-sort | \
+ grep -v "funnelcake" | \
+ grep -e "${if isBeta then "b" else ""}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${if isBeta then "" else "grep -v \"b\" |"} \
+ tail -1`
+
+ # this is a list of sha512 and tarballs for both arches
+ shasums=`curl --silent $url$version/SHA512SUMS`
+
+ cat > $tmpfile <> $tmpfile <> $tmpfile <ga
'';
preInstall =
@@ -141,14 +147,14 @@ in {
firefox-unwrapped = common {
pname = "firefox";
- version = "49.0.2";
- sha512 = "e9daa62c8e645ec034f1435afb579ddb5c503db313ea0cc3e48b7508f8368028979de07ca1426cc4c0f3ae82756f39dcb3b349712d520b8503a34afbd443fb1e";
+ version = "50.1.0";
+ sha512 = "2jwpk3aymkcq9f4xhzc31sb1c90vy3dvyqq2hvw97vk9dw7rgvv2cki10ns5cshbc4k57yd3j8nm7ppy2kw6na6771mj6sbijdjw39p";
};
firefox-esr-unwrapped = common {
pname = "firefox-esr";
- version = "45.4.0esr";
- sha512 = "2955e02f829a10186a8b22320fb97d4b0fc2b45721fcffa6295653fd760d516ae72b5656547685ba1e0699b381e28044996d9ee12a8738842b4e6b8acd296715";
+ version = "45.6.0esr";
+ sha512 = "086ci461hmz6kdn0ly9dlc723gc117si4a11a1c51gh79hczhahdaxg5s4r3k59rb43gpwxrlvm4wx1aka36bsihnh8a4caxnp72v5r";
};
}
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 531c5a7cf3d..2863a595017 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -2,7 +2,7 @@
# Linked dynamic libraries.
, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
-, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite
+, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
, alsaLib, libXdamage, libXtst, libXrandr, expat, cups
, dbus_libs, gtk2, gdk_pixbuf, gcc
@@ -42,7 +42,7 @@ let
deps = [
stdenv.cc.cc
glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
- libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite
+ libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb
alsaLib libXdamage libXtst libXrandr expat cups
dbus_libs gtk2 gdk_pixbuf gcc
systemd
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index 4d598bbb3a9..17168241ed9 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -70,11 +70,11 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
- version = "11.2.202.643";
+ version = "11.2.202.644";
src = fetchurl {
url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip";
- sha256 = "02imhdzhali42m8d1rw3bqscvi70707mssss7c43dm2kf67z6y8s";
+ sha256 = "0hf0hwg4kvz99g9d2arg5dwm3nx0hjnpngz9ay1mihhgjksy585b";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 0c6d36b3818..0edd982f0f7 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -36,7 +36,7 @@
let
mirror = https://get.geo.opera.com/pub/opera/desktop;
- version = "40.0.2308.90";
+ version = "41.0.2353.56";
rpath = stdenv.lib.makeLibraryPath [
@@ -89,12 +89,12 @@ in stdenv.mkDerivation {
if stdenv.system == "i686-linux" then
fetchurl {
url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb";
- sha256 = "1fqbxbn4531yv9figgg8xxr63swimrgpamqrphcg8jq5q3smrk4k";
+ sha256 = "0qjkhadlpn5c20wm66hm7rn12kdk4bh2plfgpfkzp85jmsjdxri5";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
- sha256 = "12imzjxwip9r7bjyfnrpdsxyxb0cjn92s3b7ajdlbqccxxmc6k6g";
+ sha256 = "1f3slbydxkk15banjbm7d8602l3vxy834ijsdqpyj0ckc5mw0g9y";
}
else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index af1256d3442..5e5f8848ebe 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -7,11 +7,11 @@
let
pdfjs = stdenv.mkDerivation rec {
name = "pdfjs-${version}";
- version = "1.4.20";
+ version = "1.5.188";
src = fetchurl {
url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip";
- sha256 = "1ca1fzyc5qnan6gavcd8bnfqriqqvgdsf4m8ka4nayf50k64xxj9";
+ sha256 = "1y3yaqfgjj96qzvbm5200x68j5hy1qs7l2mqm3kbbj2b58z9f1qv";
};
nativeBuildInputs = [ unzip ];
@@ -24,12 +24,12 @@ let
in buildPythonApplication rec {
name = "qutebrowser-${version}";
- version = "0.8.2";
+ version = "0.8.4";
namePrefix = "";
src = fetchurl {
url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz";
- sha256 = "1kfxjdn1dqla8d8gcggp55zcgf4zb77knkfshd213my0iw2yzgcf";
+ sha256 = "0wc6iq7rw89625v595bs4y8spzhid6nnz2gq67f2kbjppk2rikpm";
};
# Needs tox
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index df08fadfbdf..0531a58f0a2 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -10,16 +10,16 @@
}:
let
- version = "1.4";
- build = "589.38-1";
+ version = "1.6";
+ build = "689.34-1";
fullVersion = "stable_${version}.${build}";
info = if stdenv.is64bit then {
arch = "amd64";
- sha256 = "08qdpl5dkb2snpqlk3rsqlyl9rfas9v6bbcw2p4kzazhinak5hv3";
+ sha256 = "0wn98nzlhppmm3g797kiqr9bxxff8l7l110f1w1fnfl93d325hrm";
} else {
arch = "i386";
- sha256 = "0wpaglc1aaam5bqxgvf5zwcbr0xll8yj63l19q792l51j1vkv56q";
+ sha256 = "0agybibfwk5n1gxi8g4rbvvmlq5963df5arz4fyi4a1hcayllaz0";
};
in stdenv.mkDerivation rec {
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
'';
buildInputs =
- [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE
+ [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
atk alsaLib dbus_libs cups gtk2 gdk_pixbuf libexif ffmpeg systemd
freetype fontconfig libXrender libuuid expat glib nss nspr
diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index e4486943e62..f07668756ad 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchpatch
+{ stdenv, fetchFromGitHub, fetchpatch
, ncurses, boehmgc, gettext, zlib
, sslSupport ? true, openssl ? null
, graphicsSupport ? true, imlib2 ? null
@@ -15,12 +15,13 @@ assert mouseSupport -> gpm-ncurses != null;
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "w3m-0.5.3-2015-12-20";
+ name = "w3m-v0.5.3+git20161120";
- src = fetchgit {
- url = "git://anonscm.debian.org/collab-maint/w3m.git";
- rev = "e0b6e022810271bd0efcd655006389ee3879e94d";
- sha256 = "1vahm3719hb0m20nc8k88165z35f8b15qasa0whhk78r12bls1q6";
+ src = fetchFromGitHub {
+ owner = "tats";
+ repo = "w3m";
+ rev = "v0.5.3+git20161120";
+ sha256 = "06n5a9jdyihkd4xdjmyci32dpqp1k2l5awia5g9ng0bn256bacdc";
};
NIX_LDFLAGS = optionalString stdenv.isSunOS "-lsocket -lnsl";
diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix
new file mode 100644
index 00000000000..bdff04cb073
--- /dev/null
+++ b/pkgs/applications/networking/cluster/cni/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, go }:
+
+stdenv.mkDerivation rec {
+ name = "cni-${version}";
+ version = "0.3.0";
+
+ src = fetchFromGitHub {
+ owner = "containernetworking";
+ repo = "cni";
+ rev = "v${version}";
+ sha256 = "1nvixvf5slnsdrfpfs2km64x680wf83jbyp7il12bcim37q2az7m";
+ };
+
+ buildInputs = [ go ];
+
+ outputs = ["out" "plugins"];
+
+ buildPhase = ''
+ patchShebangs build
+ ./build
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin $plugins
+ mv bin/cnitool $out/bin
+ mv bin/* $plugins/
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Container Network Interface - networking for Linux containers";
+ license = licenses.asl20;
+ homepage = https://github.com/containernetworking/cni;
+ maintainers = with maintainers; [offline];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix
index 62dbbcf2149..d714033e412 100644
--- a/pkgs/applications/networking/cluster/docker-machine/default.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/default.nix
@@ -14,6 +14,11 @@ buildGoPackage rec {
sha256 = "0l4a5bqfw8i8wrl5yzkqy848r7vdx6hw8p5m3z3vzabvsmsjjwy7";
};
+ postInstall = ''
+ mkdir -p $bin/share/bash-completion/completions/
+ cp go/src/github.com/docker/machine/contrib/completion/bash/* $bin/share/bash-completion/completions/
+ '';
+
postFixup = ''
mv $bin/bin/cmd $bin/bin/docker-machine
'';
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix b/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix
new file mode 100644
index 00000000000..709491a76f8
--- /dev/null
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix
@@ -0,0 +1,21 @@
+# This file was generated by go2nix.
+[
+ {
+ goPackagePath = "github.com/alexzorin/libvirt-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alexzorin/libvirt-go";
+ rev = "9359c4feb97212380aa05213fa30c4b7348365f0";
+ sha256 = "02ipw28pjl5ng2xk63r279apc2py1yr5brcpnsc0cnd2imd51fqa";
+ };
+ }
+ {
+ goPackagePath = "github.com/docker/machine";
+ fetch = {
+ type = "git";
+ url = "https://github.com/docker/machine";
+ rev = "bb37dc7806687013c0c3097342ef7db4257655d2";
+ sha256 = "0wgyxpwis4hyknqalal1cnvb0v3j8f6lscchhk9ch6i69ngiaf03";
+ };
+ }
+]
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
new file mode 100644
index 00000000000..46105f34b5b
--- /dev/null
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
@@ -0,0 +1,31 @@
+# This file was generated by go2nix.
+{ stdenv, buildGoPackage, fetchFromGitHub, libvirt }:
+
+buildGoPackage rec {
+ name = "docker-machine-kvm-${version}";
+ version = "0.7.0";
+
+ goPackagePath = "github.com/dhiltgen/docker-machine-kvm";
+ goDeps = ./kvm-deps.nix;
+
+ src = fetchFromGitHub {
+ rev = "v${version}";
+ owner = "dhiltgen";
+ repo = "docker-machine-kvm";
+ sha256 = "0zkwwkx74vsfd7v38y9sidi759mhdcpm4409l9y4cx0wmkpavlv6";
+ };
+
+ buildInputs = [ libvirt ];
+
+ postInstall = ''
+ mv $bin/bin/bin $bin/bin/docker-machine-driver-kvm
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/dhiltgen/docker-machine-kvm;
+ description = "KVM driver for docker-machine.";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ offline ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index c5cc7ca7431..55ebb580f52 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
for n in "bin/"* "sbin/"*; do
sed -i $n -e "s|#!/usr/bin/env bash|#! ${bash}/bin/bash|"
done
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/container-executor
+ '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/container-executor;
'';
installPhase = ''
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
new file mode 100644
index 00000000000..58ac31ce49f
--- /dev/null
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, kubernetes }:
+let
+ arch = if stdenv.isLinux
+ then "linux-amd64"
+ else "darwin-amd64";
+ checksum = if stdenv.isLinux
+ then "dad3791fb07e6cf34f4cf611728cb8ae109a75234498a888529a68ac6923f200"
+ else "d27bd7e40e12c0a5f08782a8a883166008565b28e0b82126d2089300ff3f8465";
+in
+stdenv.mkDerivation rec {
+ pname = "helm";
+ version = "2.0.2";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "https://kubernetes-helm.storage.googleapis.com/helm-v${version}-${arch}.tar.gz";
+ sha256 = "${checksum}";
+ };
+
+ preferLocalBuild = true;
+
+ buildInputs = [ ];
+
+ propagatedBuildInputs = [ kubernetes ];
+
+ phases = [ "buildPhase" "installPhase" ];
+
+ buildPhase = ''
+ mkdir -p $out/bin
+ '';
+
+ installPhase = ''
+ tar -xvzf $src
+ cp ${arch}/helm $out/bin/${pname}
+ chmod +x $out/bin/${pname}
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/kubernetes/helm;
+ description = "A package manager for kubernetes";
+ license = licenses.asl20;
+ maintainers = [ maintainers.rlupton20 ];
+ platforms = platforms.linux ++ platforms.darwin;
+ };
+}
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 860ecd1d078..da5d426a0c5 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -17,40 +17,46 @@ with lib;
stdenv.mkDerivation rec {
name = "kubernetes-${version}";
- version = "1.4.0";
+ version = "1.4.6";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- sha256 = "0q7xwdjsmfrz7pnmylkbkr2yxsl2gzzy17aapfznl2hb1ms81kys";
+ sha256 = "1n5ppzr9hnn7ljfdgx40rnkn6n6a9ya0qyrhjhpnbfwz5mdp8ws3";
};
buildInputs = [ makeWrapper which go rsync go-bindata ];
- outputs = ["out" "man""pause"];
+ outputs = ["out" "man" "pause"];
postPatch = ''
substituteInPlace "hack/lib/golang.sh" --replace "_cgo" ""
+ substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}"
+ substituteInPlace "hack/update-munge-docs.sh" --replace "make" "make SHELL=${stdenv.shell}"
+ substituteInPlace "hack/update-munge-docs.sh" --replace "kube::util::git_upstream_remote_name" "echo origin"
+
patchShebangs ./hack
'';
WHAT="--use_go_build ${concatStringsSep " " components}";
- postBuild = "(cd build/pause && gcc pause.c -o pause)";
+ postBuild = ''
+ ./hack/generate-docs.sh
+ (cd build/pause && gcc pause.c -o pause)
+ '';
installPhase = ''
- mkdir -p "$out/bin" "$man/share/man" "$pause/bin"
+ mkdir -p "$out/bin" "$out/share/bash-completion/completions" "$man/share/man" "$pause/bin"
cp _output/local/go/bin/* "$out/bin/"
cp build/pause/pause "$pause/bin/pause"
cp -R docs/man/man1 "$man/share/man"
+
+ $out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl
'';
preFixup = ''
- wrapProgram "$out/bin/kube-proxy" --prefix PATH : "${iptables}/bin"
- wrapProgram "$out/bin/kubelet" --prefix PATH : "${coreutils}/bin"
-
# Remove references to go compiler
while read file; do
cat $file | sed "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" > $file.tmp
diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index f339657b7fe..fa19c562e8c 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "marathon-${version}";
- version = "1.1.2";
+ version = "1.3.6";
src = fetchurl {
url = "https://downloads.mesosphere.com/marathon/v${version}/marathon-${version}.tgz";
- sha256 = "1c1ml3blhhc10mky5pqxhpndbz6nk7qgcfbzwdqj9kqfzmwlsfbb";
+ sha256 = "12a6ah6qsx1ap6y7sps4vwkq8lyc08k1qnak2mnsa04ifrx9z0dy";
};
buildInputs = [ makeWrapper jdk mesos ];
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index ac7d94d5c9a..8857e6ba4e3 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -2,6 +2,7 @@
, automake115x, libtool, unzip, gnutar, jdk, maven, python, wrapPython
, setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd
, leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent
+, ethtool, coreutils
, bash
}:
@@ -10,7 +11,7 @@ let
soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so";
in stdenv.mkDerivation rec {
- version = "0.28.2";
+ version = "1.0.1";
name = "mesos-${version}";
enableParallelBuilding = true;
@@ -18,7 +19,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://apache/mesos/${version}/${name}.tar.gz";
- sha256 = "0wh4h11w5qvqa66fiz0qbm9q48d3jz48mw6mm22bcy9q9wmzrxcn";
+ sha256 = "1hdh2wh11ck98ycfrxfzgivgk2pjl3638vkyw14xj7faj9qxjlz0";
};
patches = [
@@ -29,7 +30,8 @@ in stdenv.mkDerivation rec {
./rb51324.patch
./rb51325.patch
- ./maven_repo.patch
+ # see https://github.com/cstrahan/mesos/tree/nixos-${version}
+ ./nixos.patch
];
buildInputs = [
@@ -45,59 +47,59 @@ in stdenv.mkDerivation rec {
];
preConfigure = ''
- substituteInPlace src/Makefile.am --subst-var-by mavenRepo ${mavenRepo}
+ substituteInPlace 3rdparty/stout/include/stout/os/posix/fork.hpp \
+ --subst-var-by sh ${bash}/bin/bash
- substituteInPlace 3rdparty/libprocess/include/process/subprocess.hpp \
- --replace '"sh"' '"${bash}/bin/bash"'
+ substituteInPlace 3rdparty/stout/include/stout/os/posix/shell.hpp \
+ --subst-var-by sh ${bash}/bin/bash
- substituteInPlace 3rdparty/libprocess/3rdparty/stout/include/stout/posix/os.hpp \
- --replace '"sh"' '"${bash}/bin/bash"'
+ substituteInPlace src/Makefile.am \
+ --subst-var-by mavenRepo ${mavenRepo}
- substituteInPlace 3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/shell.hpp \
- --replace '"sh"' '"${bash}/bin/bash"'
-
- substituteInPlace 3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/fork.hpp \
- --replace '"sh"' '"${bash}/bin/bash"'
-
- substituteInPlace src/cli/mesos-scp \
- --replace "'scp " "'${openssh}/bin/scp "
-
- substituteInPlace src/launcher/executor.cpp \
- --replace '"sh"' '"${bash}/bin/bash"'
+ substituteInPlace src/cli/mesos-scp \
+ --subst-var-by scp ${openssh}/bin/scp
substituteInPlace src/launcher/fetcher.cpp \
- --replace '"gzip' '"${gzip}/bin/gzip' \
- --replace '"tar' '"${gnutar}/bin/tar' \
- --replace '"unzip' '"${unzip}/bin/unzip'
+ --subst-var-by gzip ${gzip}/bin/gzip \
+ --subst-var-by tar ${gnutar}/bin/tar \
+ --subst-var-by unzip ${unzip}/bin/unzip
substituteInPlace src/python/cli/src/mesos/cli.py \
- --replace "['mesos-resolve'" "['$out/bin/mesos-resolve'"
+ --subst-var-by mesos-resolve $out/bin/mesos-resolve
- substituteInPlace src/slave/containerizer/mesos/launch.cpp \
- --replace '"sh"' '"${bash}/bin/bash"'
+ substituteInPlace src/slave/containerizer/mesos/isolators/posix/disk.cpp \
+ --subst-var-by du ${coreutils}/bin/du \
+ --subst-var-by cp ${coreutils}/bin/cp
+
+ substituteInPlace src/slave/containerizer/mesos/provisioner/backends/copy.cpp \
+ --subst-var-by cp ${coreutils}/bin/cp
+
+ substituteInPlace src/uri/fetchers/copy.cpp \
+ --subst-var-by cp ${coreutils}/bin/cp
+
+ substituteInPlace src/uri/fetchers/curl.cpp \
+ --subst-var-by curl ${curl}/bin/curl
+
+ substituteInPlace src/uri/fetchers/docker.cpp \
+ --subst-var-by curl ${curl}/bin/curl
'' + lib.optionalString stdenv.isLinux ''
- substituteInPlace configure.ac \
- --replace /usr/include/libnl3 ${libnl.dev}/include/libnl3
-
- substituteInPlace src/linux/perf.cpp \
- --replace '"perf ' '"${perf}/bin/perf '
-
- substituteInPlace src/linux/systemd.cpp \
- --replace 'os::realpath("/sbin/init")' '"${systemd}/lib/systemd/systemd"'
+ substituteInPlace src/linux/perf.cpp \
+ --subst-var-by perf ${perf}/bin/perf
substituteInPlace src/slave/containerizer/mesos/isolators/filesystem/shared.cpp \
- --replace '"mount ' '"${utillinux}/bin/mount ' \
+ --subst-var-by mount ${utillinux}/bin/mount
substituteInPlace src/slave/containerizer/mesos/isolators/namespaces/pid.cpp \
- --replace '"mount ' '"${utillinux}/bin/mount ' \
+ --subst-var-by mount ${utillinux}/bin/mount
substituteInPlace src/slave/containerizer/mesos/isolators/network/port_mapping.cpp \
- --replace '"tc ' '"${iproute}/bin/tc ' \
- --replace '"ip ' '"${iproute}/bin/ip ' \
- --replace '"mount ' '"${utillinux}/bin/mount ' \
- --replace '/bin/sh' "${stdenv.shell}"
+ --subst-var-by tc ${iproute}/bin/tc \
+ --subst-var-by ip ${iproute}/bin/ip \
+ --subst-var-by mount ${utillinux}/bin/mount \
+ --subst-var-by sh ${stdenv.shell} \
+ --subst-var-by ethtool ${ethtool}/sbin/ethtool
'';
configureFlags = [
@@ -113,8 +115,11 @@ in stdenv.mkDerivation rec {
"--with-ssl=${openssl.dev}"
"--enable-libevent"
"--with-libevent=${libevent.dev}"
+ "--with-protobuf=${pythonProtobuf.protobuf}"
+ "PROTOBUF_JAR=${mavenRepo}/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar"
] ++ lib.optionals stdenv.isLinux [
"--with-network-isolator"
+ "--with-nl=${libnl.dev}"
];
postInstall = ''
@@ -180,8 +185,5 @@ in stdenv.mkDerivation rec {
description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks";
maintainers = with maintainers; [ cstrahan kevincox offline rushmorem ];
platforms = platforms.linux;
- # Marked as broken due to needing an update for security issues.
- # See: https://github.com/NixOS/nixpkgs/issues/18856
- broken = true;
};
}
diff --git a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh
index bcdae83839f..f4a4588dbe4 100644
--- a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh
+++ b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh
@@ -9,1292 +9,1349 @@ function fetchArtifact {
curl --fail --location --insecure --retry 3 --max-redirs 20 "$url" --output "$out/$repoPath"
}
-fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.jar
-fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.jar
-fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.jar
-fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.jar
-fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.jar
-fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar
-fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar
-fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar
-fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.jar
-fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar
-fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar
-fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar
-fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar
-fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.jar
-fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.jar
-fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar
-fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar
-fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.jar
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar
-fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar
-fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar
-fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar.sha1
-fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom
-fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom.sha1
-fetchArtifact asm/asm/3.2/asm-3.2.pom
-fetchArtifact asm/asm/3.2/asm-3.2.pom.sha1
-fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar
-fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar.sha1
-fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom
-fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom.sha1
-fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar
-fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar.sha1
-fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom
-fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom.sha1
-fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom
-fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom.sha1
-fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar
-fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar.sha1
-fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom
-fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom.sha1
-fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom
-fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom.sha1
-fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom
-fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom.sha1
-fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom
-fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom.sha1
-fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar
-fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar.sha1
-fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom
-fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom.sha1
-fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar
-fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar.sha1
-fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom
-fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom.sha1
-fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom
-fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom.sha1
-fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar
-fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar.sha1
-fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom
-fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom.sha1
-fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar
-fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom
-fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.sha1
-fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.jar
-fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom
-fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom.sha1
-fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar
-fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar.sha1
-fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom
-fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom.sha1
-fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom
-fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom.sha1
-fetchArtifact com/google/google/1/google-1.pom
-fetchArtifact com/google/google/1/google-1.pom.sha1
-fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar
-fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar.sha1
-fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom
-fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom.sha1
-fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom
-fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom.sha1
-fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar
-fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar.sha1
-fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom
-fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom.sha1
-fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar
-fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar.sha1
-fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom
-fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom.sha1
-fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom
-fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.sha1
-fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar
-fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar.sha1
-fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom
-fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.sha1
-fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar
-fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar.sha1
-fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom
-fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom.sha1
-fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar
-fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar.sha1
-fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom
-fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom.sha1
-fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar
-fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar.sha1
-fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom
-fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom.sha1
-fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar
-fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar.sha1
-fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom
-fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom.sha1
-fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom
-fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom.sha1
-fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom
-fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom.sha1
-fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar
-fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar.sha1
-fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom
-fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom.sha1
-fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar
-fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar.sha1
-fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom
-fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom.sha1
-fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar
-fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar.sha1
-fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom
-fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom.sha1
-fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar
-fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar.sha1
-fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom
-fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom.sha1
-fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar
-fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar.sha1
-fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom
-fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom.sha1
-fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar
-fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar.sha1
-fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom
-fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom.sha1
-fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar
-fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar.sha1
-fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom
-fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom.sha1
-fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar
-fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar.sha1
-fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom
-fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom.sha1
-fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar
-fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar.sha1
-fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom
-fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom.sha1
-fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar
-fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar.sha1
-fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom
-fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom.sha1
-fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar
-fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar.sha1
-fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom
-fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom.sha1
-fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar
-fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar.sha1
-fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom
-fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom.sha1
-fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom
-fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1
-fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar
-fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1
-fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom
-fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1
-fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom
-fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom.sha1
-fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar
-fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar.sha1
-fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom
-fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.sha1
-fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom
-fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom.sha1
-fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom
-fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom.sha1
-fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar
-fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar.sha1
-fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom
-fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.sha1
-fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar
-fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar.sha1
-fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom
-fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.sha1
-fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar
-fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar.sha1
-fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom
-fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom.sha1
-fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar
-fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar.sha1
-fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom
-fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom.sha1
-fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom
-fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom.sha1
-fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom
-fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom.sha1
-fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar
-fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar.sha1
-fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom
-fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom.sha1
-fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar
-fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar.sha1
-fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom
-fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom.sha1
-fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom
-fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom.sha1
-fetchArtifact junit/junit/4.10/junit-4.10.pom
-fetchArtifact junit/junit/4.10/junit-4.10.pom.sha1
-fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom
-fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom.sha1
-fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar
-fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar.sha1
-fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom
-fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom.sha1
-fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom
-fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom.sha1
-fetchArtifact org/apache/apache/10/apache-10.pom
-fetchArtifact org/apache/apache/10/apache-10.pom.sha1
fetchArtifact org/apache/apache/11/apache-11.pom
fetchArtifact org/apache/apache/11/apache-11.pom.sha1
-fetchArtifact org/apache/apache/13/apache-13.pom
-fetchArtifact org/apache/apache/13/apache-13.pom.sha1
-fetchArtifact org/apache/apache/2/apache-2.pom
-fetchArtifact org/apache/apache/2/apache-2.pom.sha1
-fetchArtifact org/apache/apache/3/apache-3.pom
-fetchArtifact org/apache/apache/3/apache-3.pom.sha1
-fetchArtifact org/apache/apache/4/apache-4.pom
-fetchArtifact org/apache/apache/4/apache-4.pom.sha1
-fetchArtifact org/apache/apache/5/apache-5.pom
-fetchArtifact org/apache/apache/5/apache-5.pom.sha1
-fetchArtifact org/apache/apache/6/apache-6.pom
-fetchArtifact org/apache/apache/6/apache-6.pom.sha1
+fetchArtifact org/apache/apache/10/apache-10.pom
+fetchArtifact org/apache/apache/10/apache-10.pom.sha1
fetchArtifact org/apache/apache/7/apache-7.pom
fetchArtifact org/apache/apache/7/apache-7.pom.sha1
fetchArtifact org/apache/apache/9/apache-9.pom
fetchArtifact org/apache/apache/9/apache-9.pom.sha1
-fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar
-fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar.sha1
-fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom
-fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom
-fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom
-fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom
-fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom
-fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom
-fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom.sha1
-fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar
-fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar.sha1
-fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom
-fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom.sha1
-fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom
-fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom.sha1
-fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom
-fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom.sha1
-fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar
-fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar.sha1
-fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom
-fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom.sha1
-fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom
-fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom.sha1
-fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom
-fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom
-fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom
-fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom
-fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom
-fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom
-fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom
-fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom
-fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom
-fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom
-fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom
-fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom
-fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom
-fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom.sha1
-fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom
-fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom
-fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar
-fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom
-fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar
-fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom
-fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar
-fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom
-fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar
-fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom
-fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar
-fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar
-fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom
-fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom
-fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom
-fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom
-fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar
-fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom
-fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar
-fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom
-fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom
-fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom
-fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.jar
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom
-fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar
-fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom
-fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom
-fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar
-fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom
-fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom
-fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom
-fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom
-fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom.sha1
-fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom
-fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom
-fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar
-fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom
-fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.jar
-fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom
-fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom
-fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom
-fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom
-fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom
-fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom
-fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom
-fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom
-fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom
-fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom
-fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom
-fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom
-fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom
-fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom
-fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom
-fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom
-fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom
-fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.jar
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.jar
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom
-fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar
-fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom
-fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom
-fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar
-fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom
-fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom
-fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom
-fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom
-fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar
-fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom
-fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom
-fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar
-fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom
-fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom
-fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom
-fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom
-fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar
-fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom
-fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom
-fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar
-fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom
-fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom
-fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom
-fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom
-fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom
-fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar
-fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom
-fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom.sha1
-fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom
-fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.jar
-fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar
-fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom
-fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar
-fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom
-fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar
-fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom
-fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar
-fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom
-fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar
-fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom
-fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar
-fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom
-fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom.sha1
+fetchArtifact org/apache/apache/13/apache-13.pom
+fetchArtifact org/apache/apache/13/apache-13.pom.sha1
+fetchArtifact org/apache/apache/3/apache-3.pom
+fetchArtifact org/apache/apache/3/apache-3.pom.sha1
+fetchArtifact org/apache/apache/6/apache-6.pom
+fetchArtifact org/apache/apache/6/apache-6.pom.sha1
+fetchArtifact org/apache/apache/4/apache-4.pom
+fetchArtifact org/apache/apache/4/apache-4.pom.sha1
+fetchArtifact org/apache/apache/2/apache-2.pom
+fetchArtifact org/apache/apache/2/apache-2.pom.sha1
+fetchArtifact org/apache/apache/5/apache-5.pom
+fetchArtifact org/apache/apache/5/apache-5.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom
+fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar
+fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom
+fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom.sha1
fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom
fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom.sha1
fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom
fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom
-fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom.sha1
fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom
fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar
-fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom
-fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar
-fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom
-fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar
-fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom
-fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar
-fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar.sha1
fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom
fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar
-fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar
+fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar.sha1
fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom
fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar
-fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar
+fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom
+fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar
+fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom
+fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar
+fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom
+fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar
+fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom
+fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar
+fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar.sha1
fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.pom
fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar
+fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom
+fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar
+fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom
+fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar
+fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom
+fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar
+fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom
+fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar
+fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar.sha1
+fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom
+fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom
+fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom
+fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom
+fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom
+fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom
+fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom
+fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom
+fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom
+fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom
+fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom
+fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom
+fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom
+fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom
+fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom.sha1
+fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom
+fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom.sha1
+fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom
+fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom.sha1
+fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar
+fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar.sha1
+fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom
+fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom.sha1
+fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar
+fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar.sha1
+fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom
+fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom.sha1
+fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar
+fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar.sha1
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar.sha1
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom
+fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar.sha1
+fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom
+fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar
+fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar.sha1
+fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom
+fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.sha1
+fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom
+fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom
+fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom.sha1
+fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom
+fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom.sha1
+fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom
+fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom
+fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom
+fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom
+fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom.sha1
+fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom
+fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom.sha1
+fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom
+fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom.sha1
+fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom
+fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom.sha1
+fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom
+fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar
+fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar.sha1
+fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom
+fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom
+fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar
+fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar.sha1
+fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom
+fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.jar
+fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.jar.sha1
+fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom
+fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom.sha1
+fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom
+fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.sha1
+fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom
+fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom
+fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.sha1
+fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom
+fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar
+fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar.sha1
+fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom
+fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom
+fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar
+fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar.sha1
+fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom
+fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.sha1
+fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom
+fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.jar
+fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.jar.sha1
+fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom
+fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.sha1
+fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom
+fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar
+fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar.sha1
+fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom
+fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom
+fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar
+fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar.sha1
+fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom
+fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar
+fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar.sha1
+fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom
+fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.sha1
+fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom
+fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom
+fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom.sha1
+fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom
+fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar
+fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar.sha1
+fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom
+fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom
+fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar
+fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar.sha1
+fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom
+fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.sha1
+fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom
+fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.jar
+fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.jar.sha1
+fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom
+fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar.sha1
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar.sha1
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom
+fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.jar
+fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.jar.sha1
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom.sha1
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar.sha1
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar.sha1
+fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom
+fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar
+fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar.sha1
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.sha1
+fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom
+fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.sha1
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom
+fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar
+fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar.sha1
+fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom
+fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom
+fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom
+fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar
+fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar.sha1
+fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom
+fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar
+fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar.sha1
+fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom
+fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom
+fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom
+fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom
+fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar.sha1
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar.sha1
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom
+fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.jar
+fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.jar.sha1
+fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom
+fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar
+fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar.sha1
+fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom
+fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom
+fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar
+fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar.sha1
+fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom
+fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.jar
+fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.jar.sha1
+fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom
+fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar
+fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar.sha1
+fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom
+fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom
+fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.jar
+fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.jar.sha1
fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom
fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar.sha1
fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom
fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar.sha1
fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom
fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar
-fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom
+fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom
+fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom
+fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom.sha1
fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.pom
fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar
-fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar
+fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar.sha1
fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom
fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar
-fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar.sha1
-fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom
-fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar
-fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar
+fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom
+fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom
+fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom
+fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom
+fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar
+fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom
+fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar
+fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom
+fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar
+fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar
+fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom
+fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar
+fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom
+fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar
+fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom
+fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar
+fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar
+fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom
+fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar
+fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar
+fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom
+fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar
+fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar
+fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom
+fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom
+fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar
+fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom
+fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom
+fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar
+fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom
+fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar
+fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar.sha1
+fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom
+fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar
+fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar.sha1
+fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom
+fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom
+fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.jar
+fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.jar.sha1
+fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom
+fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar
+fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar.sha1
+fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom
+fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom
+fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.jar
+fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.jar.sha1
+fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom
+fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar
+fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar.sha1
+fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom
+fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom
+fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.jar
+fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.jar.sha1
fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.pom
fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar
-fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom
-fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar
-fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom
-fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar
-fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom
-fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar
-fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom
-fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar
+fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar.sha1
fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom
fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom
+fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom
+fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom.sha1
fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom
fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom.sha1
fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom
fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom
+fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom.sha1
fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom
fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar
-fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom
+fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom
+fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom
+fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom
+fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar
+fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom
+fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar
+fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom
+fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar
+fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom
+fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar
+fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom
+fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar
+fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom
+fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar
+fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom
+fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar
+fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar.sha1
+fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom
+fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom.sha1
+fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar
+fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar.sha1
fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom
fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom.sha1
-fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar
-fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar.sha1
-fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom
-fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom.sha1
-fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom
-fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom.sha1
-fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar
-fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar.sha1
-fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom
-fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom.sha1
-fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar
-fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar.sha1
-fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom
-fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom
-fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom
-fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom
-fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom
-fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar
-fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar
+fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom
+fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar
+fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar.sha1
+fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom
+fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom.sha1
+fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar
+fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar.sha1
+fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom
+fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.jar
+fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.jar.sha1
+fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom
+fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom.sha1
+fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar
+fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar.sha1
+fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom
+fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom.sha1
+fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar
+fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar.sha1
+fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom
+fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom.sha1
+fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar
+fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar.sha1
+fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom
+fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom.sha1
+fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar
+fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar.sha1
fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.pom
fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar
-fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar.sha1
+fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar
+fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar.sha1
+fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom
+fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom.sha1
+fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom
+fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom.sha1
+fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom
+fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom.sha1
+fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom
+fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.sha1
fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.pom
fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.pom.sha1
-fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar
-fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar.sha1
-fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom
-fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom.sha1
-fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom
-fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom.sha1
-fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom
-fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom.sha1
-fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar
-fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar.sha1
-fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom
-fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom.sha1
-fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar
-fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar.sha1
-fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom
-fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom.sha1
-fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar
-fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar.sha1
-fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom
-fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom.sha1
-fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom
-fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom.sha1
-fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar
-fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar.sha1
+fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar
+fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar.sha1
+fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom
+fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom.sha1
+fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar
+fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar.sha1
+fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom
+fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom.sha1
+fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.jar
+fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.jar.sha1
+fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom
+fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.sha1
+fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar
+fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar.sha1
+fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom
+fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar
+fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar.sha1
+fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom
+fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar
+fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar.sha1
+fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom
+fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar
+fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar.sha1
+fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom
+fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.jar
+fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.jar.sha1
fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom
fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom.sha1
-fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar
-fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar.sha1
+fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar
+fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar.sha1
+fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom
+fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom.sha1
+fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar
+fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar.sha1
+fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom
+fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom.sha1
fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom
fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom.sha1
-fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom
-fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom.sha1
+fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar
+fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar.sha1
+fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom
+fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom.sha1
+fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom
+fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom.sha1
+fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom
+fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom.sha1
+fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom
+fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom.sha1
+fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom
+fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom.sha1
+fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom
+fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom.sha1
+fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar
+fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar.sha1
+fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom
+fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom.sha1
+fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar
+fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar.sha1
+fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom
+fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom.sha1
+fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom
+fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom.sha1
+fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom
+fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom.sha1
+fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom
+fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom.sha1
+fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar
+fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar.sha1
+fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom
+fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom.sha1
+fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom
+fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom.sha1
+fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar
+fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar.sha1
+fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom
+fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom.sha1
+fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom
+fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom.sha1
+fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom
+fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom.sha1
+fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar
+fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar.sha1
+fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom
+fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom.sha1
+fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar
+fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar.sha1
fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom
fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom.sha1
-fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom
-fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom.sha1
-fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar
-fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar.sha1
-fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom
-fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom.sha1
-fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
-fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom.sha1
-fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar
-fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar.sha1
+fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom
+fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom.sha1
fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.pom
fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.pom.sha1
+fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar
+fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar.sha1
fetchArtifact org/codehaus/mojo/mojo-parent/30/mojo-parent-30.pom
fetchArtifact org/codehaus/mojo/mojo-parent/30/mojo-parent-30.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom
-fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom
-fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom
-fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom
-fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom
-fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom
-fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom
-fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom
-fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom
-fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom
-fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom
-fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom
-fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom
-fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar
-fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom
-fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar
-fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom
-fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar
-fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom
-fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom
-fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom
-fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom
-fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar
-fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom
-fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom
-fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar
-fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom
-fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar
-fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom
-fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar
-fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom
-fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.sha1
+fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
+fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar
+fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar.sha1
fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom
fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar.sha1
fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom
fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom.sha1
fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom
fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.sha1
fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom
fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar
+fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom.sha1
fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom
fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom.sha1
fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom
fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar.sha1
fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom
fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar
+fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom.sha1
fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom
fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar.sha1
fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom
fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar
+fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom
+fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom
+fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom
+fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom
+fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom
+fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom
+fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom
+fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom
+fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom
+fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom
+fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom
+fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom
+fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom
+fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom
+fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom
+fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom
+fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom
+fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom
+fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom
+fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom
+fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom
+fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom
+fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom
+fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom
+fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom
+fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar
+fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom
+fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar
+fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom
+fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar
+fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom
+fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom
+fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar
+fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom
+fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar
+fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar.sha1
fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.pom
fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.pom.sha1
-fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom
-fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom.sha1
-fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar
-fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar.sha1
-fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom
-fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom.sha1
-fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom
-fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom.sha1
-fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar
-fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar.sha1
-fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom
-fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom.sha1
-fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom
-fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom.sha1
-fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar
-fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar.sha1
-fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom
-fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom.sha1
-fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar
-fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar.sha1
-fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom
-fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom.sha1
-fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar
-fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar.sha1
-fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom
-fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom.sha1
-fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom
-fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom.sha1
-fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom
-fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.sha1
-fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar
-fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar.sha1
-fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom
-fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom.sha1
-fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom
-fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom.sha1
-fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar
-fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar.sha1
-fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom
-fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom.sha1
-fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar
-fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar.sha1
-fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom
-fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom.sha1
-fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom
-fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom.sha1
-fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom
-fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom.sha1
-fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom
-fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom.sha1
-fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom
-fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom.sha1
-fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar
-fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar.sha1
-fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom
-fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom.sha1
-fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom
-fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom.sha1
-fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom
-fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom.sha1
-fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom
-fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar
+fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom
+fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar
+fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom
+fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar
+fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom
+fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom
+fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar
+fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom
+fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar
+fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom
+fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom
+fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar
+fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom
+fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom
+fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar
+fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom
+fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar
+fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom
+fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar
+fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom
+fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom
+fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar
+fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom
+fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom
+fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.jar
+fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom
+fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom
+fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom
+fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom
+fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom
+fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar
+fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom
+fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom
+fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1
+fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom
+fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom.sha1
+fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom
+fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom.sha1
+fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom
+fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom.sha1
+fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom
+fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom.sha1
fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom
fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom.sha1
+fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom
+fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom.sha1
+fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom
+fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom.sha1
+fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom
+fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom.sha1
fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom
fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom.sha1
+fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom
+fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom.sha1
+fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar
+fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar.sha1
+fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom
+fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom.sha1
+fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar
+fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar.sha1
+fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom
+fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom.sha1
+fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar
+fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar.sha1
fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom
fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom.sha1
fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom
fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom.sha1
-fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar
-fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar.sha1
-fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom
-fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom.sha1
-fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar
-fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar.sha1
-fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom
-fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom.sha1
-fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar
-fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar.sha1
-fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom
-fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom.sha1
-fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom
-fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom.sha1
-fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom
-fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom.sha1
-fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar
-fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar.sha1
-fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom
-fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom.sha1
-fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom
-fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom.sha1
-fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar
-fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar.sha1
-fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom
-fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom.sha1
fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom
fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom.sha1
+fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar
+fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar.sha1
+fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom
+fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom.sha1
+fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom
+fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom.sha1
+fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom
+fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom.sha1
fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom
fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom.sha1
-fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom
-fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom.sha1
-fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom
-fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom.sha1
-fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom
-fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom.sha1
-fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom
-fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom.sha1
-fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar
-fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar.sha1
+fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom
+fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom.sha1
+fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar
+fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar.sha1
+fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom
+fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom.sha1
+fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar
+fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar.sha1
+fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom
+fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom.sha1
+fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar
+fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar.sha1
+fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom
+fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom.sha1
+fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom
+fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom.sha1
+fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar
+fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar.sha1
+fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom
+fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom.sha1
+fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar
+fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar.sha1
+fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom
+fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom.sha1
+fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar
+fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar.sha1
+fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom
+fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom.sha1
+fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar
+fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar.sha1
+fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom
+fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom.sha1
+fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom
+fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom.sha1
+fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar
+fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar.sha1
+fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom
+fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom.sha1
+fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom
+fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom.sha1
+fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar
+fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar.sha1
+fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom
+fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom.sha1
+fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom
+fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom.sha1
+fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom
+fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.sha1
+fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom
+fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom.sha1
+fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar
+fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar.sha1
+fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom
+fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom.sha1
+fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar
+fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar.sha1
+fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom
+fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom.sha1
+fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom
+fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom.sha1
+fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar
+fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar.sha1
+fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom
+fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom.sha1
+fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom
+fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom.sha1
+fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar
+fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar.sha1
+fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom
+fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom.sha1
+fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar
+fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar.sha1
+fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom
+fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom.sha1
+fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar
+fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar.sha1
fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom
fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom.sha1
-fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar
-fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar.sha1
+fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar
+fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar.sha1
+fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom
+fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom.sha1
+fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar
+fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar.sha1
+fetchArtifact com/google/google/1/google-1.pom
+fetchArtifact com/google/google/1/google-1.pom.sha1
+fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom
+fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom.sha1
+fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar
+fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar.sha1
+fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom
+fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom.sha1
+fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom
+fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom.sha1
+fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar
+fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar.sha1
+fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom
+fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom.sha1
+fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom
+fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom.sha1
+fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar
+fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar.sha1
+fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom
+fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom.sha1
+fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar
+fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar.sha1
+fetchArtifact junit/junit/4.10/junit-4.10.pom
+fetchArtifact junit/junit/4.10/junit-4.10.pom.sha1
+fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom
+fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom.sha1
+fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar
+fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar.sha1
+fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom
+fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom.sha1
+fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom
+fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.sha1
+fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar
+fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar.sha1
+fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom
+fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom.sha1
+fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.jar
+fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.jar.sha1
+fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom
+fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom.sha1
+fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar
+fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar.sha1
+fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom
+fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom.sha1
+fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom
+fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom.sha1
+fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar
+fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar.sha1
+fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom
+fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom.sha1
+fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar
+fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar.sha1
+fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom
+fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom.sha1
+fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom
+fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom.sha1
+fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom
+fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom.sha1
+fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar
+fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar.sha1
+fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom
+fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom.sha1
+fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar
+fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar.sha1
+fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom
+fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom.sha1
+fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar
+fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar.sha1
+fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom
+fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom.sha1
+fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar
+fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar.sha1
+fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom
+fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom.sha1
+fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar
+fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar.sha1
fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom
fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom.sha1
-fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar
-fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar.sha1
-fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom
-fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom.sha1
-fetchArtifact velocity/velocity/1.5/velocity-1.5.jar
-fetchArtifact velocity/velocity/1.5/velocity-1.5.jar.sha1
+fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar
+fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar.sha1
fetchArtifact velocity/velocity/1.5/velocity-1.5.pom
fetchArtifact velocity/velocity/1.5/velocity-1.5.pom.sha1
-fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar
-fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar.sha1
+fetchArtifact velocity/velocity/1.5/velocity-1.5.jar
+fetchArtifact velocity/velocity/1.5/velocity-1.5.jar.sha1
fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom
fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom.sha1
-fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar
-fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar.sha1
-fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom
-fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.sha1
-fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar
-fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar.sha1
+fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar
+fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar.sha1
fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom
fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom.sha1
+fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar
+fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar.sha1
+fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom
+fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.sha1
+fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar
+fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar.sha1
fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom
fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom.sha1
+fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom
+fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.sha1
+fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar
+fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar.sha1
+fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom
+fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1
+fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom
+fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom.sha1
+fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom
+fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom.sha1
+fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom
+fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1
+fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar
+fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1
+fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom
+fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom.sha1
+fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom
+fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom.sha1
+fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar
+fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar.sha1
+fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom
+fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom.sha1
+fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar
+fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar.sha1
+fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom
+fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom.sha1
+fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar
+fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar.sha1
+fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom
+fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom.sha1
+fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom
+fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.sha1
+fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar
+fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar.sha1
+fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom
+fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.sha1
+fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom
+fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom.sha1
+fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar
+fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar.sha1
+fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom
+fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom.sha1
+fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar
+fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar.sha1
+fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom
+fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom.sha1
+fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom
+fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom.sha1
+fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar
+fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar.sha1
+fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom
+fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom.sha1
+fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom
+fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom.sha1
+fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom
+fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom.sha1
+fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar
+fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar.sha1
+fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom
+fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.sha1
+fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar
+fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar.sha1
+fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom
+fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.sha1
+fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar
+fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar.sha1
+fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom
+fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom.sha1
+fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar
+fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar.sha1
+fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom
+fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom.sha1
+fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar
+fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar.sha1
+fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom
+fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom.sha1
+fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar
+fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar.sha1
+fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom
+fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom.sha1
+fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar
+fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar.sha1
+fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom
+fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom.sha1
+fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar
+fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar.sha1
+fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom
+fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom.sha1
+fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar
+fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar.sha1
+fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom
+fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom.sha1
+fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar
+fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar.sha1
+fetchArtifact asm/asm/3.2/asm-3.2.pom
+fetchArtifact asm/asm/3.2/asm-3.2.pom.sha1
+fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom
+fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom.sha1
+fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom
+fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom.sha1
+fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom
+fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom.sha1
+fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar
+fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar.sha1
+fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom
+fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom.sha1
+fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom
+fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom.sha1
+fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar
+fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar.sha1
+fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom
+fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom.sha1
+fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom
+fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom.sha1
+fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar
+fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar.sha1
+fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom
+fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom.sha1
+fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar
+fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar.sha1
+fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom
+fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom.sha1
+fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar
+fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar.sha1
stopNest
diff --git a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
index b6fcbaafbb1..1edb4a755d8 100644
--- a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
+++ b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = "12c6z5yvp60v57f6nijifp14i56bb5614hac1qg528s9liaf8vml";
+ outputHash = "066ikswavq3l37x1s3pfdncyj77pvpa0kj14ax5dqb9njmsg0s11";
buildInputs = [ curl ];
diff --git a/pkgs/applications/networking/cluster/mesos/nixos.patch b/pkgs/applications/networking/cluster/mesos/nixos.patch
new file mode 100644
index 00000000000..032357e452d
--- /dev/null
+++ b/pkgs/applications/networking/cluster/mesos/nixos.patch
@@ -0,0 +1,463 @@
+diff --git a/3rdparty/stout/include/stout/os/posix/fork.hpp b/3rdparty/stout/include/stout/os/posix/fork.hpp
+index a29967d..290b98b 100644
+--- a/3rdparty/stout/include/stout/os/posix/fork.hpp
++++ b/3rdparty/stout/include/stout/os/posix/fork.hpp
+@@ -369,7 +369,7 @@ private:
+ if (exec.isSome()) {
+ // Execute the command (via '/bin/sh -c command').
+ const char* command = exec.get().command.c_str();
+- execlp("sh", "sh", "-c", command, (char*) nullptr);
++ execlp("@sh@", "sh", "-c", command, (char*) nullptr);
+ EXIT(EXIT_FAILURE)
+ << "Failed to execute '" << command << "': " << os::strerror(errno);
+ } else if (wait.isSome()) {
+diff --git a/3rdparty/stout/include/stout/os/posix/shell.hpp b/3rdparty/stout/include/stout/os/posix/shell.hpp
+index 1d73ae5..9bf89b5 100644
+--- a/3rdparty/stout/include/stout/os/posix/shell.hpp
++++ b/3rdparty/stout/include/stout/os/posix/shell.hpp
+@@ -37,7 +37,7 @@ namespace Shell {
+ // received by the callee, usually the command name and `arg1` is the
+ // second command argument received by the callee.
+
+-constexpr const char* name = "sh";
++constexpr const char* name = "@sh@";
+ constexpr const char* arg0 = "sh";
+ constexpr const char* arg1 = "-c";
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 28dd151..36fc6ec 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1528,7 +1528,8 @@ if HAS_JAVA
+
+ $(MESOS_JAR): $(MESOS_JAR_SOURCE) $(MESOS_JAR_GENERATED) java/mesos.pom
+ @echo "Building mesos-$(PACKAGE_VERSION).jar ..."
+- @cd $(abs_top_builddir)/src/java && $(MVN) -B -f mesos.pom clean package
++ @cd $(abs_top_builddir)/src/java && $(MVN) -B -f mesos.pom -Dmaven.repo.local=@mavenRepo@ clean package
++
+
+ # Convenience library for JNI bindings.
+ # TODO(Charles Reiss): We really should be building the Java library
+diff --git a/src/cli/mesos-scp b/src/cli/mesos-scp
+index a71ab07..feed8c4 100755
+--- a/src/cli/mesos-scp
++++ b/src/cli/mesos-scp
+@@ -19,7 +19,7 @@ if sys.version_info < (2,6,0):
+
+
+ def scp(host, src, dst):
+- cmd = 'scp -pr %s %s' % (src, host + ':' + dst)
++ cmd = '@scp@ -pr %s %s' % (src, host + ':' + dst)
+ try:
+ process = subprocess.Popen(
+ cmd,
+diff --git a/src/launcher/fetcher.cpp b/src/launcher/fetcher.cpp
+index 4456c28..e22c8fc 100644
+--- a/src/launcher/fetcher.cpp
++++ b/src/launcher/fetcher.cpp
+@@ -68,13 +68,13 @@ static Try extract(
+ strings::endsWith(sourcePath, ".tar.bz2") ||
+ strings::endsWith(sourcePath, ".txz") ||
+ strings::endsWith(sourcePath, ".tar.xz")) {
+- command = "tar -C '" + destinationDirectory + "' -xf";
++ command = "@tar@ -C '" + destinationDirectory + "' -xf";
+ } else if (strings::endsWith(sourcePath, ".gz")) {
+ string pathWithoutExtension = sourcePath.substr(0, sourcePath.length() - 3);
+ string filename = Path(pathWithoutExtension).basename();
+- command = "gzip -dc > '" + destinationDirectory + "/" + filename + "' <";
++ command = "@gzip@ -dc > '" + destinationDirectory + "/" + filename + "' <";
+ } else if (strings::endsWith(sourcePath, ".zip")) {
+- command = "unzip -o -d '" + destinationDirectory + "'";
++ command = "@unzip@ -o -d '" + destinationDirectory + "'";
+ } else {
+ return false;
+ }
+@@ -162,7 +162,7 @@ static Try copyFile(
+ const string& sourcePath,
+ const string& destinationPath)
+ {
+- const string command = "cp '" + sourcePath + "' '" + destinationPath + "'";
++ const string command = "@cp@ '" + sourcePath + "' '" + destinationPath + "'";
+
+ LOG(INFO) << "Copying resource with command:" << command;
+
+diff --git a/src/linux/perf.cpp b/src/linux/perf.cpp
+index ea823b3..170f54d 100644
+--- a/src/linux/perf.cpp
++++ b/src/linux/perf.cpp
+@@ -125,7 +125,7 @@ private:
+ // NOTE: The watchdog process places perf in its own process group
+ // and will kill the perf process when the parent dies.
+ Try _perf = subprocess(
+- "perf",
++ "@perf@",
+ argv,
+ Subprocess::PIPE(),
+ Subprocess::PIPE(),
+@@ -319,7 +319,7 @@ bool valid(const set& events)
+ ostringstream command;
+
+ // Log everything to stderr which is then redirected to /dev/null.
+- command << "perf stat --log-fd 2";
++ command << "@perf@ stat --log-fd 2";
+ foreach (const string& event, events) {
+ command << " --event " << event;
+ }
+diff --git a/src/linux/systemd.cpp b/src/linux/systemd.cpp
+index 619aa27..c1cbfe4 100644
+--- a/src/linux/systemd.cpp
++++ b/src/linux/systemd.cpp
+@@ -196,12 +196,19 @@ bool exists()
+ // This is static as the init system should not change while we are running.
+ static const bool exists = []() -> bool {
+ // (1) Test whether `/sbin/init` links to systemd.
+- const Result realpath = os::realpath("/sbin/init");
+- if (realpath.isError() || realpath.isNone()) {
+- LOG(WARNING) << "Failed to test /sbin/init for systemd environment: "
+- << realpath.error();
+-
+- return false;
++ // cstrahan: first assume we're on NixOS, then try non-NixOS
++ Result realpath = os::realpath("/run/current-system/systemd/lib/systemd/systemd");
++ Result realpathNixOS = realpath;
++ if (realpathNixOS.isError() || realpathNixOS.isNone()) {
++ Result realpathNonNixOS = realpath = os::realpath("/sbin/init");
++ if (realpathNonNixOS.isError() || realpathNonNixOS.isNone()) {
++ LOG(WARNING) << "Failed to test /run/current-system/systemd/lib/systemd/systemd for systemd environment: "
++ << realpathNixOS.error();
++ LOG(WARNING) << "Failed to test /sbin/init for systemd environment: "
++ << realpathNonNixOS.error();
++
++ return false;
++ }
+ }
+
+ CHECK_SOME(realpath);
+diff --git a/src/python/cli/src/mesos/cli.py b/src/python/cli/src/mesos/cli.py
+index f342992..354abf4 100644
+--- a/src/python/cli/src/mesos/cli.py
++++ b/src/python/cli/src/mesos/cli.py
+@@ -40,7 +40,7 @@ def resolve(master):
+ import subprocess
+
+ process = subprocess.Popen(
+- ['mesos-resolve', master],
++ ['@mesos-resolve@', master],
+ stdin=None,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE,
+diff --git a/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp b/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
+index 51d1518..783adb5 100644
+--- a/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
++++ b/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
+@@ -204,7 +204,7 @@ Future> SharedFilesystemIsolatorProcess::prepare(
+ }
+
+ launchInfo.add_pre_exec_commands()->set_value(
+- "mount -n --bind " + hostPath + " " + volume.container_path());
++ "@mount@ -n --bind " + hostPath + " " + volume.container_path());
+ }
+
+ return launchInfo;
+diff --git a/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp b/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp
+index b41e266..e07c163 100644
+--- a/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp
++++ b/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp
+@@ -163,7 +163,7 @@ Future> NamespacesPidIsolatorProcess::prepare(
+ // containers cannot see the namespace bind mount of other
+ // containers.
+ launchInfo.add_pre_exec_commands()->set_value(
+- "mount -n --bind " + string(PID_NS_BIND_MOUNT_MASK_DIR) +
++ "@mount@ -n --bind " + string(PID_NS_BIND_MOUNT_MASK_DIR) +
+ " " + string(PID_NS_BIND_MOUNT_ROOT));
+
+ // Mount /proc for the container's pid namespace to show the
+@@ -176,9 +176,9 @@ Future> NamespacesPidIsolatorProcess::prepare(
+ // -n flag so the mount is not added to the mtab where it will not
+ // be correctly removed with the namespace terminates.
+ launchInfo.add_pre_exec_commands()->set_value(
+- "mount none /proc --make-private -o rec");
++ "@mount@ none /proc --make-private -o rec");
+ launchInfo.add_pre_exec_commands()->set_value(
+- "mount -n -t proc proc /proc -o nosuid,noexec,nodev");
++ "@mount@ -n -t proc proc /proc -o nosuid,noexec,nodev");
+
+ return launchInfo;
+ }
+diff --git a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
+index 79ee960..d55a353 100644
+--- a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
++++ b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
+@@ -1392,19 +1392,19 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
+ // Check the availability of a few Linux commands that we will use.
+ // We use the blocking os::shell here because 'create' will only be
+ // invoked during initialization.
+- Try checkCommandTc = os::shell("tc filter show");
++ Try checkCommandTc = os::shell("@tc@ filter show");
+ if (checkCommandTc.isError()) {
+ return Error("Check command 'tc' failed: " + checkCommandTc.error());
+ }
+
+ // NOTE: loopback device always exists.
+- Try checkCommandEthtool = os::shell("ethtool -k lo");
++ Try checkCommandEthtool = os::shell("@ethtool@ -k lo");
+ if (checkCommandEthtool.isError()) {
+ return Error("Check command 'ethtool' failed: "
+ + checkCommandEthtool.error());
+ }
+
+- Try checkCommandIp = os::shell("ip link show");
++ Try checkCommandIp = os::shell("@ip@ link show");
+ if (checkCommandIp.isError()) {
+ return Error("Check command 'ip' failed: " + checkCommandIp.error());
+ }
+@@ -1924,9 +1924,9 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
+ // visible. It's OK to use the blocking os::shell here because
+ // 'create' will only be invoked during initialization.
+ Try mount = os::shell(
+- "mount --bind %s %s && "
+- "mount --make-slave %s && "
+- "mount --make-shared %s",
++ "@mount@ --bind %s %s && "
++ "@mount@ --make-slave %s && "
++ "@mount@ --make-shared %s",
+ bindMountRoot->c_str(),
+ bindMountRoot->c_str(),
+ bindMountRoot->c_str(),
+@@ -1943,8 +1943,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
+ // shared mount yet (possibly due to slave crash while preparing
+ // the work directory mount). It's safe to re-do the following.
+ Try mount = os::shell(
+- "mount --make-slave %s && "
+- "mount --make-shared %s",
++ "@mount@ --make-slave %s && "
++ "@mount@ --make-shared %s",
+ bindMountRoot->c_str(),
+ bindMountRoot->c_str());
+
+@@ -1963,8 +1963,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
+ // so that they are in different peer groups.
+ if (entry.shared() == bindMountEntry->shared()) {
+ Try mount = os::shell(
+- "mount --make-slave %s && "
+- "mount --make-shared %s",
++ "@mount@ --make-slave %s && "
++ "@mount@ --make-shared %s",
+ bindMountRoot->c_str(),
+ bindMountRoot->c_str());
+
+@@ -3916,13 +3916,13 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+ {
+ ostringstream script;
+
+- script << "#!/bin/sh\n";
++ script << "#!@sh@\n";
+ script << "set -xe\n";
+
+ // Mark the mount point PORT_MAPPING_BIND_MOUNT_ROOT() as slave
+ // mount so that changes in the container will not be propagated to
+ // the host.
+- script << "mount --make-rslave " << bindMountRoot << "\n";
++ script << "@mount@ --make-rslave " << bindMountRoot << "\n";
+
+ // Disable IPv6 when IPv6 module is loaded as IPv6 packets won't be
+ // forwarded anyway.
+@@ -3930,7 +3930,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+ << " echo 1 > /proc/sys/net/ipv6/conf/all/disable_ipv6\n";
+
+ // Configure lo and eth0.
+- script << "ip link set " << lo << " address " << hostMAC
++ script << "@ip@ link set " << lo << " address " << hostMAC
+ << " mtu " << hostEth0MTU << " up\n";
+
+ // NOTE: This is mostly a kernel issue: in veth_xmit() the kernel
+@@ -3939,12 +3939,12 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+ // when we receive a packet with a bad checksum. Disabling rx
+ // checksum offloading ensures the TCP layer will checksum and drop
+ // it.
+- script << "ethtool -K " << eth0 << " rx off\n";
+- script << "ip link set " << eth0 << " address " << hostMAC << " up\n";
+- script << "ip addr add " << hostIPNetwork << " dev " << eth0 << "\n";
++ script << "@ethtool@ -K " << eth0 << " rx off\n";
++ script << "@ip@ link set " << eth0 << " address " << hostMAC << " up\n";
++ script << "@ip@ addr add " << hostIPNetwork << " dev " << eth0 << "\n";
+
+ // Set up the default gateway to match that of eth0.
+- script << "ip route add default via " << hostDefaultGateway << "\n";
++ script << "@ip@ route add default via " << hostDefaultGateway << "\n";
+
+ // Restrict the ephemeral ports that can be used by the container.
+ script << "echo " << info->ephemeralPorts.lower() << " "
+@@ -3973,19 +3973,19 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+ }
+
+ // Set up filters on lo and eth0.
+- script << "tc qdisc add dev " << lo << " ingress\n";
+- script << "tc qdisc add dev " << eth0 << " ingress\n";
++ script << "@tc@ qdisc add dev " << lo << " ingress\n";
++ script << "@tc@ qdisc add dev " << eth0 << " ingress\n";
+
+ // Allow talking between containers and from container to host.
+ // TODO(chzhcn): Consider merging the following two filters.
+- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE
++ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE
+ << " protocol ip"
+ << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32"
+ << " flowid ffff:0"
+ << " match ip dst " << hostIPNetwork.address()
+ << " action mirred egress redirect dev " << eth0 << "\n";
+
+- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE
++ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE
+ << " protocol ip"
+ << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32"
+ << " flowid ffff:0"
+@@ -3996,7 +3996,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+ foreach (const PortRange& range,
+ getPortRanges(info->nonEphemeralPorts + info->ephemeralPorts)) {
+ // Local traffic inside a container will not be redirected to eth0.
+- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE
++ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE
+ << " protocol ip"
+ << " prio " << Priority(IP_FILTER_PRIORITY, HIGH).get() << " u32"
+ << " flowid ffff:0"
+@@ -4005,7 +4005,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+
+ // Traffic going to host loopback IP and ports assigned to this
+ // container will be redirected to lo.
+- script << "tc filter add dev " << eth0 << " parent " << ingress::HANDLE
++ script << "@tc@ filter add dev " << eth0 << " parent " << ingress::HANDLE
+ << " protocol ip"
+ << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32"
+ << " flowid ffff:0"
+@@ -4017,14 +4017,14 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+ }
+
+ // Do not forward the ICMP packet if the destination IP is self.
+- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE
++ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE
+ << " protocol ip"
+ << " prio " << Priority(ICMP_FILTER_PRIORITY, NORMAL).get() << " u32"
+ << " flowid ffff:0"
+ << " match ip protocol 1 0xff"
+ << " match ip dst " << hostIPNetwork.address() << "\n";
+
+- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE
++ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE
+ << " protocol ip"
+ << " prio " << Priority(ICMP_FILTER_PRIORITY, NORMAL).get() << " u32"
+ << " flowid ffff:0"
+@@ -4033,9 +4033,9 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+ << net::IPNetwork::LOOPBACK_V4().address() << "\n";
+
+ // Display the filters created on eth0 and lo.
+- script << "tc filter show dev " << eth0
++ script << "@tc@ filter show dev " << eth0
+ << " parent " << ingress::HANDLE << "\n";
+- script << "tc filter show dev " << lo
++ script << "@tc@ filter show dev " << lo
+ << " parent " << ingress::HANDLE << "\n";
+
+ // If throughput limit for container egress traffic exists, use HTB
+@@ -4047,9 +4047,9 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+ // throughput. TBF requires other parameters such as 'burst' that
+ // HTB already has default values for.
+ if (egressRateLimitPerContainer.isSome()) {
+- script << "tc qdisc add dev " << eth0 << " root handle "
++ script << "@tc@ qdisc add dev " << eth0 << " root handle "
+ << CONTAINER_TX_HTB_HANDLE << " htb default 1\n";
+- script << "tc class add dev " << eth0 << " parent "
++ script << "@tc@ class add dev " << eth0 << " parent "
+ << CONTAINER_TX_HTB_HANDLE << " classid "
+ << CONTAINER_TX_HTB_CLASS_ID << " htb rate "
+ << egressRateLimitPerContainer.get().bytes() * 8 << "bit\n";
+@@ -4060,12 +4060,12 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+ // fq_codel, which has a larger buffer and better control on
+ // buffer bloat.
+ // TODO(cwang): Verity that fq_codel qdisc is available.
+- script << "tc qdisc add dev " << eth0
++ script << "@tC@ qdisc add dev " << eth0
+ << " parent " << CONTAINER_TX_HTB_CLASS_ID << " fq_codel\n";
+
+ // Display the htb qdisc and class created on eth0.
+- script << "tc qdisc show dev " << eth0 << "\n";
+- script << "tc class show dev " << eth0 << "\n";
++ script << "@tc@ qdisc show dev " << eth0 << "\n";
++ script << "@tc@ class show dev " << eth0 << "\n";
+ }
+
+ return script.str();
+diff --git a/src/slave/containerizer/mesos/isolators/posix/disk.cpp b/src/slave/containerizer/mesos/isolators/posix/disk.cpp
+index 3dfe7ad..4288666 100644
+--- a/src/slave/containerizer/mesos/isolators/posix/disk.cpp
++++ b/src/slave/containerizer/mesos/isolators/posix/disk.cpp
+@@ -492,7 +492,7 @@ private:
+ // NOTE: The monitor watchdog will watch the parent process and kill
+ // the 'du' process in case that the parent die.
+ Try s = subprocess(
+- "du",
++ "@du@",
+ command,
+ Subprocess::PATH("/dev/null"),
+ Subprocess::PIPE(),
+diff --git a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
+index b9f6d7a..0fcf455 100644
+--- a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
++++ b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
+@@ -141,7 +141,7 @@ Future CopyBackendProcess::_provision(
+ #endif // __APPLE__ || __FreeBSD__
+
+ Try s = subprocess(
+- "cp",
++ "@cp@",
+ args,
+ Subprocess::PATH("/dev/null"),
+ Subprocess::PATH("/dev/null"),
+diff --git a/src/uri/fetchers/copy.cpp b/src/uri/fetchers/copy.cpp
+index f095ad6..ee0c2a7 100644
+--- a/src/uri/fetchers/copy.cpp
++++ b/src/uri/fetchers/copy.cpp
+@@ -88,7 +88,7 @@ Future CopyFetcherPlugin::fetch(
+ const vector argv = {"cp", "-a", uri.path(), directory};
+
+ Try s = subprocess(
+- "cp",
++ "@cp@",
+ argv,
+ Subprocess::PATH("/dev/null"),
+ Subprocess::PIPE(),
+diff --git a/src/uri/fetchers/curl.cpp b/src/uri/fetchers/curl.cpp
+index cc3f9ee..691d2d9 100644
+--- a/src/uri/fetchers/curl.cpp
++++ b/src/uri/fetchers/curl.cpp
+@@ -98,7 +98,7 @@ Future CurlFetcherPlugin::fetch(
+ };
+
+ Try s = subprocess(
+- "curl",
++ "@curl@",
+ argv,
+ Subprocess::PATH("/dev/null"),
+ Subprocess::PIPE(),
+diff --git a/src/uri/fetchers/docker.cpp b/src/uri/fetchers/docker.cpp
+index 211be6f..d7e3771 100644
+--- a/src/uri/fetchers/docker.cpp
++++ b/src/uri/fetchers/docker.cpp
+@@ -113,7 +113,7 @@ static Future curl(
+
+ // TODO(jieyu): Kill the process if discard is called.
+ Try s = subprocess(
+- "curl",
++ "@curl@",
+ argv,
+ Subprocess::PATH("/dev/null"),
+ Subprocess::PIPE(),
+@@ -212,7 +212,7 @@ static Future download(
+
+ // TODO(jieyu): Kill the process if discard is called.
+ Try s = subprocess(
+- "curl",
++ "@curl@",
+ argv,
+ Subprocess::PATH("/dev/null"),
+ Subprocess::PIPE(),
diff --git a/pkgs/applications/networking/cluster/mesos/rb51324.patch b/pkgs/applications/networking/cluster/mesos/rb51324.patch
index abcd6d065db..68ef866161f 100644
--- a/pkgs/applications/networking/cluster/mesos/rb51324.patch
+++ b/pkgs/applications/networking/cluster/mesos/rb51324.patch
@@ -1,17 +1,16 @@
-diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/ls.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/ls.hpp
-index f8da9ef74a885cc39424b3e50cebca905d88ca44..25e2bec6415f2382291cf8da5c0a8c44cf882d27 100644
---- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/ls.hpp
-+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/ls.hpp
-@@ -18,6 +18,8 @@
+diff --git a/3rdparty/stout/include/stout/os/ls.hpp b/3rdparty/stout/include/stout/os/ls.hpp
+index f8da9ef..6d549d3 100644
+--- a/3rdparty/stout/include/stout/os/ls.hpp
++++ b/3rdparty/stout/include/stout/os/ls.hpp
+@@ -18,6 +18,7 @@
#else
#include
#endif // __WINDOWS__
+
-+#include
#include
#include
-@@ -26,8 +28,6 @@
+@@ -26,8 +27,6 @@
#include
#include
@@ -20,17 +19,17 @@ index f8da9ef74a885cc39424b3e50cebca905d88ca44..25e2bec6415f2382291cf8da5c0a8c44
namespace os {
-@@ -36,36 +36,32 @@ inline Try> ls(const std::string& directory)
+@@ -36,36 +35,32 @@ inline Try> ls(const std::string& directory)
DIR* dir = opendir(directory.c_str());
- if (dir == NULL) {
+ if (dir == nullptr) {
- // Preserve `opendir` error.
return ErrnoError("Failed to opendir '" + directory + "'");
}
- dirent* temp = (dirent*) malloc(os::dirent_size(dir));
-
-- if (temp == NULL) {
+- if (temp == nullptr) {
- // Preserve `malloc` error.
- ErrnoError error("Failed to allocate directory entries");
- closedir(dir);
@@ -41,7 +40,7 @@ index f8da9ef74a885cc39424b3e50cebca905d88ca44..25e2bec6415f2382291cf8da5c0a8c44
struct dirent* entry;
- int error;
-- while ((error = readdir_r(dir, temp, &entry)) == 0 && entry != NULL) {
+- while ((error = readdir_r(dir, temp, &entry)) == 0 && entry != nullptr) {
+ // Zero `errno` before starting to call `readdir`. This is necessary
+ // to allow us to determine when `readdir` returns an error.
+ errno = 0;
diff --git a/pkgs/applications/networking/cluster/mesos/rb51325.patch b/pkgs/applications/networking/cluster/mesos/rb51325.patch
index 9c6eb7bebbe..5c5ce00730b 100644
--- a/pkgs/applications/networking/cluster/mesos/rb51325.patch
+++ b/pkgs/applications/networking/cluster/mesos/rb51325.patch
@@ -1,34 +1,35 @@
-diff -Naur a/3rdparty/libprocess/3rdparty/stout/include/Makefile.am b/3rdparty/libprocess/3rdparty/stout/include/Makefile.am
---- a/3rdparty/libprocess/3rdparty/stout/include/Makefile.am 2016-09-02 15:20:04.834457344 +0200
-+++ b/3rdparty/libprocess/3rdparty/stout/include/Makefile.am 2016-09-02 15:21:00.190983981 +0200
-@@ -62,7 +62,6 @@
- stout/os/chroot.hpp \
- stout/os/close.hpp \
- stout/os/constants.hpp \
-- stout/os/direntsize.hpp \
- stout/os/environment.hpp \
- stout/os/exists.hpp \
- stout/os/fcntl.hpp \
-@@ -101,7 +100,6 @@
- stout/os/posix/bootid.hpp \
- stout/os/posix/chown.hpp \
- stout/os/posix/chroot.hpp \
-- stout/os/posix/direntsize.hpp \
- stout/os/posix/exists.hpp \
- stout/os/posix/fcntl.hpp \
- stout/os/posix/fork.hpp \
-@@ -118,7 +116,6 @@
- stout/os/raw/environment.hpp \
- stout/os/windows/bootid.hpp \
- stout/os/windows/chroot.hpp \
-- stout/os/windows/direntsize.hpp \
- stout/os/windows/exists.hpp \
- stout/os/windows/fcntl.hpp \
- stout/os/windows/fork.hpp \
-diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/direntsize.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/direntsize.hpp
+diff --git a/3rdparty/stout/include/Makefile.am b/3rdparty/stout/include/Makefile.am
+index 1f2ee85..b0b08d8 100644
+--- a/3rdparty/stout/include/Makefile.am
++++ b/3rdparty/stout/include/Makefile.am
+@@ -64,7 +64,6 @@ nobase_include_HEADERS = \
+ stout/os/chroot.hpp \
+ stout/os/close.hpp \
+ stout/os/constants.hpp \
+- stout/os/direntsize.hpp \
+ stout/os/environment.hpp \
+ stout/os/exists.hpp \
+ stout/os/fcntl.hpp \
+@@ -108,7 +107,6 @@ nobase_include_HEADERS = \
+ stout/os/posix/chown.hpp \
+ stout/os/posix/chroot.hpp \
+ stout/os/posix/close.hpp \
+- stout/os/posix/direntsize.hpp \
+ stout/os/posix/exists.hpp \
+ stout/os/posix/fcntl.hpp \
+ stout/os/posix/fork.hpp \
+@@ -134,7 +132,6 @@ nobase_include_HEADERS = \
+ stout/os/windows/bootid.hpp \
+ stout/os/windows/chroot.hpp \
+ stout/os/windows/close.hpp \
+- stout/os/windows/direntsize.hpp \
+ stout/os/windows/exists.hpp \
+ stout/os/windows/fcntl.hpp \
+ stout/os/windows/fork.hpp \
+diff --git a/3rdparty/stout/include/stout/os/direntsize.hpp b/3rdparty/stout/include/stout/os/direntsize.hpp
deleted file mode 100644
-index 819f99a89862491e99873bdedc603317b91266b0..0000000000000000000000000000000000000000
---- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/direntsize.hpp
+index 819f99a..0000000
+--- a/3rdparty/stout/include/stout/os/direntsize.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-// Licensed under the Apache License, Version 2.0 (the "License");
@@ -57,10 +58,10 @@ index 819f99a89862491e99873bdedc603317b91266b0..00000000000000000000000000000000
-
-
-#endif // __STOUT_OS_DIRENTSIZE_HPP__
-diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/direntsize.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/direntsize.hpp
+diff --git a/3rdparty/stout/include/stout/os/posix/direntsize.hpp b/3rdparty/stout/include/stout/os/posix/direntsize.hpp
deleted file mode 100644
-index 9d8f72eb607a288e77f92b39b91542ff5eb2fa21..0000000000000000000000000000000000000000
---- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/direntsize.hpp
+index 9d8f72e..0000000
+--- a/3rdparty/stout/include/stout/os/posix/direntsize.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// Licensed under the Apache License, Version 2.0 (the "License");
@@ -105,10 +106,10 @@ index 9d8f72eb607a288e77f92b39b91542ff5eb2fa21..00000000000000000000000000000000
-} // namespace os {
-
-#endif // __STOUT_OS_POSIX_DIRENTSIZE_HPP__
-diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/direntsize.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/direntsize.hpp
+diff --git a/3rdparty/stout/include/stout/os/windows/direntsize.hpp b/3rdparty/stout/include/stout/os/windows/direntsize.hpp
deleted file mode 100644
-index 7c8c7a06f478b3a80341a874494cff21f71fc397..0000000000000000000000000000000000000000
---- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/direntsize.hpp
+index 7c8c7a0..0000000
+--- a/3rdparty/stout/include/stout/os/windows/direntsize.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
new file mode 100644
index 00000000000..2fe9db26765
--- /dev/null
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, kubernetes }:
+let
+ arch = if stdenv.isLinux
+ then "linux-amd64"
+ else "darwin-amd64";
+ checksum = if stdenv.isLinux
+ then "17r8w4lvj7fhh7qppi9z5i2fpqqry4s61zjr9zmsbybc5flnsw2j"
+ else "0jf0kd1mm35qcf0ydr5yyzfq6qi8ifxchvpjsydb1gm1kikp5g3p";
+in
+stdenv.mkDerivation rec {
+ pname = "minikube";
+ version = "0.13.1";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "https://storage.googleapis.com/minikube/releases/v${version}/minikube-${arch}";
+ sha256 = "${checksum}";
+ };
+
+ buildInputs = [ ];
+
+ propagatedBuildInputs = [ kubernetes ];
+
+ phases = [ "buildPhase" "installPhase" ];
+
+ buildPhase = ''
+ mkdir -p $out/bin
+ '';
+
+ installPhase = ''
+ cp $src $out/bin/${pname}
+ chmod +x $out/bin/${pname}
+
+ mkdir -p $out/share/bash-completion/completions/
+ HOME=$(pwd) $out/bin/minikube completion bash > $out/share/bash-completion/completions/minikube
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/kubernetes/minikube;
+ description = "A tool that makes it easy to run Kubernetes locally";
+ license = licenses.asl20;
+ maintainers = [ maintainers.ebzzry ];
+ platforms = platforms.linux ++ platforms.darwin;
+ };
+}
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index 1985d6ad3f2..403457bb4a6 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -1,9 +1,11 @@
{ stdenv, fetchFromGitHub, go, which }:
let
- version = "1.3.0";
- versionMajor = "1";
- versionMinor = "3";
+ version = "1.3.2";
+ ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version);
+ versionMajor = ver 0;
+ versionMinor = ver 1;
+ versionPatch = ver 2;
in
stdenv.mkDerivation rec {
name = "openshift-origin-${version}";
@@ -13,7 +15,7 @@ stdenv.mkDerivation rec {
owner = "openshift";
repo = "origin";
rev = "v${version}";
- sha256 = "07s7xv8x8pch68j7lsw29im0axi07x32ag9wh9aqa0y570q9xgxy";
+ sha256 = "0zw8zb9c6icigcq6y47ppnjnqyghk2kril07bapbddvgnvbbfp6m";
};
buildInputs = [ go which ];
@@ -43,7 +45,7 @@ stdenv.mkDerivation rec {
description = "Build, deploy, and manage your applications with Docker and Kubernetes";
license = licenses.asl20;
homepage = http://www.openshift.org;
- maintainers = with maintainers; [offline];
- platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [offline bachp];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix
new file mode 100644
index 00000000000..a0df23e6f62
--- /dev/null
+++ b/pkgs/applications/networking/cluster/pachyderm/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+ name = "pachyderm-${version}";
+ version = "1.3.0";
+ rev = "v${version}";
+
+ goPackagePath = "github.com/pachyderm/pachyderm";
+ subPackages = [ "src/server/cmd/pachctl" ];
+
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "pachyderm";
+ repo = "pachyderm";
+ sha256 = "0y25xh6h7p8hg0bzrjlschmz62r6dwh5mrvbnni1hb1pm0w9jb6g";
+ };
+
+ meta = with lib; {
+ description = "Containerized Data Analytics";
+ homepage = https://github.com/pachyderm/pachyderm;
+ license = licenses.asl20;
+ maintainers = with maintainers; [offline];
+ };
+}
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index c7f2bc83c4d..78e167cc0e9 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "terraform-${version}";
- version = "0.7.8";
+ version = "0.8.1";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/terraform";
@@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev;
owner = "hashicorp";
repo = "terraform";
- sha256 = "0b42qji85h49aabzlb21vkcfpykrf8g4k2a51jhz9y28ywpbx5n4";
+ sha256 = "1fgnivhn6hrxpwwajl80vj2w81lv6vypprlbgif8m0z0na7p8956";
};
postInstall = ''
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index d10e787b6ff..20d50bd0f7a 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 = "16.4.29";
sha256 =
{
- "x86_64-linux" = "0ckinjrnnijs2wx80c0bqdlcsw5zhx64rsh3bylcjfbpvyli96q4";
- "i686-linux" = "08lhj4hlhvxm4zp9jai01f8cydfgfkl91l4ydd85yccl9ii4flh5";
+ "x86_64-linux" = "0zng19qisbr3c9d312ar43p1b44xidabj4x2l3g3q85i300vj661";
+ "i686-linux" = "0hc5fs0akc437valbxwlymk7ncjkdnhc51pja5bbiy48gqmd42bb";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
arch =
diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix
index eca53ccf2ec..39543f256fa 100644
--- a/pkgs/applications/networking/feedreaders/rawdog/default.nix
+++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, python2Packages }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "rawdog-${version}";
version = "2.21";
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0f5z7b70pyhjl6s28hgxninsr86s4dj5ycd50sv6bfz4hm1c2030";
};
- propagatedBuildInputs = with pythonPackages; [ feedparser ];
+ propagatedBuildInputs = with python2Packages; [ feedparser ];
namePrefix = "";
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 12a85f5e1db..c0951d97990 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.23.0.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 = "0bq22nq2g1b0x5msm9if74ync2qk13n2782mwj2r1r7hsmx4liiz";
};
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/gopher/gopher/default.nix b/pkgs/applications/networking/gopher/gopher/default.nix
new file mode 100644
index 00000000000..9057fda2e60
--- /dev/null
+++ b/pkgs/applications/networking/gopher/gopher/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, ncurses}:
+
+stdenv.mkDerivation rec {
+ name = "gopher-${version}";
+ version = "3.0.11";
+
+ src = fetchurl {
+ url = "http://gopher.quux.org:70/devel/gopher/Downloads/gopher_${version}.tar.gz";
+ sha256 = "15r7x518wlpfqpd6z0hbdwm8rw8ll8hbpskdqgxxhrmy00aa7w9c";
+ };
+
+ buildInputs = [ ncurses ];
+
+ preConfigure = "export LIBS=-lncurses";
+
+ meta = {
+ homepage = http://gopher.quux.org:70/devel/gopher;
+ description = "A ncurses gopher client";
+ platforms = stdenv.lib.platforms.unix;
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = with stdenv.lib.maintainers; [ sternenseemann ];
+ };
+}
diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix
index 10cf9874ff1..946d0dedba0 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/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 2ca16eb4458..8387d2f7c38 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, makeDesktopItem
, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf
, glib, gnome2, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage
, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, pango
, systemd, libXScrnSaver }:
-let version = "0.0.10"; in
+stdenv.mkDerivation rec {
-stdenv.mkDerivation {
-
- name = "discord-${version}";
+ pname = "discord";
+ version = "0.0.11";
+ name = "${pname}-${version}";
src = fetchurl {
- url = "https://cdn-canary.discordapp.com/apps/linux/${version}/discord-canary-${version}.tar.gz";
- sha256 = "1wkbbnbqbwgixdbm69dlirhgjnn8llqyzil01nqwpknh1qwd06pr";
+ url = "https://cdn-canary.discordapp.com/apps/linux/${version}/${pname}-canary-${version}.tar.gz";
+ sha256 = "1lk53vm14vr5pb8xxcx6hinpc2mkdns2xxv0bfzxvlmhfr6d6y18";
};
libPath = stdenv.lib.makeLibraryPath [
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
];
installPhase = ''
- mkdir -p $out/bin
+ mkdir -p $out/{bin,share/pixmaps}
mv * $out
# Copying how adobe-reader does it,
@@ -33,11 +33,22 @@ stdenv.mkDerivation {
$out/DiscordCanary
ln -s $out/DiscordCanary $out/bin/
+ ln -s $out/discord.png $out/share/pixmaps
# Putting udev in the path won't work :(
ln -s ${systemd.lib}/lib/libudev.so.1 $out
+ ln -s "${desktopItem}/share/applications" $out/share/
'';
+ desktopItem = makeDesktopItem {
+ name = pname;
+ exec = "DiscordCanary";
+ icon = pname;
+ desktopName = "Discord Canary";
+ genericName = meta.description;
+ categories = "Network;InstantMessaging;";
+ };
+
meta = with stdenv.lib; {
description = "All-in-one voice and text chat for gamers that’s free, secure, and works on both your desktop and phone";
homepage = "https://discordapp.com/";
diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index 8d7b16337f2..ef84f6402b5 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/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index e03b99aa171..11e2b13653d 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -7,6 +7,7 @@
, enableRST ? true
, enableSpelling ? true, gtkspell2 ? null
, enableNotifications ? false
+, enableOmemoPluginDependencies ? false
, extraPythonPackages ? pkgs: []
}:
@@ -68,7 +69,9 @@ stdenv.mkDerivation rec {
] ++ optional enableE2E pythonPackages.pycrypto
++ optional enableRST pythonPackages.docutils
++ optional enableNotifications pythonPackages.notify
- ++ extraPythonPackages pythonPackages;
+ ++ optionals enableOmemoPluginDependencies (with pythonPackages; [
+ cryptography python-axolotl python-axolotl-curve25519 qrcode
+ ]) ++ extraPythonPackages pythonPackages;
postFixup = ''
install -m 644 -t "$out/share/gajim/icons/hicolor" \
diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index e2f99f20e7c..326f9563070 100644
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -4,7 +4,7 @@
let
- version = "4.27.0.1658";
+ version = "4.29.4.1662";
rpath = stdenv.lib.makeLibraryPath [
xdg_utils
@@ -44,7 +44,7 @@ let
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb";
- sha256 = "1f0rgy5p9xcxfll6prir49vb7hjlnqx6xjaxlimhca4l30jvdsvn";
+ sha256 = "1cz9zv9aj8xdrjs6dgi7fpm4q9l9find4m8l0nmvac2s4r60vw6y";
}
else
throw "HipChat is not supported on ${stdenv.system}";
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 00000000000..bbeb6c4aa4a
--- /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/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
index 3ae3f7bb3dd..ca752ccf826 100644
--- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "mcabber-${version}";
- version = "1.0.3";
+ version = "1.0.4";
src = fetchurl {
url = "http://mcabber.com/files/mcabber-${version}.tar.bz2";
- sha256 = "16hkb7v1sqp1gqj94darwwrv23alqaiqdhqjq8gjd6f3l05bprj4";
+ sha256 = "02nfn5r7cjpnacym95l6bvczii232v3x2gi79gfa9syc7w0brdk3";
};
buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
configureFlags = "--with-openssl=${openssl.dev} --enable-modules --enable-otr";
doCheck = true;
-
+
meta = with stdenv.lib; {
homepage = http://mcabber.com/;
description = "Small Jabber console client";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
index 4a53513061a..d4dba663e6d 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
};
meta = with stdenv.lib; {
- homepage = http://sourceforge.net/projects/pidgin-latex/;
+ homepage = "http://sourceforge.net/projects/pidgin-latex/";
description = "LaTeX rendering plugin for Pidgin IM";
license = licenses.gpl2;
platforms = platforms.linux;
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 533c0ba48ba..f68b8306fc8 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 1a036c3083b..4b68d603f21 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/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index ac4776c2072..e556eeb7283 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, automake, autoconf, pkgconfig, glib, openssl, expat
-, ncurses, libotr, curl, libstrophe, readline, libuuid
+{ stdenv, fetchurl, pkgconfig, glib, openssl, expat, libmesode
+, ncurses, libotr, curl, readline, libuuid
, autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null
, notifySupport ? false, libnotify ? null, gdk_pixbuf ? null
@@ -12,21 +12,19 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "profanity-${version}";
- version = "0.4.7";
+ version = "0.5.0";
src = fetchurl {
url = "http://www.profanity.im/profanity-${version}.tar.gz";
- sha256 = "1p8ixvxacvf63r6lnf6iwlyz4pgiyp6widna1h2l2jg8kw14wb5h";
+ sha256 = "0s4njc4rcaii51qw1najxa0fa8bb2fnas00z47y94wdbdsmfhfvq";
};
buildInputs = [
- automake autoconf pkgconfig readline libuuid
- glib openssl expat ncurses libotr curl libstrophe
+ pkgconfig readline libuuid libmesode
+ glib openssl expat ncurses libotr curl
] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
++ optionals notifySupport [ libnotify gdk_pixbuf ];
- preConfigure = "sh bootstrap.sh";
-
meta = {
description = "A console based XMPP client";
longDescription = ''
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index e1cfb2fcedd..e0b86dfc633 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/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
index 229e3497ea4..5e5c2fe8eed 100644
--- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
+++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
@@ -1,15 +1,14 @@
{ stdenv, fetchgit, python3Packages }:
python3Packages.buildPythonPackage {
- name = "scudcloud-1.35";
- namePrefix = "";
+ name = "scudcloud-1.38";
- # Version 1.35, branch 254-port-to-qt5
- # https://github.com/raelgc/scudcloud/commit/6d924b5c23597c94d1a8e829a8a5d917806a5bc9
+ # Branch 254-port-to-qt5
+ # https://github.com/raelgc/scudcloud/commit/6bcd877daea3d679cd5fd2c946c2d933940c48d9
src = fetchgit {
url = https://github.com/raelgc/scudcloud/;
- rev = "6d924b5c23597c94d1a8e829a8a5d917806a5bc9";
- sha256 = "01k5am3067l3p1c91mdrh2fk3cgr20dhppa6flqi5b2ygzrc1i8q";
+ rev = "6bcd877daea3d679cd5fd2c946c2d933940c48d9";
+ sha256 = "1884svz6m5vl06d0yac5zjb2phxwg6bjva72y15fw4larkjnh72s";
};
propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python ];
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
index f95d3f0490a..73e8ab83f72 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/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 130fe644143..c07258a7837 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,60 +1,59 @@
-{ stdenv, lib, fetchFromGitHub, fetchgit, qtbase, qtimageformats
+{ stdenv, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake
+, qtbase, qtimageformats, qtwayland
, breakpad, ffmpeg, openalSoft, openssl, zlib, libexif, lzma, libopus
, gtk2, glib, cairo, pango, gdk_pixbuf, atk, libappindicator-gtk2
-, libwebp, libunity, dee, libdbusmenu-glib, libva
+, libwebp, libunity, dee, libdbusmenu-glib, libva-full, wayland
+, xcbutilrenderutil, icu, libSM, libICE, libproxy
-, pkgconfig, libxcb, xcbutilwm, xcbutilimage, xcbutilkeysyms
-, libxkbcommon, libpng, libjpeg, freetype, harfbuzz, pcre16
-, xproto, libX11, inputproto, sqlite, dbus
+, libxcb, xcbutilwm, xcbutilimage, xcbutilkeysyms, libxkbcommon
+, libpng, libjpeg, freetype, harfbuzz, pcre16, xproto, libX11
+, inputproto, sqlite, dbus
}:
let
system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
- packagedQt = "5.6.0";
+ packagedQt = "5.6.2";
# Hacky: split "1.2.3-4" into "1.2.3" and "4"
systemQt = (builtins.parseDrvName qtbase.version).name;
+ qtLibs = [ qtbase qtimageformats qtwayland ];
in stdenv.mkDerivation rec {
name = "telegram-desktop-${version}";
- version = "0.10.1";
+ version = "0.10.19";
qtVersion = lib.replaceStrings ["."] ["_"] packagedQt;
src = fetchFromGitHub {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${version}";
- sha256 = "08isxwif6zllglkpd9i7ypxm2s4bibzqris48607bafr88ylksdk";
+ sha256 = "1p07kxfmcd90sx9bq046x03h1h807vs0pn64lfghr6m6ln8z44s3";
};
tgaur = fetchgit {
url = "https://aur.archlinux.org/telegram-desktop.git";
- rev = "9ce7be9efed501f988bb099956fa63729f2c25ea";
- sha256 = "1wp6lqscpm2byizchm0bj48dg9bga02r9r69ns10zxk0gk0qvvdn";
+ rev = "99bb0519f14e23fafb6884fe296d34b6f8bed5c3";
+ sha256 = "0z5m3binbl06kk34plmfblhqz6hlnkbnjb93sam0c6c995k3sz82";
};
buildInputs = [
breakpad ffmpeg openalSoft openssl zlib libexif lzma libopus
gtk2 glib libappindicator-gtk2 libunity cairo pango gdk_pixbuf atk
- dee libdbusmenu-glib libva
+ dee libdbusmenu-glib libva-full xcbutilrenderutil icu libproxy
+ libSM libICE
# Qt dependencies
libxcb xcbutilwm xcbutilimage xcbutilkeysyms libxkbcommon
libpng libjpeg freetype harfbuzz pcre16 xproto libX11
- inputproto sqlite dbus libwebp
+ inputproto sqlite dbus libwebp wayland
];
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig gyp cmake ];
+
+ patches = [ "${tgaur}/aur-fixes.diff" ];
enableParallelBuilding = true;
- qmakeFlags = [
- "CONFIG+=release"
- "DEFINES+=TDESKTOP_DISABLE_AUTOUPDATE"
- "DEFINES+=TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
- "INCLUDEPATH+=${breakpad}/include/breakpad"
- "QT_TDESKTOP_VERSION=${systemQt}"
- ];
-
- qtSrcs = [ qtbase.src qtimageformats.src ];
+ qtSrcs = builtins.map (x: x.src) qtLibs;
+ qtNames = builtins.map (x: (builtins.parseDrvName x.name).name) (lib.tail qtLibs);
qtPatches = qtbase.patches;
buildCommand = ''
@@ -62,15 +61,23 @@ in stdenv.mkDerivation rec {
cd "$sourceRoot"
patchPhase
- sed -i 'Telegram/Telegram.pro' \
- -e 's,CUSTOM_API_ID,,g' \
- -e 's,/usr,/does-not-exist,g' \
- -e 's, -flto,,g' \
- -e 's,LIBS += .*libbreakpad_client.a,LIBS += ${breakpad}/lib/libbreakpad_client.a,' \
- -e 's, -static-libstdc++,,g' \
- -e '/LIBS += .*libxkbcommon.a/d'
- export qmakeFlags="$qmakeFlags QT_TDESKTOP_PATH=$PWD/../qt"
+ sed -i Telegram/gyp/Telegram.gyp \
+ -e 's,/usr/include/breakpad,${breakpad}/include/breakpad,g'
+
+ sed -i Telegram/gyp/telegram_linux.gypi \
+ -e 's,/usr,/does-not-exist,g' \
+ -e 's,-flto,,g'
+
+ sed -i Telegram/gyp/qt.gypi \
+ -e 's,${packagedQt},${systemQt},g'
+
+ gypFlagsArray=(
+ "-Dlinux_path_qt=$PWD/../qt"
+ "-Dlinux_lib_ssl=-lssl"
+ "-Dlinux_lib_crypto=-lcrypto"
+ "-Dlinux_lib_icu=-licuuc -licutu -licui18n"
+ )
export QMAKE=$PWD/../qt/bin/qmake
( mkdir -p ../Libraries
@@ -79,7 +86,7 @@ in stdenv.mkDerivation rec {
tar -xaf $i
done
cd qtbase-*
- # This patch is outdated but the fixes doesn't feel very important
+ # This patch is often outdated but the fixes doesn't feel very important
patch -p1 < ../../$sourceRoot/Telegram/Patches/qtbase_${qtVersion}.diff || true
for i in $qtPatches; do
patch -p1 < $i
@@ -89,8 +96,8 @@ in stdenv.mkDerivation rec {
export configureFlags="-prefix "$PWD/../qt" -release -opensource -confirm-license -system-zlib \
-system-libpng -system-libjpeg -system-freetype -system-harfbuzz -system-pcre -system-xcb \
- -system-xkbcommon-x11 -no-opengl -static -nomake examples -nomake tests \
- -openssl-linked -dbus-linked -system-sqlite -verbose -no-gtkstyle \
+ -system-xkbcommon-x11 -no-eglfs -no-gtkstyle -static -nomake examples -nomake tests \
+ -no-directfb -system-proxies -openssl-linked -dbus-linked -system-sqlite -verbose \
${lib.optionalString (!system-x86_64) "-no-sse2"} -no-sse3 -no-ssse3 \
-no-sse4.1 -no-sse4.2 -no-avx -no-avx2 -no-mips_dsp -no-mips_dspr2"
export dontAddPrefix=1
@@ -101,39 +108,29 @@ in stdenv.mkDerivation rec {
buildPhase
make install
)
-
- ( cd qtimageformats-*
- $QMAKE
- buildPhase
- make install
- )
+ for i in $qtNames; do
+ ( cd $i-*
+ $QMAKE
+ buildPhase
+ make install
+ )
+ done
)
- ( mkdir -p Linux/obj/codegen_style/Debug
- cd Linux/obj/codegen_style/Debug
- $QMAKE $qmakeFlags ../../../../Telegram/build/qmake/codegen_style/codegen_style.pro
- buildPhase
+ ( cd Telegram/gyp
+ gyp "''${gypFlagsArray[@]}" --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=cmake
)
- ( mkdir -p Linux/obj/codegen_numbers/Debug
- cd Linux/obj/codegen_numbers/Debug
- $QMAKE $qmakeFlags ../../../../Telegram/build/qmake/codegen_numbers/codegen_numbers.pro
- buildPhase
- )
- ( mkdir -p Linux/DebugIntermediateLang
- cd Linux/DebugIntermediateLang
- $QMAKE $qmakeFlags ../../Telegram/MetaLang.pro
+
+ ( cd out/Release
+ export ASM=$(type -p gcc)
+ cmake .
+ # For some reason, it can't find stdafx.h -- we need to build dependencies till it fails and then retry.
+ buildPhase || true
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -include stdafx.h"
buildPhase
)
- ( mkdir -p Linux/ReleaseIntermediate
- cd Linux/ReleaseIntermediate
- $QMAKE $qmakeFlags ../../Telegram/Telegram.pro
- pattern="^PRE_TARGETDEPS +="
- grep "$pattern" "../../Telegram/Telegram.pro" | sed "s/$pattern//g" | xargs make
- buildPhase
- )
-
- install -Dm755 Linux/Release/Telegram $out/bin/telegram-desktop
+ install -Dm755 out/Release/Telegram $out/bin/telegram-desktop
mkdir -p $out/share/applications $out/share/kde4/services
sed "s,/usr/bin,$out/bin,g" $tgaur/telegramdesktop.desktop > $out/share/applications/telegramdesktop.desktop
sed "s,/usr/bin,$out/bin,g" $tgaur/tg.protocol > $out/share/kde4/services/tg.protocol
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index 971a834f409..32266d7b42d 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib, dbus_daemon
-, sqlite, libsoup, libnice, gnutls }:
+, sqlite, libsoup, libnice, gnutls}:
stdenv.mkDerivation rec {
name = "telepathy-gabble-0.18.2";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig libxslt ];
- buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ]
+ buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls telepathy_glib.python ]
++ stdenv.lib.optional doCheck dbus_daemon;
configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
index ffc29a52aa1..4e4a2a9b6a9 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";
@@ -9,10 +9,19 @@ stdenv.mkDerivation rec {
sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy";
};
- buildInputs = [ glib telepathy_glib dbus_glib pidgin ];
+ buildInputs = [ glib telepathy_glib dbus_glib pidgin telepathy_glib.python ];
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/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
index 16a31f6f3ba..c29c6def2f6 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh";
};
- buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt ];
+ buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt telepathy_glib.python ];
meta = {
description = "IRC connection manager for the Telepathy framework";
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index aaff39ccb44..2ade2fd3edd 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool
- gobjectIntrospection dbus_libs ];
+ gobjectIntrospection dbus_libs telepathy_glib.python ];
nativeBuildInputs = [ libxslt ];
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
index aab7f84f467..a8fc9477707 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0zcbx69k0d3p2pjh3g7sa3q2zkd5xchxkqsmlfn3fwxaz0pmsmvi";
};
- buildInputs = [ telepathy_glib makeWrapper /*upower*/ ]; # ToDo: optional stuff missing
+ buildInputs = [ telepathy_glib telepathy_glib.python makeWrapper /*upower*/ ]; # ToDo: optional stuff missing
# 5.16.3 won't build with upower-0.99. Arch and Debian choose to disable it
nativeBuildInputs = [ pkgconfig libxslt ];
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix
index 538a8d7f6d2..7d06d57ca9a 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfigUpstream, libxslt, telepathy_glib, libxml2, dbus_glib
-, python, sofia_sip }:
+, sofia_sip }:
stdenv.mkDerivation rec {
pname = "telepathy-rakia";
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "18dxffa8hhjyvqkhhac05rrkx81vnncjrakg5ygikfp0j79vrbhv";
};
- nativeBuildInputs = [pkgconfigUpstream libxslt python];
- buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip];
+ nativeBuildInputs = [pkgconfigUpstream libxslt ];
+ buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip telepathy_glib.python ];
meta = {
homepage = http://telepathy.freedesktop.org;
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
index 918be4e9b83..cbae6af97b8 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
# pcre needed because https://github.com/NixOS/nixpkgs/pull/15046
buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid openssl
- sqlite pcre ];
+ sqlite pcre telepathy_glib.python ];
nativeBuildInputs = [ libxslt pkgconfigUpstream ];
diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
index 414b36b05e3..be72895b430 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig libconfig ];
buildInputs = [
- libtoxcore-dev libsodium ncurses libqrencode curl
+ libtoxcore-dev libsodium ncurses curl
] ++ stdenv.lib.optionals (!stdenv.isArm) [
- openal libvpx freealut
+ openal libvpx freealut libqrencode
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index f0243f45b8f..4e9f00b0340 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -4,13 +4,13 @@
, glib
, gst_plugins_base
, gstreamer
-, icu_54_1
+, icu
, libpulseaudio
, libuuid
, libxml2
, libxslt
, makeQtWrapper
-, qt55
+, qt56
, sqlite
, stdenv
, xlibs
@@ -27,29 +27,31 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.linux;
};
- version = "2.0.52458.0531";
+ version = "2.0.70790.1031";
src = fetchurl {
- url = "https://zoom.us/client/${version}/zoom_${version}_x86_64.tar.xz";
- sha256 = "16d64pn9j27v3fnh4c9i32vpkr10q1yr26w14964n0af1mv5jf7a";
+ url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
+ sha256 = "0kkg3bqv8zwhpxgrssa7ds00dxhdimnq2vfklgrdqn5qzbij31hd";
};
phases = [ "unpackPhase" "installPhase" ];
nativeBuildInputs = [ makeQtWrapper ];
- libPath = stdenv.lib.makeLibraryPath [
+ buildInputs = [
alsaLib
gcc.cc
glib
gst_plugins_base
gstreamer
- icu_54_1
+ icu
libpulseaudio
libuuid
libxml2
libxslt
- qt55.qtbase
- qt55.qtdeclarative
- qt55.qtscript
- qt55.qtwebkit
+ qt56.qtbase
+ qt56.qtdeclarative
+ qt56.qtlocation
+ qt56.qtscript
+ qt56.qtwebchannel
+ qt56.qtwebengine
sqlite
xlibs.xcbutilkeysyms
xorg.libX11
@@ -61,13 +63,15 @@ stdenv.mkDerivation rec {
xorg.xcbutilimage
zlib
];
+
+ libPath = stdenv.lib.makeLibraryPath buildInputs;
+
installPhase = ''
mkdir -p $out/share
cp -r \
application-x-zoom.png \
audio \
imageformats \
- chrome.bmp \
config-dump.sh \
dingdong1.pcm \
dingdong.pcm \
@@ -77,13 +81,7 @@ stdenv.mkDerivation rec {
platforminputcontexts \
platforms \
platformthemes \
- Qt \
- QtMultimedia \
- QtQml \
- QtQuick \
- QtQuick.2 \
- QtWebKit \
- QtWebProcess \
+ leave.pcm \
ring.pcm \
ring.wav \
version.txt \
@@ -98,6 +96,7 @@ stdenv.mkDerivation rec {
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-rpath ${libPath} \
$out/share/zoom
+ paxmark m $out/share/zoom
wrapQtProgram "$out/share/zoom"
mkdir -p $out/bin
ln -s $out/share/zoom $out/bin/zoom-us
diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index 031e835d3f7..05fea05fd14 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchgit, pythonPackages, gnupg1orig, makeWrapper, openssl }:
+{ stdenv, fetchgit, python2Packages, gnupg1orig, makeWrapper, openssl }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "mailpile-${version}";
version = "0.4.1";
@@ -11,11 +11,11 @@ pythonPackages.buildPythonApplication rec {
};
patchPhase = ''
- substituteInPlace setup.py --replace "data_files.append((dir" "data_files.append(('lib/${pythonPackages.python.libPrefix}/site-packages/' + dir"
+ substituteInPlace setup.py --replace "data_files.append((dir" "data_files.append(('lib/${python2Packages.python.libPrefix}/site-packages/' + dir"
'';
- propagatedBuildInputs = with pythonPackages; [
- makeWrapper pillow jinja2 spambayes pythonPackages.lxml
+ propagatedBuildInputs = with python2Packages; [
+ makeWrapper pillow jinja2 spambayes python2Packages.lxml
pgpdump gnupg1orig
];
@@ -24,6 +24,9 @@ pythonPackages.buildPythonApplication rec {
--prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1orig openssl ]}"
'';
+ # No tests were found
+ doCheck = false;
+
meta = with stdenv.lib; {
description = "A modern, fast web-mail client with user-friendly encryption and privacy features";
homepage = https://www.mailpile.is/;
diff --git a/pkgs/applications/networking/mailreaders/mutt-kz/default.nix b/pkgs/applications/networking/mailreaders/mutt-kz/default.nix
deleted file mode 100644
index 5cd0ef9f7a4..00000000000
--- a/pkgs/applications/networking/mailreaders/mutt-kz/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ stdenv, fetchurl, ncurses, which, perl, autoreconfHook, autoconf, automake, notmuch
-, sslSupport ? true
-, imapSupport ? true
-, headerCache ? true
-, saslSupport ? true
-, gpgmeSupport ? true
-, gdbm ? null
-, openssl ? null
-, cyrus_sasl ? null
-, gpgme ? null
-}:
-
-assert headerCache -> gdbm != null;
-assert sslSupport -> openssl != null;
-assert saslSupport -> cyrus_sasl != null;
-assert gpgmeSupport -> gpgme != null;
-
-let
- version = "1.5.23.1";
-in
-stdenv.mkDerivation rec {
- name = "mutt-kz-${version}";
-
- src = fetchurl {
- url = "https://github.com/karelzak/mutt-kz/archive/v${version}.tar.gz";
- sha256 = "01k4hrf8x2100pcqnrm61mm1x0pqi2kr3rx22k5hwvbs1wh8zyhz";
- };
-
- buildInputs = with stdenv.lib;
- [ ncurses which perl autoreconfHook autoconf automake notmuch]
- ++ optional headerCache gdbm
- ++ optional sslSupport openssl
- ++ optional saslSupport cyrus_sasl
- ++ optional gpgmeSupport gpgme;
-
-configureFlags = [
- "--with-mailpath=" "--enable-smtp"
-
- # This allows calls with "-d N", that output debug info into ~/.muttdebug*
- "--enable-debug"
-
- "--enable-pop" "--enable-imap"
-
- "--enable-notmuch"
-
- # The next allows building mutt without having anything setgid
- # set by the installer, and removing the need for the group 'mail'
- # I set the value 'mailbox' because it is a default in the configure script
- "--with-homespool=mailbox"
- (if headerCache then "--enable-hcache" else "--disable-hcache")
- (if sslSupport then "--with-ssl" else "--without-ssl")
- (if imapSupport then "--enable-imap" else "--disable-imap")
- (if saslSupport then "--with-sasl" else "--without-sasl")
- (if gpgmeSupport then "--enable-gpgme" else "--disable-gpgme")
- ];
-
- meta = with stdenv.lib; {
- description = "A small but very powerful text-based mail client, forked to support notmuch";
- homepage = https://github.com/karelzak/mutt-kz/;
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = platforms.unix;
- maintainers = with maintainers; [ magnetophon ];
- };
-}
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 2bc9b3babbd..195cf13e4c2 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -20,13 +20,17 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "mutt-${version}";
- version = "1.7.1";
+ version = "1.7.2";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
- sha256 = "1pyns0xw52s4yma1a93pdcl4dirs55q2m1hd7w1r11nlhf7giip9";
+ sha256 = "1yazrl82s9fxmamnlvwmsxhwrxnwv6kwakgfmawda8ndhwb50lqm";
};
+ patchPhase = optionalString (openssl != null) ''
+ sed -i 's#/usr/bin/openssl#${openssl}/bin/openssl#' smime_keys.pl
+ '';
+
buildInputs =
[ ncurses which perl ]
++ optional headerCache gdbm
diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
index 3b90bc9f0ac..2cc4905e435 100644
--- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
@@ -11,7 +11,6 @@ stdenv.mkDerivation rec {
sha256 = "0mz0llf1ggl1k46brgrqj3i8qlg1ycmkc5a3a0kg8fg4s1c1m6xk";
};
-
buildInputs = [ pkgconfig glib notmuch ];
installPhase = ''
@@ -19,12 +18,10 @@ stdenv.mkDerivation rec {
cp notmuch-addrlookup "$out/bin"
'';
-
-
meta = with stdenv.lib; {
description = "Address lookup tool for Notmuch in C";
homepage = https://github.com/aperezdc/notmuch-addrlookup-c;
- maintainers = with maintainers; [ mog ];
+ maintainers = with maintainers; [ mog garbas ];
platforms = platforms.linux;
license = licenses.mit;
};
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index bbf92ea0462..83eace00b0a 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -1,11 +1,16 @@
-{ fetchurl, stdenv, bash, emacs, fixDarwinDylibNames
-, gdb, glib, gmime, gnupg
-, pkgconfig, talloc, xapian
-, sphinx, python
+{ fetchurl, stdenv, fixDarwinDylibNames, gdb
+, pkgconfig, gnupg
+, xapian, gmime, talloc, zlib
+, doxygen, perl
+, pythonPackages
+, bash-completion
+, emacs
+, ruby
+, which, dtach, openssl, bash
}:
stdenv.mkDerivation rec {
- version = "0.22";
+ version = "0.23.2";
name = "notmuch-${version}";
passthru = {
@@ -15,17 +20,39 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://notmuchmail.org/releases/${name}.tar.gz";
- sha256 = "16mrrw6xpsgip4dy8rfx0zncij5h41fsg2aah6x6z83bjbpihhfn";
+ sha256 = "1g4p5hsrqqbqk6s2w756als60wppvjgpyq104smy3w9vshl7bzgd";
};
- buildInputs = [ bash emacs glib gmime gnupg pkgconfig talloc xapian sphinx python ]
+ buildInputs = [
+ pkgconfig gnupg # undefined dependencies
+ xapian gmime talloc zlib # dependencies described in INSTALL
+ doxygen perl # (optional) api docs
+ pythonPackages.sphinx pythonPackages.python # (optional) documentation -> doc/INSTALL
+ bash-completion # (optional) dependency to install bash completion
+ emacs # (optional) to byte compile emacs code
+ ruby # (optional) ruby bindings
+ which dtach openssl bash # test dependencies
+ ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames
++ stdenv.lib.optional (!stdenv.isDarwin) gdb;
+ doCheck = !stdenv.isDarwin;
+ checkTarget = "test";
+
patchPhase = ''
+ # XXX: disabling few tests since i have no idea how to make them pass for now
+ rm -f test/T010-help-test.sh \
+ test/T350-crypto.sh \
+ test/T355-smime.sh
+
find test -type f -exec \
sed -i \
- "1s_#!/usr/bin/env bash_#!${bash}/bin/bash_" \
+ -e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \
+ -e "s|gpg |${gnupg}/bin/gpg2 |" \
+ -e "s| gpg| ${gnupg}/bin/gpg2|" \
+ -e "s|gpgsm |${gnupg}/bin/gpgsm |" \
+ -e "s| gpgsm| ${gnupg}/bin/gpgsm|" \
+ -e "s|crypto.gpg_path=gpg|crypto.gpg_path=${gnupg}/bin/gpg2|" \
"{}" ";"
for src in \
@@ -38,44 +65,37 @@ stdenv.mkDerivation rec {
done
'';
+ preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+ set -e
+
+ die() {
+ >&2 echo "$@"
+ exit 1
+ }
+
+ prg="$out/bin/notmuch"
+ lib="$(find "$out/lib" -name 'libnotmuch.?.dylib')"
+
+ [[ -s "$prg" ]] || die "couldn't find notmuch binary"
+ [[ -s "$lib" ]] || die "couldn't find libnotmuch"
+
+ badname="$(otool -L "$prg" | awk '$1 ~ /libtalloc/ { print $1 }')"
+ goodname="$(find "${talloc}/lib" -name 'libtalloc.?.?.?.dylib')"
+
+ [[ -n "$badname" ]] || die "couldn't find libtalloc reference in binary"
+ [[ -n "$goodname" ]] || die "couldn't find libtalloc in nix store"
+
+ echo "fixing libtalloc link in $lib"
+ install_name_tool -change "$badname" "$goodname" "$lib"
+
+ echo "fixing libtalloc link in $prg"
+ install_name_tool -change "$badname" "$goodname" "$prg"
+ '';
+
postInstall = ''
make install-man
'';
- preFixup = if stdenv.isDarwin then
- ''
- set -e
-
- die() {
- >&2 echo "$@"
- exit 1
- }
-
- prg="$out/bin/notmuch"
- lib="$(find "$out/lib" -name 'libnotmuch.?.dylib')"
-
- [[ -s "$prg" ]] || die "couldn't find notmuch binary"
- [[ -s "$lib" ]] || die "couldn't find libnotmuch"
-
- badname="$(otool -L "$prg" | awk '$1 ~ /libtalloc/ { print $1 }')"
- goodname="$(find "${talloc}/lib" -name 'libtalloc.?.?.?.dylib')"
-
- [[ -n "$badname" ]] || die "couldn't find libtalloc reference in binary"
- [[ -n "$goodname" ]] || die "couldn't find libtalloc in nix store"
-
- echo "fixing libtalloc link in $lib"
- install_name_tool -change "$badname" "$goodname" "$lib"
-
- echo "fixing libtalloc link in $prg"
- install_name_tool -change "$badname" "$goodname" "$prg"
- ''
- else
- "";
-
- # XXX: emacs tests broken
- doCheck = false;
- checkTarget = "test";
-
meta = {
description = "Mail indexer";
license = stdenv.lib.licenses.gpl3;
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index c1bcd9ac541..2bc65226c5f 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -33,6 +33,11 @@
, nspr
, nss
, pango
+, writeScript
+, xidel
+, coreutils
+, gnused
+, gnugrep
}:
assert stdenv.isLinux;
@@ -57,10 +62,11 @@ let
source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources;
+ name = "thunderbird-bin-${version}";
in
stdenv.mkDerivation {
- name = "thunderbird-bin-${version}";
+ inherit name;
src = fetchurl {
url = "http://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2";
@@ -141,6 +147,12 @@ stdenv.mkDerivation {
EOF
'';
+ passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
+ inherit name writeScript xidel coreutils gnused gnugrep curl;
+ baseName = "thunderbird";
+ basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";
+ baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
+ };
meta = with stdenv.lib; {
description = "Mozilla Thunderbird, a full-featured email client (binary package)";
homepage = http://www.mozilla.org/thunderbird/;
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index f8509a46248..79b5f7b737f 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -1,126 +1,585 @@
-# This file is generated from generate_sources.rb. DO NOT EDIT.
-# Execute the following command to update the file.
-#
-# ruby generate_sources.rb 45.1.1 > sources.nix
-
{
- version = "45.4.0";
+ version = "45.5.1";
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"; }
- ];
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ar/thunderbird-45.5.1.tar.bz2";
+ locale = "ar";
+ arch = "linux-x86_64";
+ sha512 = "b5760210c14df4648d6bbd48136dbb3221c682ecebb649be848f8fbecf89d2251630c8d8208438f0ab66b73964bbdf8e05035bb88f0c773ea253cab163b569b1";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ast/thunderbird-45.5.1.tar.bz2";
+ locale = "ast";
+ arch = "linux-x86_64";
+ sha512 = "64028617fe76832663fd69e2305ca84dfd576507348dcffc680d94d6d1de640fdd13874a73638767d3aedd2c84d38fd370e57ba3f95281a0fc0ad9d21b4d727d";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/be/thunderbird-45.5.1.tar.bz2";
+ locale = "be";
+ arch = "linux-x86_64";
+ sha512 = "932f0dbe85e6cf43c70ea6f9537785322bc5280106c97b4e21ea828ebc5d997d027c260f4e1b4441909c3a3b7e61f51b95167cf6a632bce98fd2b6aa33eb413d";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/bg/thunderbird-45.5.1.tar.bz2";
+ locale = "bg";
+ arch = "linux-x86_64";
+ sha512 = "359973dc382c7565623f63ede93e37b1d1a2bbcf9690710e05fc066a8c7f67b059b9d14c978c93741d65544029e5970f520d7a64dd07902d89f0331b9a3330f3";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/bn-BD/thunderbird-45.5.1.tar.bz2";
+ locale = "bn-BD";
+ arch = "linux-x86_64";
+ sha512 = "f2d5b0c3fadb19d89733feecb50a7507b1c29dd93b5064a0db95292be1635c29bb3d98b84fb29ac38224c97dc7af29ff6024652562273eeca2a6ee38a0d19de3";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/br/thunderbird-45.5.1.tar.bz2";
+ locale = "br";
+ arch = "linux-x86_64";
+ sha512 = "3d1aba23ef4d969548b2fa729ad1795496f7123b4437f7692bfcbda4c87b0bd7edd1caf00cdb207eb4aaaf6c8ec8d0554d553a7db5a85e1e24d07c401d507794";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ca/thunderbird-45.5.1.tar.bz2";
+ locale = "ca";
+ arch = "linux-x86_64";
+ sha512 = "a1c04f9846edba32587b1f62379e703a62af0b9886f1e56e86854629a034657d86a4f06ace3bca9f75a21c734b559f17522692e4c90607ab353669bfe02a3dc4";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/cs/thunderbird-45.5.1.tar.bz2";
+ locale = "cs";
+ arch = "linux-x86_64";
+ sha512 = "f93ab27ec7e126aa309ba4d6d5900be7c427a29ccbbe141cd4e7f211daaeca6459163711204f02fafda285020173417d89a9c46f593114c81b73ce430a2c7743";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/cy/thunderbird-45.5.1.tar.bz2";
+ locale = "cy";
+ arch = "linux-x86_64";
+ sha512 = "9166a6c737dde179411e1a0d509141f29c7df7e3fe7e4f6def229be08bba4ccf5963804a86490d08e5ae3dd602f246c2fdce717562616445257b81b8c17ee795";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/da/thunderbird-45.5.1.tar.bz2";
+ locale = "da";
+ arch = "linux-x86_64";
+ sha512 = "6965968613889d69182ddf3dadf7e109e958d7561cb2b1a3936d9302b725d9c59c8cb8730ecf62e422a38c108da2ffa6ae5b012df348dd9250047a15b046e760";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/de/thunderbird-45.5.1.tar.bz2";
+ locale = "de";
+ arch = "linux-x86_64";
+ sha512 = "2a33d8104e1149181e91e9588a4236b481a8837835af2a1b08f3cc2dd55eecb3059aafbabccae8b0dbb8cfc632bdc8fc6198bb600b60a9dbff5a96a8609699d1";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/dsb/thunderbird-45.5.1.tar.bz2";
+ locale = "dsb";
+ arch = "linux-x86_64";
+ sha512 = "91314f8c8c7a9e1d13f618a1b71df8141933e6fe5f3317da06ac84ce1ea269bfe0740d94b2d8e240005a315a469cab39e79f70c06169712fdf318c9b3b5ac9c8";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/el/thunderbird-45.5.1.tar.bz2";
+ locale = "el";
+ arch = "linux-x86_64";
+ sha512 = "601ed7cd8f6f1e867647036ab3f8fadca0507f4441998ac29dfd15a6c8cf0c65b94cd647b0b4602d7624f041a8fd14a8210fde26a7c09763746d31008699e0d3";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/en-GB/thunderbird-45.5.1.tar.bz2";
+ locale = "en-GB";
+ arch = "linux-x86_64";
+ sha512 = "07222127e045d41f912baa160b08e22a373ba605f857d001c92792ebbcf789e1094c68e0f16bf9c609fda0321ee0a0f702c7d47481f4da6a9cb80071b7e21095";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/en-US/thunderbird-45.5.1.tar.bz2";
+ locale = "en-US";
+ arch = "linux-x86_64";
+ sha512 = "3dfeaa5e64b4063e0b5ae552bc47db1ab06e4381c55ccd35b05766aeac5add880804f07a40d39db08395a467ffa96d67261971359c46bce8d9ec6adde5948f2a";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/es-AR/thunderbird-45.5.1.tar.bz2";
+ locale = "es-AR";
+ arch = "linux-x86_64";
+ sha512 = "087caecb722222c3950c8a644cf7af37cd356b62b4802fcac1a4b93620fa086e2b3e97a6c5f6b22aa61d3478dad41bc7b8ab39d31bf76b710f2e53b36cea2049";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/es-ES/thunderbird-45.5.1.tar.bz2";
+ locale = "es-ES";
+ arch = "linux-x86_64";
+ sha512 = "f335002365f68e28cf0e28c407843f8de3184b33a7e57638104d1ac3515cfcbd14842ecc6d61a7de012e2cb1d7c5ff170598b5f81dbcbb71b81549f6a8bb5531";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/et/thunderbird-45.5.1.tar.bz2";
+ locale = "et";
+ arch = "linux-x86_64";
+ sha512 = "555874dfde25076892647a451bd9e02879eb5c8584dd22d5bb73f9c5deab5f64103d80c57292ed6a04b73fe27aa28d78210a1a5da7147fdae0980faaa8d19641";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/eu/thunderbird-45.5.1.tar.bz2";
+ locale = "eu";
+ arch = "linux-x86_64";
+ sha512 = "5f4361f43bca179613f24045835fe31e17fe949da0e2f9e470635d714f521abac45d0104e663ab44806a7e45f4d44d515b002508e8388c2c72e0b91c793ec8bf";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/fi/thunderbird-45.5.1.tar.bz2";
+ locale = "fi";
+ arch = "linux-x86_64";
+ sha512 = "5ee311ba705cdfd7a6687a1a17e7c5b40fda22fa7acb3a9a0c236e2aa3d8037bbf568d9be29853abf3d52d6840ea96b7ee59cf9264709973aee3bc43e8c07979";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/fr/thunderbird-45.5.1.tar.bz2";
+ locale = "fr";
+ arch = "linux-x86_64";
+ sha512 = "ffa44a92d3ab3ac8bcdd945b910e6da6a4c0b05f4c95572fd2a56fe73f935f7a387fb98100c7a84e4adc22c9b1cf8a0aa84ac04eb14c4b60b7989053c2021a0a";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/fy-NL/thunderbird-45.5.1.tar.bz2";
+ locale = "fy-NL";
+ arch = "linux-x86_64";
+ sha512 = "3cf5e391adca05195ea24be90a2414640f0fd72ffc858e971fc82675f49def7238c30f3ac48c08312414f436f9bde0ac2b05e11db94b40079c9d37f3d1a8ac5c";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ga-IE/thunderbird-45.5.1.tar.bz2";
+ locale = "ga-IE";
+ arch = "linux-x86_64";
+ sha512 = "4260f3a7245d8c7f0b6f3a0a47793c84eb83be44e19105a3efbc35ef1a1455f872a987c714eb95a1cfd4157816cd9eb09c5a6098460e90584e9d630812d66716";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/gd/thunderbird-45.5.1.tar.bz2";
+ locale = "gd";
+ arch = "linux-x86_64";
+ sha512 = "b9ce9839cd3a4e8fbbba4f107a934ab4733b1feb65dd1e40a1c064f39026d03d1208b67b413ed4c643c7039f91e1ceb8747f3a46cc44d1bedb22275512f867b8";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/gl/thunderbird-45.5.1.tar.bz2";
+ locale = "gl";
+ arch = "linux-x86_64";
+ sha512 = "fbd8a4eae6a94d966f8e1e9e2bcc7a6aed8b5a9991fc8367de28c11fc7b341fcf745c983f8259b89767a762604e55ade6212f5c1496dbf843c8eb49f89e8810c";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/he/thunderbird-45.5.1.tar.bz2";
+ locale = "he";
+ arch = "linux-x86_64";
+ sha512 = "51f3acbaf8971bd0bc93502605526f6d0be5093810f8a91f43c2597541dc23eb590a10b4f2839cd9ce1e13685fc7e38668184b12a23ae99356ffacf3f6481d83";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/hr/thunderbird-45.5.1.tar.bz2";
+ locale = "hr";
+ arch = "linux-x86_64";
+ sha512 = "65110b98cea4a6174dd31de4aea53d2efb1fee822025f9a7ccd6ef3ac80c0baa605fefd7078c3528451ffad7d9e86400c5b7b527b026aaca022a0099673442af";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/hsb/thunderbird-45.5.1.tar.bz2";
+ locale = "hsb";
+ arch = "linux-x86_64";
+ sha512 = "d50057bc3cdff3820f0bc09679f672d14a35240fc3e997836f9c04bd8aa922e41b627e0f632c2e76982439d4510262618d7d59adaa530708cadaf1fb111159e3";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/hu/thunderbird-45.5.1.tar.bz2";
+ locale = "hu";
+ arch = "linux-x86_64";
+ sha512 = "bbff40d50155756c0d06fc4c9f7bf31f770901139b0a8d475ee0d8bd7ff1b2d4e8f5f3343fffd7af83f5f53f0567845f6c7ddde8abbd3f9f004c31a1479ec4ed";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/hy-AM/thunderbird-45.5.1.tar.bz2";
+ locale = "hy-AM";
+ arch = "linux-x86_64";
+ sha512 = "570815807b0ea61bcf506effb2acc52ee6e8089b1328a046a8c55de0e3e72227a2d097ffe61f383733ca6f11405e5689595bc31f931f41e854f71770e18230de";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/id/thunderbird-45.5.1.tar.bz2";
+ locale = "id";
+ arch = "linux-x86_64";
+ sha512 = "ac9a78df1a8c6228560247e07cd7695eedf9ef0afd2c25a770aaffc8d96555f229e9332204e73ba803df2b8a7f590b970020b277123668ff20375608b093dc8c";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/is/thunderbird-45.5.1.tar.bz2";
+ locale = "is";
+ arch = "linux-x86_64";
+ sha512 = "cb78e3c2e1824d1da479e8ca5cdbdf420f7e046895a60b8912d44cbecf6966a32acbe2811545961a6da72f22052d8d2bed8d8ee1208b9c4e16250e6900265335";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/it/thunderbird-45.5.1.tar.bz2";
+ locale = "it";
+ arch = "linux-x86_64";
+ sha512 = "84c053e27ecd67a15d84bb2c222ed97061c130fde590db558c7f5919dd8acc8bcc5f032f84c53fe364f95607aa04bcf43375d2cc9fac2d4990535aa38d939793";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ja/thunderbird-45.5.1.tar.bz2";
+ locale = "ja";
+ arch = "linux-x86_64";
+ sha512 = "dada1c9e859b27a1bad7ba277749e77d68a20ad4c033861ee5ec54f78627efcaf336d082b1a8f9e4dfc91f6b16adde3eda873ae261351c3292c73c7f7ff05526";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ko/thunderbird-45.5.1.tar.bz2";
+ locale = "ko";
+ arch = "linux-x86_64";
+ sha512 = "3eead074a7c82570db1923b8a64afdd8d8d802d33c4087c8b647f905f580d27ede2913e1323b98c46fdeb83a91db1a43dd155d013d3f42b54a7daac1d541b449";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/lt/thunderbird-45.5.1.tar.bz2";
+ locale = "lt";
+ arch = "linux-x86_64";
+ sha512 = "2926b5ec95101dc682723a3157de86fcfd9974a7a74486c1d80481145feeb49264bc661621fed4739238e852ca2759dda155a2c22094da90c6d5dcf43107b3d4";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/nb-NO/thunderbird-45.5.1.tar.bz2";
+ locale = "nb-NO";
+ arch = "linux-x86_64";
+ sha512 = "cde8fcd4b1cd8202085aa7a04b5781cd561a2d2ad3e1551af420397816addee8d57f4c49036ba79e49bd6f4452107cf8f3acc7c238beca5814ac5522aff2195d";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/nl/thunderbird-45.5.1.tar.bz2";
+ locale = "nl";
+ arch = "linux-x86_64";
+ sha512 = "a78658fcd3cd6c9cf5c775d37e5ebb38f72e0317e30abf7dcbd57c0f400355bbe242ae4ae9862eeeccdfe0fe2cdfe6c6b1c06b8bda3010e941041bdeb6a51fab";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/nn-NO/thunderbird-45.5.1.tar.bz2";
+ locale = "nn-NO";
+ arch = "linux-x86_64";
+ sha512 = "e76bbf55d900e8c7c92e3ad130e58c061685f2abeb2f3ced71e52c36bd0d979eca58cc3a74daa394469281011e7339c15b423847bc43631bd6b3da7f1d4aecd5";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/pa-IN/thunderbird-45.5.1.tar.bz2";
+ locale = "pa-IN";
+ arch = "linux-x86_64";
+ sha512 = "0de6495b746c39e5117f5662b4896b206cb7a4f22a8a8c4f6c080f434b856fdf1f4029c7b8aa9a3372b6bd66d883c26ec82dc2aa17ce89005f462d58b6e3ecea";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/pl/thunderbird-45.5.1.tar.bz2";
+ locale = "pl";
+ arch = "linux-x86_64";
+ sha512 = "4179561c6fdb2b48a0ab87ac6d823b702181b18c3ca7f28f28a546cd7bbd7453a525e80600a5cebd89912fd69b78d768e136bf12398e5b0471a6fac310fafbe9";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/pt-BR/thunderbird-45.5.1.tar.bz2";
+ locale = "pt-BR";
+ arch = "linux-x86_64";
+ sha512 = "ed1c438050b3e0a22d61f39b9771f22e2425a9b7cca1fc9ae41606f708b32354f5cfe7321f87f3a77dd50270a7e38554215c6f8fbaa0ffbbc1a1c7f01c8c4c6c";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/pt-PT/thunderbird-45.5.1.tar.bz2";
+ locale = "pt-PT";
+ arch = "linux-x86_64";
+ sha512 = "07b00355b73786d61dfa2cf1752fe42f8c464291f77f8192117414b66ef5f3c627064a608abb18c6938c8a2b1e4dfe223ebeb4f1c4590bb8c80dadb0b77841d7";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/rm/thunderbird-45.5.1.tar.bz2";
+ locale = "rm";
+ arch = "linux-x86_64";
+ sha512 = "b95336e5ae9bf794e35dcf58fb8b4c17c4b4e58b4fd8552d708f15e6d9518640f42599350fcb6f140bac57e7d54d49946ab5c910ed67ac453b0c1c3150a195ed";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ro/thunderbird-45.5.1.tar.bz2";
+ locale = "ro";
+ arch = "linux-x86_64";
+ sha512 = "8a613cf9fbf8a96ee2b3a6610ad2638f388530601cb7af4bf9c44f73e92f21e97ea3a147887ebcb5080570bf6f7d9c0965e834eec011c646fc57100d8fcb7df1";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ru/thunderbird-45.5.1.tar.bz2";
+ locale = "ru";
+ arch = "linux-x86_64";
+ sha512 = "e74578096eca86f68e993f620eaf66f220cc577522e73592092b6c63657640cea95d0b41ea035d505580aee258629e2f36e2abca9952372d102bcb0136e995d8";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/si/thunderbird-45.5.1.tar.bz2";
+ locale = "si";
+ arch = "linux-x86_64";
+ sha512 = "00666797cc9b4ba2b3ec7c9914639ef5fda3df3c124aaa3255b37f721289f1b2e33a99e6e68d40a66daf96860b21c6af10a68a216b6e3a35d8261ba704be7081";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sk/thunderbird-45.5.1.tar.bz2";
+ locale = "sk";
+ arch = "linux-x86_64";
+ sha512 = "5ce7dbdf5f9ac2b46c1a27aace9607011dd064de64a778ae39009d9ae6d729da903f5a3c09def1ad7d571a8b717a3f66889053abb38eddfe4146b04597fc2a0c";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sl/thunderbird-45.5.1.tar.bz2";
+ locale = "sl";
+ arch = "linux-x86_64";
+ sha512 = "673413e23de2de7daa9c4230105c6e58f21d4ebfc55b1df58c0351448d2f252e128c03ee59ba43525d6c92e2578af4c073e08f6250b4c94bb42beba81ae20f7a";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sq/thunderbird-45.5.1.tar.bz2";
+ locale = "sq";
+ arch = "linux-x86_64";
+ sha512 = "aa560ee3859d3bed0c5d5c4203b05ff47f7357b674c9d4ddad403a5f0c403994ecb982ca15b542ec9a32d0f27a5e04f41c574a1cbdc5f056c8a57e62de778f7b";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sr/thunderbird-45.5.1.tar.bz2";
+ locale = "sr";
+ arch = "linux-x86_64";
+ sha512 = "5a86b2a9c67d489b21077eda647585291ddea2ea98d678b60fda134e11ee074ee39b06f84d3263d04b43358a10c04d4b238a65e9e3015801847e319850643bd3";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sv-SE/thunderbird-45.5.1.tar.bz2";
+ locale = "sv-SE";
+ arch = "linux-x86_64";
+ sha512 = "5d044f32243d99ffa8ab0b7345b0ea1a78d83cf6a921af0e89154c4f9f7caa21260f1e3c2c8287050dc44381f2979af51ab028efca7d197310d175dc86aecfcc";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ta-LK/thunderbird-45.5.1.tar.bz2";
+ locale = "ta-LK";
+ arch = "linux-x86_64";
+ sha512 = "e8f88dbf82414cf680d9748c606ef73fef11a37bafd82a3cd79b5c5abebedf629993e7ecb3e3d6dcd3524fbda10b8b0af743e2948ac49141c76d008432706c4f";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/tr/thunderbird-45.5.1.tar.bz2";
+ locale = "tr";
+ arch = "linux-x86_64";
+ sha512 = "cc5c84cd0854c0626e6c880e1abf4090f5488c84f39f52d466f2deb871ed55ad9890bf9f4a104c182ec292979eda56e4de114d328deddac5746ec9e969b6ecc6";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/uk/thunderbird-45.5.1.tar.bz2";
+ locale = "uk";
+ arch = "linux-x86_64";
+ sha512 = "42e535767e82c01868d2cd574805c814e7d67caaab9e531d0b82d36df92a2e42e19d8d6593b28c237b645e60035100d85a54b8acaba8c7a48ef83e865553cfc8";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/vi/thunderbird-45.5.1.tar.bz2";
+ locale = "vi";
+ arch = "linux-x86_64";
+ sha512 = "9a5b7cae14bcb8e390f7c8b7924a107058dc382e2627984f8c9eb5f380eb1d38b1152c928a5852d387d5d2b7ef7aa0d7393176a03dec0d3f1c1fade399149b7d";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/zh-CN/thunderbird-45.5.1.tar.bz2";
+ locale = "zh-CN";
+ arch = "linux-x86_64";
+ sha512 = "d025a3d878c6bf3ae9c1d07c023d89fc83b1c1314179f986fdac46066d334e209689d662bc7fef0fb7bfd7943cc741db5f397188b258ab42247a85c559ac27d7";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/zh-TW/thunderbird-45.5.1.tar.bz2";
+ locale = "zh-TW";
+ arch = "linux-x86_64";
+ sha512 = "6c750b1f7f1253f1702178cdc80a1f8962961e16fd1f2e3f2f9d91062785349183e52799a399e60dcf7a3b7208a0755c3d7c137c28ee0b6ac99ccfa75e63b60f";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ar/thunderbird-45.5.1.tar.bz2";
+ locale = "ar";
+ arch = "linux-i686";
+ sha512 = "a2495d8d9a56104b5c5d87e795689d0334563fdb98fa751a2d7bedc9993ba66d3b1cfdc9d0d3711b8c8a2f91d8267c97035d1120051baa4aefcba1b968b9edc8";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ast/thunderbird-45.5.1.tar.bz2";
+ locale = "ast";
+ arch = "linux-i686";
+ sha512 = "b1ccb4d51d9f5aec0cef3ccb0d5fcd14ca69a446cb18fc8b9f22d98325c0be45ea608f9c9ac15fb33e2b426b84c53e908a05331e360af728e088ad9c3cc77107";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/be/thunderbird-45.5.1.tar.bz2";
+ locale = "be";
+ arch = "linux-i686";
+ sha512 = "32d89785e95667d17b7b4d19d37557c7d592370e42613c8c171e1b816d38a16197fdf8397211f61a9261457ea426f6de84af721462e4296c825f931655e64e66";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/bg/thunderbird-45.5.1.tar.bz2";
+ locale = "bg";
+ arch = "linux-i686";
+ sha512 = "b5d2ed68959cc6a473e83db35634c6322f4638edae1a19f81d5ae1ab0080aed0940b751e96d3d3a562aa1811ca3c5435f2f3b0a205948f06c2d479cd98109e88";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/bn-BD/thunderbird-45.5.1.tar.bz2";
+ locale = "bn-BD";
+ arch = "linux-i686";
+ sha512 = "a76fb786e1cb0485b4e212097685fa259ff76386bce3cbbec1d47e061c7116df76adb8bf419e51ade098fdb9b55a7aad5348e13917104d22a0aa39518205ca47";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/br/thunderbird-45.5.1.tar.bz2";
+ locale = "br";
+ arch = "linux-i686";
+ sha512 = "51c1402350cec63a60f4ea96cdaedb1aa74250583a3cfed575060fb5990294446a8254108fcbd99607a286b8bde43357ccc8e0195330352d1497b8c173a7b283";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ca/thunderbird-45.5.1.tar.bz2";
+ locale = "ca";
+ arch = "linux-i686";
+ sha512 = "1df09781962fdfc7abc425f9f96d2efcc7471bb9bb8cf2c0152846673c7fbfc86b6b4c05d73d3c949607d056478661be0e0d24b769f816820d1e4670fdf240f7";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/cs/thunderbird-45.5.1.tar.bz2";
+ locale = "cs";
+ arch = "linux-i686";
+ sha512 = "463f336f49ababdb13397a10db3b189e3d364b07f9f42a4d31e770edd846c56fdb81f79228ffa51ab7f6555818bc3a0a3e5f1e546727bb3cd81f95f2264c392d";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/cy/thunderbird-45.5.1.tar.bz2";
+ locale = "cy";
+ arch = "linux-i686";
+ sha512 = "8a4802763162dd32577e02f878482094b3bae4c51b9ac7c109d188c8b5ab9fd0053c34eb2fabaed873e0ba9e7f5fac2ebe6604a0da00b806594e28fd0f823721";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/da/thunderbird-45.5.1.tar.bz2";
+ locale = "da";
+ arch = "linux-i686";
+ sha512 = "bc430839b463ee22e4d1736be48f8f9e958307c3069b337b0ad816e3f88274b22b98ce66fec267f4ed134750fed656b1ebad0bce29637594d053bd82d1be3d34";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/de/thunderbird-45.5.1.tar.bz2";
+ locale = "de";
+ arch = "linux-i686";
+ sha512 = "0a9ac8af9a823d69c8b2671f24bb203239a888d1423656241926dc5fa978e989ca5df303211e4a5208624d01ba34dd93915463eb88b0ee8ed027dad592a057c0";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/dsb/thunderbird-45.5.1.tar.bz2";
+ locale = "dsb";
+ arch = "linux-i686";
+ sha512 = "9f089cc93ed4660250ebb0d4c677d36515d9dbf29f78947c88558c69362663fffff293fbb3acaf4fca2e40a88d093d7637e385db757812cad29c31b6b746e87c";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/el/thunderbird-45.5.1.tar.bz2";
+ locale = "el";
+ arch = "linux-i686";
+ sha512 = "1099c8443c089ac7f430023960802ab2ce914f103983d68dd283f0f1bb7d36ff8b35e44b7e766237cf19e9c6f02e5dbbab5f62e4cfdd8b80816d0892779732bd";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/en-GB/thunderbird-45.5.1.tar.bz2";
+ locale = "en-GB";
+ arch = "linux-i686";
+ sha512 = "1efadd60994808919b24214c1610dccda0a76bf0de6cf3518b6eb665d035272f1a2e5e4e9e09fc2d4eb5a7021bdfaf3c3391e166737824355bb859b1d3fa54b8";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/en-US/thunderbird-45.5.1.tar.bz2";
+ locale = "en-US";
+ arch = "linux-i686";
+ sha512 = "663ff453dfc556bd85633030e271174d96f039d8ea77bb1a338df02298feaea297ca7b4010d9c2973d19ba988b6e2b807486ca40f69bbfce84d0b7f8b21f7c32";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/es-AR/thunderbird-45.5.1.tar.bz2";
+ locale = "es-AR";
+ arch = "linux-i686";
+ sha512 = "34fbd5a614ef5a0b9c46b63c80292dfe7caf2f65758a52d130ad4567311cde3e84ca1ab41d5fa87509b5ad9c6ce4ab136a4c08f1977b3695e5471265a758bd7d";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/es-ES/thunderbird-45.5.1.tar.bz2";
+ locale = "es-ES";
+ arch = "linux-i686";
+ sha512 = "e429e936f7d022b421c995ea8df18d72a3abf8a9dd2a0a6ae87435333c94a8abdcfa3c2416e36f883b1d2b5f573a17d8a38161fed5ff323767fc25756dc72d69";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/et/thunderbird-45.5.1.tar.bz2";
+ locale = "et";
+ arch = "linux-i686";
+ sha512 = "3ec9056dc49cbc6b7734498ab5522fef93eeb6f08668cd04bb610bf0d2519759c614de07562706a3efc2b5e64325a70c04b18fb3138c2ce3cabe6ba1a51bdde5";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/eu/thunderbird-45.5.1.tar.bz2";
+ locale = "eu";
+ arch = "linux-i686";
+ sha512 = "951a9fcb82f77cb45a5ccaf300d0516da7d1be069931fde87e729b9c9d99a0a07ee810a4bf4791698741ff52128f66d6ecc3d8c7887cf22462006929c582cacf";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/fi/thunderbird-45.5.1.tar.bz2";
+ locale = "fi";
+ arch = "linux-i686";
+ sha512 = "e28371194085e689d6445ce3a0de77c7b8127aeb740769ff2aaa8f0345cfbc7b3e8ad5f2d891c8ca34c2fa004cfcaace649b900248493e5c6ac4404b6f581e19";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/fr/thunderbird-45.5.1.tar.bz2";
+ locale = "fr";
+ arch = "linux-i686";
+ sha512 = "f135ff1b365df65cc9fab35941628be6f6264d2c91d8394d22fc35e945207640c8238cf2e0046598348d7521c1684eccdae0d7f0dc2bb22f415a862cad72d67a";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/fy-NL/thunderbird-45.5.1.tar.bz2";
+ locale = "fy-NL";
+ arch = "linux-i686";
+ sha512 = "c90579ec9607992f4e551d327a3122d6bfd87ef3f1fb4708579c1a07deb2270a252c7443f3a3551bb725ef46a8cd9fa61cf59910260f9775eb8805e5e8acd61e";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ga-IE/thunderbird-45.5.1.tar.bz2";
+ locale = "ga-IE";
+ arch = "linux-i686";
+ sha512 = "a6a9f52acd576b615075f8829cff2ed085e7254e8a4a2380c0eb088cba1986ac81f9d0badecbf0ece1f7ba7b7b169c8cda23fb32a9e79fa78d29fe8c0cb4c8de";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/gd/thunderbird-45.5.1.tar.bz2";
+ locale = "gd";
+ arch = "linux-i686";
+ sha512 = "12edcfd67dbc5d093d1c22eb707668e4f534a6baf96986e436684c9271d165fb2f422a2e84ef35b72063f1a91100230c92df2b08aee428ea0b384d6658f6bcb3";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/gl/thunderbird-45.5.1.tar.bz2";
+ locale = "gl";
+ arch = "linux-i686";
+ sha512 = "d357cc4f8a9ba8ff47458b03d17e4d10dc7be8bb16493ac3e896f63a3229962034012c7ecda4a70d4dd1d9c4aa76c349bf21725c6164fc96e6fc36f9b0fea9ea";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/he/thunderbird-45.5.1.tar.bz2";
+ locale = "he";
+ arch = "linux-i686";
+ sha512 = "440a86fb6a94657f05eda2bde2a2e74d17398468a0b603866a03a7f37458e69a921e81d2ac1af2718f1168a56ee03ad596c39e8d88c933576efecb99a724957e";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/hr/thunderbird-45.5.1.tar.bz2";
+ locale = "hr";
+ arch = "linux-i686";
+ sha512 = "1b5960e4df8a6247c63fb3f5e80b1795b4e098f446debd96b6344dbf97694337d6437dad53635fac57036ed6551b8a780ca4880dc35626aee83860a5934f3f9f";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/hsb/thunderbird-45.5.1.tar.bz2";
+ locale = "hsb";
+ arch = "linux-i686";
+ sha512 = "bba6aa43cfee2422414c526f0c40fdc70984acb54e25e5eb75ef684e674b17a8dbf606e31d5d609bd572647ab3a9bbd78c76669156a1d2d4d45d8402650148b5";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/hu/thunderbird-45.5.1.tar.bz2";
+ locale = "hu";
+ arch = "linux-i686";
+ sha512 = "026a686dbe81a4c52bd3997de66e0919ea870954a3d14c4483f5f76f618424013b82a2478ec9eb3f506a1f666ef3333832a3e4533adcce41901db79120d2a454";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/hy-AM/thunderbird-45.5.1.tar.bz2";
+ locale = "hy-AM";
+ arch = "linux-i686";
+ sha512 = "a798c9581cdb2debbe773ed952bbc56f7d7444eac5a448fce0f17ba2b260405526cdcec306c39c39b2e80ce7addba810bc659312505af8c0a928c8a2f8107245";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/id/thunderbird-45.5.1.tar.bz2";
+ locale = "id";
+ arch = "linux-i686";
+ sha512 = "ce54045626941976435a94bc5cf7513b79bc4e3e6a3b03bf1036ce9433cc6042689735b95d60afc4bf1de2ea31fe0ebc55b856bb51f0ba468744931a8c0727fa";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/is/thunderbird-45.5.1.tar.bz2";
+ locale = "is";
+ arch = "linux-i686";
+ sha512 = "7e0a2c31968102010d1fba379a25c4bcbbf447f2a0005e01271faf1e19dc7e71a5f8cfcfbf36ed510743d53886864aa4164284e99f7ab86ac27629ffaca6000a";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/it/thunderbird-45.5.1.tar.bz2";
+ locale = "it";
+ arch = "linux-i686";
+ sha512 = "4852e13d1be422f107e18537bb364b04fb06fbb4854bb30f97753b0e0138ca2d9073e29c4b5905154fcd215701b300c0680025310479c6dca4294e3a591ff841";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ja/thunderbird-45.5.1.tar.bz2";
+ locale = "ja";
+ arch = "linux-i686";
+ sha512 = "c539473ab434e20528f252f76f542f1938accde06b7d460b8e4a767a2721cded73710cca2264d2b18cd533a6118dfa9ae1c2701a6e1b18afe398f42a109439e9";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ko/thunderbird-45.5.1.tar.bz2";
+ locale = "ko";
+ arch = "linux-i686";
+ sha512 = "59421684c74f6c9fce41c4769ef725445bc84224357db21f1f4c9f5154c695a337445bfa05fca1f045d0e05ce64faf2d2e5a9be8cac0d62dfa17bf1571f9db57";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/lt/thunderbird-45.5.1.tar.bz2";
+ locale = "lt";
+ arch = "linux-i686";
+ sha512 = "317315c0c436ddf882ac2d5a5c76a942f0fe04f80c1d7634ff7223b363b5fedd0778b127e1cbe21e737acdb869e770b9c828a9df075eb19f4d4870767297b912";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/nb-NO/thunderbird-45.5.1.tar.bz2";
+ locale = "nb-NO";
+ arch = "linux-i686";
+ sha512 = "36638e01b76b608c2af0dd6f6336877fab6e0c8b8d16c5f90095c0bb24d475bf5486782fc26061dea134e7817288d84b8b805351411b7e70f39f3a76c9354b92";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/nl/thunderbird-45.5.1.tar.bz2";
+ locale = "nl";
+ arch = "linux-i686";
+ sha512 = "03aa22ab612c39e9a7df2a346a338b70c6ee13802860ab9359322e6fae425c1f8416cab762b9e061e3d8b34417043c3979e49a5c7079bc8327c0a317e5b98abf";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/nn-NO/thunderbird-45.5.1.tar.bz2";
+ locale = "nn-NO";
+ arch = "linux-i686";
+ sha512 = "4594fdc88d66a61567652f4ef7fbf43b55853933f098526671801e0fcd6256367e71c5a179419b1015d410b49a26505879ba0397013c8b510a2462798e5b3821";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/pa-IN/thunderbird-45.5.1.tar.bz2";
+ locale = "pa-IN";
+ arch = "linux-i686";
+ sha512 = "590b974b9785db9843b35dfdd9aa9d8422379570b6511a02564d5a0edbaeafad38f99aba403cb996ed47416a9944ca7fcc74d8aacda74c8113de7f112b10f397";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/pl/thunderbird-45.5.1.tar.bz2";
+ locale = "pl";
+ arch = "linux-i686";
+ sha512 = "f03e723aebf1c7709a0f08b9416acef98b5e4082b981fae3276d26e3c11650153cc56fd8f96653eb9d2b5213f5ccc42e062b42cf6182dc910c56a24f07440102";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/pt-BR/thunderbird-45.5.1.tar.bz2";
+ locale = "pt-BR";
+ arch = "linux-i686";
+ sha512 = "906510719e6d7149fe2c8cee9d5a88ae0a86cbd4bb6e2c4ec0bc4d77b252f71b98939f4002dab69a24db75d022e485d1711350ca1f26b3b55b05701dfff6f9da";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/pt-PT/thunderbird-45.5.1.tar.bz2";
+ locale = "pt-PT";
+ arch = "linux-i686";
+ sha512 = "1ed53b8ac706dc2750276928b507c072e3b2e49f7df2ab6d382b31b0618da6e41ce3fcf50f7815b4736859fe899017ea4a646f4594f4ac7ef5c272ccdd6d69a7";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/rm/thunderbird-45.5.1.tar.bz2";
+ locale = "rm";
+ arch = "linux-i686";
+ sha512 = "6fa680229b2dadfe6984af37d1ec93ef9d5f2d9014bc62618690c2e71a6bf8bd7d945fb0312553f0f2858fee89b454b84375a65fbb90f8479d1812d838ef1109";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ro/thunderbird-45.5.1.tar.bz2";
+ locale = "ro";
+ arch = "linux-i686";
+ sha512 = "102b3a1c23742bf9fad04c1d87a43cf4b6f805b93528ec7139d5b3eecf141990594f32c2c89a7a950aa4257801ec2e5aa91ca6fcf2e1a067978f47cec500f6b3";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ru/thunderbird-45.5.1.tar.bz2";
+ locale = "ru";
+ arch = "linux-i686";
+ sha512 = "6d2a1bb3db76516f1011b701827b43e66099a50d575facd3b5be9718be21d4b7ef80feba091e4273960af8f56f416514c2d308877b039be06898bb50365e9e27";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/si/thunderbird-45.5.1.tar.bz2";
+ locale = "si";
+ arch = "linux-i686";
+ sha512 = "9900c9462c97d7e783dc9893a4a6f87a0e000866ddb3dffefd67548b30ffa4e9db8a2e93247027a45aae03c9d0bac305991a1684de17e8bd28f3c2d3e5a38309";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sk/thunderbird-45.5.1.tar.bz2";
+ locale = "sk";
+ arch = "linux-i686";
+ sha512 = "ca001243f8359c38b781fea53c3ede7baabea25af516d852e75b6beaca9ea1b9ce4964c345ff5754657a1a953a18bef2c631e962d92f699e2dc5a31a9d594d39";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sl/thunderbird-45.5.1.tar.bz2";
+ locale = "sl";
+ arch = "linux-i686";
+ sha512 = "ff9784d31a9233c925d1745752497cbe055df378b702169ed4cf1df144b00936566d9dbef4ae5ed9821933e70bec3ef71de4086b0a89f639df2bd57e1796ef3c";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sq/thunderbird-45.5.1.tar.bz2";
+ locale = "sq";
+ arch = "linux-i686";
+ sha512 = "f2e3bccba1c8ad67d696e54e2001726cabe6f61e41daaa9dab2eee00cac7877a8af15c4876993ebed6042fe540c68b25fcee52888a6bd5ad6726875bb4489e05";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sr/thunderbird-45.5.1.tar.bz2";
+ locale = "sr";
+ arch = "linux-i686";
+ sha512 = "9739c33d30b7e6d6c28fc29f8f1badb06d32ae686fc684ec6743a5ffc4ba42d6060ba95c2bd1e3c2486c4d36ee0f14a1201f74768197073136991e49acec79ff";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sv-SE/thunderbird-45.5.1.tar.bz2";
+ locale = "sv-SE";
+ arch = "linux-i686";
+ sha512 = "e394654340d4f2da306149ed7cf0413ac0d40fb1488402e12e15c09c831585ecfcf6c355b420a902d76ec0aea7a5c9e234004f1ee19ed295d7b52343ab67c9a6";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ta-LK/thunderbird-45.5.1.tar.bz2";
+ locale = "ta-LK";
+ arch = "linux-i686";
+ sha512 = "08154b5030c58cb52ef6b6584fc3d20d62e02cc0ee919f37c3a2e97f5afdac777f9dc6dd5881e3a87e5c20dfefdf816c068da014e42e111a3a8c7043b6e9002a";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/tr/thunderbird-45.5.1.tar.bz2";
+ locale = "tr";
+ arch = "linux-i686";
+ sha512 = "63bcbce3c8f6e635cbfc73f83b33c6c6e9fd5f45f8878aa500772f807f1acdf611dcf4002084902937f95cd1abab1a76e00822327235e7b61ffb369b327974de";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/uk/thunderbird-45.5.1.tar.bz2";
+ locale = "uk";
+ arch = "linux-i686";
+ sha512 = "c55ae7ae3e388ec11d8c9bbeb3f18fa5883a5ea5b90d924e5f9a7d61876142a7b336eb50d35e54a405cee803ab7ad4d754a7ceb02cb9a2b9adeb415c44bd0c88";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/vi/thunderbird-45.5.1.tar.bz2";
+ locale = "vi";
+ arch = "linux-i686";
+ sha512 = "52e05acb6c681ba62b608cb60d24816aaa35f296b6552b7006fe56b2f2d908a71736490c85e8bfb350d468510a031deedad65f691e4b77fc1dfee26bd30bdb41";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/zh-CN/thunderbird-45.5.1.tar.bz2";
+ locale = "zh-CN";
+ arch = "linux-i686";
+ sha512 = "caa4533f57b85ed57ef66fe4807f8079d8bef73ad9a454e23a90154253c205a110e13fe1376c0a7d644b326f7dde888d8ed97ffedb8282d8887bb7131749f510";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/zh-TW/thunderbird-45.5.1.tar.bz2";
+ locale = "zh-TW";
+ arch = "linux-i686";
+ sha512 = "d3e44f2f92ec4bf6b4a5dfebbcd2f05b323050ff88a1eb3b19301224a6815051e0e884e663dde834cef0a6889217ae94e446669aa0c97201c2d1f1bc2729c1b3";
+ }
+ ];
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index d44c749a55a..fb78c3cca24 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, which, m4, gtk2, pango, perl, python, zip, libIDL
+{ stdenv, fetchurl, pkgconfig, which, m4, gtk2, pango, perl, python2, zip, libIDL
, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xorg
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
-, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
+, yasm, mesa, sqlite, unzip, makeWrapper
, hunspell, libevent, libstartup_notification, libvpx
, cairo, gstreamer, gst_plugins_base, icu
, debugBuild ? false
@@ -13,7 +13,7 @@
enableOfficialBranding ? false
}:
-let version = "45.4.0"; in
+let version = "45.5.1"; in
let verName = "${version}"; in
stdenv.mkDerivation rec {
@@ -21,15 +21,15 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz";
- sha512 = "9c601d9625b43103b64e111da3a88fccdc30d4a52aa8a66ee02120bc13f3c5600d24fa1cfd3817975a0e58be9078d192334dd3099aa462468d8ab0cd05a3bcd5";
+ sha512 = "f6dc5f526e50facb9947627fcbc8db222cc20438fa62c552090dcabeabcc31dba2c66c20345090deaf5b58fd42b54938935eb1b3904528dce5949fd4cfc1ceb7";
};
buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx
[ pkgconfig which libpng gtk2 perl zip libIDL libjpeg zlib bzip2
- python dbus dbus_glib pango freetype fontconfig xorg.libXi
+ python2 dbus dbus_glib pango freetype fontconfig xorg.libXi
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
alsaLib nspr nss libnotify xorg.pixman yasm mesa
- xorg.libXScrnSaver xorg.scrnsaverproto pysqlite
+ xorg.libXScrnSaver xorg.scrnsaverproto
xorg.libXext xorg.xextproto sqlite unzip makeWrapper
hunspell libevent libstartup_notification cairo icu
] ++ [ m4 ];
diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
new file mode 100644
index 00000000000..53520909b09
--- /dev/null
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, qt5, qmakeHook, makeQtWrapper, pkgconfig, sqlite }:
+
+stdenv.mkDerivation rec {
+ name = "quiterss-${version}";
+ version = "0.18.4";
+
+ src = fetchFromGitHub {
+ owner = "QuiteRSS";
+ repo = "quiterss";
+ rev = "${version}";
+ sha256 = "0gk4s41npg8is0jf4yyqpn8ksqrhwxq97z40iqcbd7dzsiv7bkvj";
+ };
+
+ buildInputs = [ qt5.qtbase qt5.qttools qt5.qtwebkit qmakeHook makeQtWrapper pkgconfig sqlite.dev ];
+
+ postInstall = ''
+ wrapQtProgram "$out/bin/quiterss"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A Qt-based RSS/Atom news feed reader";
+ longDescription = ''
+ QuiteRSS is a open-source cross-platform RSS/Atom news feeds reader
+ written on Qt/C++
+ '';
+ homepage = "https://quiterss.org";
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ primeos ];
+ };
+}
diff --git a/pkgs/applications/networking/p2p/ktorrent/5.nix b/pkgs/applications/networking/p2p/ktorrent/5.nix
new file mode 100644
index 00000000000..7e47838c4f9
--- /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/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix
index 43ec9a5b022..b6f4d8b5b19 100644
--- a/pkgs/applications/networking/p2p/twister/default.nix
+++ b/pkgs/applications/networking/p2p/twister/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, python
+{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, python2
, boost, db, openssl, geoip, libiconv, miniupnpc
, srcOnly, fetchgit
}:
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
- autoconf automake libtool pkgconfig python
+ autoconf automake libtool pkgconfig python2
boost db openssl geoip miniupnpc libiconv
];
diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix
index 9be45e126a1..f8cd1ab1d00 100644
--- a/pkgs/applications/networking/pyload/default.nix
+++ b/pkgs/applications/networking/pyload/default.nix
@@ -6,8 +6,8 @@ pythonPackages.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "pyload";
repo = "pyload";
- rev = "03f3ad9e39da2b9a378987693c4a69720e4084c7";
- sha256 = "0fgsz6yzxrlq3qvsyxsyzgmy4za35v1xh3i4drhispk9zb5jm1xx";
+ rev = "721ea9f089217b9cb0f2799c051116421faac081";
+ sha256 = "1ad4r9slx1wgvd2fs4plfbpzi4i2l2bk0lybzsb2ncgh59m87h54";
};
patches =
@@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec {
propagatedBuildInputs = with pythonPackages; [
pycurl jinja2 beaker thrift simplejson pycrypto feedparser tkinter
- beautifulsoup
+ beautifulsoup send2trash
];
#remove this once the PR patches above are merged. Needed because githubs diff endpoint
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index f8ec7ec01d9..57d04e52845 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -24,17 +24,17 @@
stdenv.mkDerivation rec {
name = "citrix-receiver-${version}";
- version = "13.3.0";
+ version = "13.4.0";
homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86";
src = requireFile rec {
- name = "${prefixWithBitness}-${version}.344519.tar.gz";
+ name = "${prefixWithBitness}-${version}.10109380.tar.gz";
sha256 =
if stdenv.is64bit
- then "11l0s4f1si43qlxai053ps4nks7v4bahipsmcdpnrdzq0vps17ls"
- else "0sbgkb9a3ss2n08lal7qk8pmxyqbvkm7jj7l995ddjaa6jbkr3fz";
+ then "133brs0sq6d0mgr19rc6ig1n9ahm3ryi23v5nrgqfh0hgxqcrrjb"
+ else "0r7jfl5yqv1s2npy8l9gsn0gbb82f6raa092ppkc8xy5pni5sh7l";
message = ''
In order to use Citrix Receiver, you need to comply with the Citrix EULA and download
the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from:
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index be685118e1f..288fa438361 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -16,13 +16,13 @@ in
stdenv.mkDerivation rec {
name = "teamviewer-${version}";
- version = "11.0.57095";
+ version = "12.0.71510";
src = fetchurl {
# There is a 64-bit package, but it has no differences apart from Debian dependencies.
# Generic versioned packages (teamviewer_${version}_i386.tar.xz) are not available for some reason.
url = "http://download.teamviewer.com/download/teamviewer_${version}_i386.deb";
- sha256 = "0gdqy6b3np8ndlrq5cwgsys6ad529904133za51r20cj528n7rx3";
+ sha256 = "0f2qc2rpxk7zsyfxlsfr5gwbs9vhnzc3z7ib677pnr99bz06hbqp";
};
unpackPhase = ''
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
ln -s $out/share/teamviewer/tv_bin/script/teamviewer $out/bin
ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin
- ln -s $out/share/teamviewer/tv_bin/desktop/teamviewer-teamviewer*.desktop $out/share/applications
+ ln -s $out/share/teamviewer/tv_bin/desktop/com.teamviewer.*.desktop $out/share/applications
ln -s /var/lib/teamviewer $out/share/teamviewer/config
ln -s /var/log/teamviewer $out/share/teamviewer/logfiles
ln -s ${xdg_utils}/bin $out/share/teamviewer/tv_bin/xdg-utils
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
sed -i "/TV_LD64_PATH=.*/d" script/tvw_config
''}
- sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/teamviewer-*.desktop
+ sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/com.teamviewer.*.desktop
for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/*; do
echo "patching $i"
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 99df01afa6a..637f2cdca9c 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.3";
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 = "0fsrvl6sp772g2q2j24h10h9lfda6q67x7wahjjm8849i2gciflp";
};
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 00000000000..bb767da94d0
--- /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 d7918b3b912..4263b7e6f77 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.15";
name = "syncthing-${version}";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
- sha256 = "0zhxgl6pgf60x99cappdfzk7h23g37hlanh72bwypx7pwbvhc91l";
+ sha256 = "0iq7pzb9f0vgikxxxwvrhi5rlgw9frcwy0lgvc61l6lbw3vl0rd7";
};
buildInputs = [ go ];
diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 20ab6ce6f60..5f1c721e4c4 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -1,29 +1,22 @@
{ fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook
-, hicolor_icon_theme, libsoup}:
-
-let
- download_root = "http://homebank.free.fr/public/";
- name = "homebank-5.1";
- lastrelease = download_root + name + ".tar.gz";
- oldrelease = download_root + "old/" + name + ".tar.gz";
-in
-
-stdenv.mkDerivation {
- inherit name;
+, hicolor_icon_theme, libsoup, gnome3 }:
+stdenv.mkDerivation rec {
+ name = "homebank-5.1.2";
src = fetchurl {
- urls = [ lastrelease oldrelease ];
- sha256 = "1v6za6md5sjb1r3f5lc9k03v2q68cbx6g64vcn69666c42za2aq0";
+ url = "http://homebank.free.fr/public/${name}.tar.gz";
+ sha256 = "09zsq5l3s8cg4slhsyybsq8v1arnhh07i0rzka3j6ahysky15pfh";
};
- buildInputs = [ pkgconfig gtk libofx intltool hicolor_icon_theme
- wrapGAppsHook libsoup ];
+ nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+ buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup
+ gnome3.defaultIconTheme ];
- meta = {
+ meta = with stdenv.lib; {
description = "Free, easy, personal accounting for everyone";
homepage = http://homebank.free.fr/;
- license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; linux;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ viric pSub ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix
index b8d04baf356..bb2c6adbf3b 100644
--- a/pkgs/applications/office/keepnote/default.nix
+++ b/pkgs/applications/office/keepnote/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, python2Packages }:
-pythonPackages.buildPythonApplication {
+python2Packages.buildPythonApplication {
name = "keepnote-0.7.8";
namePrefix = "";
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication {
sha256 = "0nhkkv1n0lqf3zn17pxg5cgryv1wwlj4hfmhixwd76rcy8gs45dh";
};
- propagatedBuildInputs = with pythonPackages; [ pyGtkGlade ];
+ propagatedBuildInputs = with python2Packages; [ pyGtkGlade ];
# Testing fails.
doCheck = false;
diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix
index 553719a1c60..52b81595e43 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 8a69ca8eeb3..cbe159857eb 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/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
index d2010d81a8a..3d2514f8414 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
@@ -595,11 +595,11 @@
md5name = "c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2";
}
{
- name = "libpng-1.6.19.tar.gz";
- url = "http://dev-www.libreoffice.org/src/libpng-1.6.19.tar.gz";
- sha256 = "9f977ac8e4e3d4d5b001b32243f111eeec21bb6b59e583f2fb41fd2e48840352";
- md5 = "3121bdc77c365a87e054b9f859f421fe";
- md5name = "3121bdc77c365a87e054b9f859f421fe-libpng-1.6.19.tar.gz";
+ name = "libpng-1.6.24.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/libpng-1.6.24.tar.gz";
+ sha256 = "be46e0d14ccac3800f816ae860d191a1187a40164b7552c44afeee97a9caa0a3";
+ md5 = "65213080dd30a9b16193d9b83adc1ee9";
+ md5name = "65213080dd30a9b16193d9b83adc1ee9-libpng-1.6.24.tar.gz";
}
{
name = "poppler-0.26.4.tar.gz";
diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix
index 33ba558ed29..078efa0227d 100644
--- a/pkgs/applications/office/libreoffice/still-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/still-primary-src.nix
@@ -3,7 +3,7 @@
rec {
major = "5";
minor = "1";
- patch = "5";
+ patch = "6";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
@@ -12,6 +12,6 @@ rec {
src = fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
- sha256 = "1qg0dj0zwh5ifhmvv4k771nmyqddz4ifn75s9mr1p0nyix8zks8x";
+ sha256 = "150xb76pc3889gfy4jrnq8sidymm1aihkm5pzy8b1fdy51zip804";
};
}
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 2963eff83e7..b3d69ef7f19 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -42,14 +42,14 @@ let
translations = fetchSrc {
name = "translations";
- sha256 = "1mzsz9pd2k1lpvwf7r5q90qmdp57160362cmlxaj6bxz52gr9f2i";
+ sha256 = "0g88dscdmixhv17lzz4k00jrrvmafxzv0bakzf0v9zny2b3hb6r2";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
- sha256 = "1qqpggcanchz0qqasc5xvginrpa5rx7ahj3dw2vk7n34xaarnni6";
+ sha256 = "1aqdzw4sqwfli9aah7zjir93nc1v5zdrbbgvmbn5wh1kawa8dr5g";
};
};
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 9409ab3e669..0ae0732da27 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, dpkg, makeWrapper, which
-,gcc, liborc, xorg, qt4, zlib
+, gcc, orc, xorg, qt4, zlib
, ...}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
@@ -23,7 +23,7 @@ let
deps = [
gcc.cc
- liborc
+ orc
qt4
xorg.libX11
zlib
diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix
new file mode 100644
index 00000000000..2c55be55b08
--- /dev/null
+++ b/pkgs/applications/office/paperwork/default.nix
@@ -0,0 +1,78 @@
+{ lib, python3Packages, fetchFromGitHub, gtk3, cairo
+, aspellDicts, buildEnv
+, gnome3, hicolor_icon_theme
+, xvfb_run, dbus
+}:
+
+python3Packages.buildPythonApplication rec {
+ name = "paperwork-${version}";
+ # Don't forget to also update paperwork-backend when updating this!
+ version = "1.0.6.1";
+
+ src = fetchFromGitHub {
+ repo = "paperwork";
+ owner = "jflesch";
+ rev = version;
+ sha256 = "1v1lxyi4crdik4jlwjds9n6lzw4m4l4f9n5azlinv8wb477qpv6h";
+ };
+
+ # Patch out a few paths that assume that we're using the FHS:
+ postPatch = ''
+ themeDir="$(echo "${gnome3.defaultIconTheme}/share/icons/"*)"
+ sed -i -e "s,/usr/share/icons/gnome,$themeDir," src/paperwork/deps.py
+
+ sed -i -e 's,sys\.prefix,"",g' \
+ src/paperwork/frontend/aboutdialog/__init__.py \
+ src/paperwork/frontend/mainwindow/__init__.py \
+ setup.py
+
+ sed -i -e '/^UI_FILES_DIRS = \[/,/^\]$/ {
+ c UI_FILES_DIRS = ["'"$out/share/paperwork"'"]
+ }' src/paperwork/frontend/util/__init__.py
+
+ sed -i -e '/^LOCALE_PATHS = \[/,/^\]$/ {
+ c LOCALE_PATHS = ["'"$out/share/locale"'"]
+ }' src/paperwork/paperwork.py
+
+ sed -i -e 's/"icon"/"icon-name"/g' \
+ src/paperwork/frontend/mainwindow/mainwindow.glade
+
+ sed -i -e 's/"logo"/"logo-icon-name"/g' \
+ src/paperwork/frontend/aboutdialog/aboutdialog.glade
+ '';
+
+ ASPELL_CONF = "dict-dir ${buildEnv {
+ name = "aspell-all-dicts";
+ paths = lib.collect lib.isDerivation aspellDicts;
+ }}/lib/aspell";
+
+ checkInputs = [ xvfb_run dbus.daemon ];
+ buildInputs = [ gnome3.defaultIconTheme hicolor_icon_theme ];
+
+ # A few parts of chkdeps need to have a display and a dbus session, so we not
+ # only need to run a virtual X server + dbus but also have a large enough
+ # resolution, because the Cairo test tries to draw a 200x200 window.
+ preCheck = ''
+ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+ --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+ paperwork-shell chkdeps paperwork
+ '';
+
+ propagatedBuildInputs = with python3Packages; [
+ paperwork-backend pypillowfight gtk3 cairo
+ ];
+
+ makeWrapperArgs = [
+ "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\""
+ "--prefix XDG_DATA_DIRS : \"$out/share\""
+ "--suffix XDG_DATA_DIRS : \"$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\""
+ ];
+
+ meta = {
+ description = "A personal document manager for scanned documents";
+ homepage = "https://github.com/jflesch/paperwork";
+ license = lib.licenses.gpl3Plus;
+ maintainers = [ lib.maintainers.aszlig ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index cda8fc63a12..93f51ce3f8b 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -31,7 +31,6 @@ pythonPackages.buildPythonApplication rec {
'';
postFixup = ''
- wrapPythonPrograms
substituteInPlace $out/bin/.zim-wrapped \
--replace "sys.argv[0] = 'zim'" "sys.argv[0] = '$out/bin/zim'"
'';
diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix
index 71ceca12224..7ae62b15d34 100644
--- a/pkgs/applications/science/biology/bcftools/default.nix
+++ b/pkgs/applications/science/biology/bcftools/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
makeFlags = [
"HSTDIR=${htslib}"
- "prefix=$out"
+ "prefix=$(out)"
"CC=cc"
];
diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix
new file mode 100644
index 00000000000..eb4d2714a12
--- /dev/null
+++ b/pkgs/applications/science/biology/plink-ng/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, zlib, openblas, darwin}:
+
+stdenv.mkDerivation rec {
+ name = "plink-ng-${version}";
+ version = "1.90b3";
+
+ src = fetchFromGitHub {
+ owner = "chrchang";
+ repo = "plink-ng";
+ rev = "v${version}";
+ sha256 = "1zhffjbwpd50dxywccbnv1rxy9njwz73l4awc5j7i28rgj3davcq";
+ };
+
+ buildInputs = [ zlib ] ++ (if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.Accelerate ] else [ openblas ]) ;
+
+ buildPhase = ''
+ sed -i 's|zlib-1.2.8/zlib.h|zlib.h|g' *.c *.h
+ ${if stdenv.cc.isClang then "sed -i 's|g++|clang++|g' Makefile.std" else ""}
+ make ZLIB=-lz ${if stdenv.isDarwin then "" else "BLASFLAGS=-lopenblas"} -f Makefile.std
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp plink $out/bin
+ '';
+
+ meta = {
+ description = "A comprehensive update to the PLINK association analysis toolset";
+ homepage = "https://www.cog-genomics.org/plink2";
+ license = stdenv.lib.licenses.gpl3;
+ platforms = stdenv.lib.platforms.all;
+ };
+}
+
diff --git a/pkgs/applications/science/logic/coq/8.6.nix b/pkgs/applications/science/logic/coq/8.6.nix
new file mode 100644
index 00000000000..9d3aa756aa5
--- /dev/null
+++ b/pkgs/applications/science/logic/coq/8.6.nix
@@ -0,0 +1,88 @@
+# - coqide compilation can be disabled by setting lablgtk to null;
+# - The csdp program used for the Micromega tactic is statically referenced.
+# However, coq can build without csdp by setting it to null.
+# In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
+# - The patch-level version can be specified through the `pl` argument to
+# the derivation; it defaults to the greatest.
+
+{ stdenv, fetchurl, writeText, pkgconfig
+, ocaml, findlib, camlp5, ncurses
+, lablgtk ? null, csdp ? null
+, pl ? "1"
+}:
+
+let
+ # version = "8.6pl${pl}";
+ version = "8.6";
+ sha256 = "1pw1xvy1657l1k69wrb911iqqflzhhp8wwsjvihbgc72r3skqg3f";
+ coq-version = "8.6";
+ buildIde = lablgtk != null;
+ ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
+ csdpPatch = if csdp != null then ''
+ substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
+ substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
+ '' else "";
+in
+
+stdenv.mkDerivation {
+ name = "coq-${version}";
+
+ inherit coq-version;
+ inherit ocaml camlp5;
+
+ src = fetchurl {
+ url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz";
+ inherit sha256;
+ };
+
+ buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
+
+ postPatch = ''
+ UNAME=$(type -tp uname)
+ RM=$(type -tp rm)
+ substituteInPlace configure --replace "/bin/uname" "$UNAME"
+ substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
+ substituteInPlace configure.ml --replace '"md5 -q"' '"md5sum"'
+ ${csdpPatch}
+ '';
+
+ setupHook = writeText "setupHook.sh" ''
+ addCoqPath () {
+ if test -d "''$1/lib/coq/${coq-version}/user-contrib"; then
+ export COQPATH="''${COQPATH}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/"
+ fi
+ }
+
+ envHooks=(''${envHooks[@]} addCoqPath)
+ '';
+
+ preConfigure = ''
+ configureFlagsArray=(
+ -opt
+ ${ideFlags}
+ )
+ '';
+
+ prefixKey = "-prefix ";
+
+ buildFlags = "revision coq coqide bin/votour";
+
+ postInstall = ''
+ cp bin/votour $out/bin/
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Coq proof assistant";
+ longDescription = ''
+ Coq is a formal proof management system. It provides a formal language
+ to write mathematical definitions, executable algorithms and theorems
+ together with an environment for semi-interactive development of
+ machine-checked proofs.
+ '';
+ homepage = "http://coq.inria.fr";
+ license = licenses.lgpl21;
+ branch = coq-version;
+ maintainers = with maintainers; [ roconnor thoughtpolice vbgl ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix
index 86935b178d9..f6837397e21 100644
--- a/pkgs/applications/science/logic/coq/HEAD.nix
+++ b/pkgs/applications/science/logic/coq/HEAD.nix
@@ -6,8 +6,8 @@
{stdenv, fetchgit, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:
let
- version = "8.5pre-0c999f02";
- coq-version = "8.5";
+ version = "8.6pre-0c999f02";
+ coq-version = "8.6";
buildIde = lablgtk != null;
ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
csdpPatch = if csdp != null then ''
@@ -24,20 +24,18 @@ stdenv.mkDerivation {
src = fetchgit {
url = git://scm.gforge.inria.fr/coq/coq.git;
- rev = "0c999f02ffcd61fcace0cc2d045056a82992a100";
- sha256 = "08z9z4bv4a8ha1jrn18vxad6d7y7h92ggr00rx8jfvvi290n9344";
+ rev = "ad768e435a736ca51ac79a575967b388b34918c7";
+ sha256 = "05s7sk1l3mvdjag3idnhkpj707y4bv56da7kpffw862f2qgfr77j";
};
buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
- patches = [ ./no-codesign.patch ];
-
postPatch = ''
UNAME=$(type -tp uname)
RM=$(type -tp rm)
substituteInPlace configure --replace "/bin/uname" "$UNAME"
substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
- substituteInPlace Makefile.build --replace "ifeq (\$(ARCH),Darwin)" "ifeq (\$(ARCH),Darwinx)"
+ substituteInPlace configure.ml --replace "\"Darwin\"; \"FreeBSD\"; \"OpenBSD\"" "\"Darwinx\"; \"FreeBSD\"; \"OpenBSD\""
${csdpPatch}
'';
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 6c421117807..f162fe4a86e 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -72,9 +72,9 @@ stdenv.mkDerivation {
(when (fboundp 'get-coq-library-directory)
(inherit-local-permanent coq-library-directory (get-coq-library-directory))
(coq-prog-args))
- ; Pass proof-general's coq flags to flycheck command (pretty ugly, should probably be part of PG)
- (inherit-local-permanent flycheck-command-wrapper-function (lambda (cmd)
- (append (funcall (default-value 'flycheck-command-wrapper-function) cmd) (coq-coqtop-prog-args coq-load-path))))
+ (mapc (lambda (arg)
+ (when (file-directory-p (concat arg "/lib/coq/${coq-version}/user-contrib"))
+ (setenv "COQPATH" (concat (getenv "COQPATH") ":" arg "/lib/coq/${coq-version}/user-contrib")))) '(${stdenv.lib.concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)}))
'';
};
diff --git a/pkgs/applications/science/logic/hol_light/Makefile.patch b/pkgs/applications/science/logic/hol_light/Makefile.patch
index b572001a75d..5c1ec4f7aaf 100644
--- a/pkgs/applications/science/logic/hol_light/Makefile.patch
+++ b/pkgs/applications/science/logic/hol_light/Makefile.patch
@@ -6,8 +6,8 @@ Index: Makefile
then cp pa_j_3.1x_6.02.1.ml pa_j.ml; \
else if test ${CAMLP5_VERSION} = "6.02.2" -o ${CAMLP5_VERSION} = "6.02.3" -o ${CAMLP5_VERSION} = "6.03" -o ${CAMLP5_VERSION} = "6.04" -o ${CAMLP5_VERSION} = "6.05" -o ${CAMLP5_VERSION} = "6.06" ; \
then cp pa_j_3.1x_6.02.2.ml pa_j.ml; \
-- else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" ; \
-+ else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" -o ${CAMLP5_VERSION} = "6.16" ; \
+- else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" -o ${CAMLP5_VERSION} = "6.15" -o ${CAMLP5_VERSION} = "6.16" ; \
++ else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" -o ${CAMLP5_VERSION} = "6.15" -o ${CAMLP5_VERSION} = "6.16" -o ${CAMLP5_VERSION} = "6.17" ; \
then cp pa_j_3.1x_6.11.ml pa_j.ml; \
else cp pa_j_3.1x_${CAMLP5_BINARY_VERSION}.xx.ml pa_j.ml; \
fi \
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index bc391c47b8b..fbd732595e6 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation {
buildInputs = [ ocaml camlp5 ];
+ patches = [ ./Makefile.patch ];
+
installPhase = ''
mkdir -p "$out/lib/hol_light" "$out/bin"
cp -a . $out/lib/hol_light
diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index e833b4afbbd..d1f4bc0a414 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -1,29 +1,23 @@
-{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, boost, python
-, gperftools, ninja, makeWrapper }:
+{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, gperftools }:
stdenv.mkDerivation rec {
name = "lean-${version}";
- version = "2016-07-05";
+ version = "2016-12-08";
src = fetchFromGitHub {
owner = "leanprover";
repo = "lean";
- rev = "cc70845332e63a1f1be21dc1f96d17269fc85909";
- sha256 = "09qz2vjw7whiggvw0cdaa4i2f49wnch2sd4r43glq181ssln27d6";
+ rev = "7b63d6566faaf1dc0f2c8e873c61f51dce9ab618";
+ sha256 = "0xxr7dnh7pmdbpxhl3cq9clwamxjk54zcxplsrz6xirk0qy7ga4l";
};
- buildInputs = [ gmp mpfr boost cmake python gperftools ninja makeWrapper ];
+ buildInputs = [ gmp mpfr cmake gperftools ];
enableParallelBuilding = true;
preConfigure = ''
- patchShebangs bin/leantags
cd src
'';
- postInstall = ''
- wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin
- '';
-
meta = with stdenv.lib; {
description = "Automatic and interactive theorem prover";
homepage = "http://leanprover.github.io";
diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix
new file mode 100644
index 00000000000..a938af72f58
--- /dev/null
+++ b/pkgs/applications/science/logic/lean2/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, boost, python
+, gperftools, ninja, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ name = "lean2-${version}";
+ version = "2016-11-29";
+
+ src = fetchFromGitHub {
+ owner = "leanprover";
+ repo = "lean2";
+ rev = "a086fb334838c427bbc8f984eb44a4cbbe013a6b";
+ sha256 = "0qlvhnb37amclgcyizl8bfab33b0a3jk54br9gsrik8cq76lkwwx";
+ };
+
+ buildInputs = [ gmp mpfr cmake python gperftools ninja makeWrapper ];
+ enableParallelBuilding = true;
+
+ preConfigure = ''
+ patchShebangs bin/leantags
+ cd src
+ '';
+
+ postInstall = ''
+ wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Automatic and interactive theorem prover (version with HoTT support)";
+ homepage = "http://leanprover.github.io";
+ license = licenses.asl20;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ thoughtpolice gebner ];
+ };
+}
diff --git a/pkgs/applications/science/logic/minisat/darwin.patch b/pkgs/applications/science/logic/minisat/darwin.patch
new file mode 100644
index 00000000000..f2b618d6bb3
--- /dev/null
+++ b/pkgs/applications/science/logic/minisat/darwin.patch
@@ -0,0 +1,26 @@
+https://github.com/fasterthanlime/homebrew-mingw/blob/master/Library/Formula/minisat.rb
+
+diff --git a/utils/System.cc b/utils/System.cc
+index a7cf53f..feeaf3c 100644
+--- a/utils/System.cc
++++ b/utils/System.cc
+@@ -78,16 +78,17 @@ double Minisat::memUsed(void) {
+ struct rusage ru;
+ getrusage(RUSAGE_SELF, &ru);
+ return (double)ru.ru_maxrss / 1024; }
+-double MiniSat::memUsedPeak(void) { return memUsed(); }
++double Minisat::memUsedPeak(void) { return memUsed(); }
+
+
+ #elif defined(__APPLE__)
+ #include
+
+-double Minisat::memUsed(void) {
++double Minisat::memUsed() {
+ malloc_statistics_t t;
+ malloc_zone_statistics(NULL, &t);
+ return (double)t.max_size_in_use / (1024*1024); }
++double Minisat::memUsedPeak() { return memUsed(); }
+
+ #else
+ double Minisat::memUsed() {
diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix
index 3ed055cc093..d980afee7c4 100644
--- a/pkgs/applications/science/logic/minisat/default.nix
+++ b/pkgs/applications/science/logic/minisat/default.nix
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "023qdnsb6i18yrrawlhckm47q8x0sl7chpvvw3gssfyw3j2pv5cj";
};
- patches = stdenv.lib.optionals stdenv.cc.isClang [ ./clang.diff ];
+ patches =
+ [ ./darwin.patch ]
+ ++ stdenv.lib.optionals stdenv.cc.isClang [ ./clang.diff ];
buildInputs = [ zlib ];
diff --git a/pkgs/applications/science/logic/proverif/default.nix b/pkgs/applications/science/logic/proverif/default.nix
index 4f5e9155078..8726f5affea 100644
--- a/pkgs/applications/science/logic/proverif/default.nix
+++ b/pkgs/applications/science/logic/proverif/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "proverif-${version}";
- version = "1.94";
+ version = "1.95";
src = fetchurl {
url = "http://prosecco.gforge.inria.fr/personal/bblanche/proverif/proverif${version}.tar.gz";
- sha256 = "0dv2hgk76y0ap7dwf80qd94dmxjw47c50iavxgq5702k1d6qap56";
+ sha256 = "01viwi6sccdxk723ycy1shklz8g29j5i3wj2mcwb3j7advvqmws2";
};
buildInputs = [ ocaml ];
diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index 0e43abdd681..fa5c9ba175e 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -4,33 +4,21 @@ let
python = python2;
in stdenv.mkDerivation rec {
name = "z3-${version}";
- version = "4.4.1";
+ version = "4.5.0";
src = fetchFromGitHub {
owner = "Z3Prover";
repo = "z3";
rev = "z3-${version}";
- sha256 = "1ix100r1h00iph1bk5qx5963gpqaxmmx42r2vb5zglynchjif07c";
+ sha256 = "0ssp190ksak93hiz61z90x6hy9hcw1ywp8b2dzmbhn6fbd4bnxzp";
};
buildInputs = [ python ];
enableParallelBuilding = true;
- configurePhase = "${python.interpreter} scripts/mk_make.py --prefix=$out && cd build";
-
- # z3's install phase is stupid because it tries to calculate the
- # python package store location itself, meaning it'll attempt to
- # write files into the nix store, and fail.
- soext = if stdenv.system == "x86_64-darwin" then ".dylib" else ".so";
- installPhase = ''
- mkdir -p $out/bin $out/${python.sitePackages} $out/include
- cp ../src/api/z3*.h $out/include
- cp ../src/api/c++/z3*.h $out/include
- cp z3 $out/bin
- cp libz3${soext} $out/lib
- cp libz3${soext} $out/${python.sitePackages}
- cp z3*.pyc $out/${python.sitePackages}
- cp ../src/api/python/*.py $out/${python.sitePackages}
+ configurePhase = ''
+ ${python.interpreter} scripts/mk_make.py --prefix=$out --python --pypkgdir=$out/${python.sitePackages}
+ cd build
'';
meta = {
diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix
new file mode 100644
index 00000000000..4de4a0c261d
--- /dev/null
+++ b/pkgs/applications/science/math/mathematica/10.nix
@@ -0,0 +1,138 @@
+{ stdenv
+, coreutils
+, patchelf
+, requireFile
+, alsaLib
+, fontconfig
+, freetype
+, gcc
+, glib
+, libpng
+, ncurses
+, opencv
+, openssl
+, unixODBC
+, xorg
+, zlib
+, libxml2
+, libuuid
+}:
+
+let
+ platform =
+ if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then
+ "Linux"
+ else
+ throw "Mathematica requires i686-linux or x86_64 linux";
+in
+stdenv.mkDerivation rec {
+ version = "10.0.2";
+
+ name = "mathematica-${version}";
+
+ src = requireFile rec {
+ name = "Mathematica_${version}_LINUX.sh";
+ message = ''
+ This nix expression requires that ${name} is
+ already part of the store. Find the file on your Mathematica CD
+ and add it to the nix store with nix-store --add-fixed sha256 .
+ '';
+ sha256 = "1d2yaiaikzcacjamlw64g3xkk81m3pb4vz4an12cv8nb7kb20x9l";
+ };
+
+ buildInputs = [
+ coreutils
+ patchelf
+ alsaLib
+ coreutils
+ fontconfig
+ freetype
+ gcc.cc
+ gcc.libc
+ glib
+ ncurses
+ opencv
+ openssl
+ unixODBC
+ libxml2
+ libuuid
+ ] ++ (with xorg; [
+ libX11
+ libXext
+ libXtst
+ libXi
+ libXmu
+ libXrender
+ libxcb
+ libXcursor
+ libXfixes
+ libXrandr
+ libICE
+ libSM
+ ]);
+
+ ldpath = stdenv.lib.makeLibraryPath buildInputs
+ + stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+ (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs);
+
+ phases = "unpackPhase installPhase fixupPhase";
+
+ unpackPhase = ''
+ echo "=== Extracting makeself archive ==="
+ # find offset from file
+ offset=$(${stdenv.shell} -c "$(grep -axm1 -e 'offset=.*' $src); echo \$offset" $src)
+ dd if="$src" ibs=$offset skip=1 | tar -xf -
+ cd Unix
+ '';
+
+ installPhase = ''
+ cd Installer
+ # don't restrict PATH, that has already been done
+ sed -i -e 's/^PATH=/# PATH=/' MathInstaller
+
+ echo "=== Running MathInstaller ==="
+ ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -platforms=${platform} -silent
+ '';
+
+ preFixup = ''
+ echo "=== PatchElfing away ==="
+ # This code should be a bit forgiving of errors, unfortunately
+ set +e
+ find $out/libexec/Mathematica/SystemFiles -type f -perm -0100 | while read f; do
+ type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/')
+ if [ -z "$type" ]; then
+ :
+ elif [ "$type" == "EXEC" ]; then
+ echo "patching $f executable <<"
+ patchelf --shrink-rpath "$f"
+ patchelf \
+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \
+ "$f" \
+ && patchelf --shrink-rpath "$f" \
+ || echo unable to patch ... ignoring 1>&2
+ elif [ "$type" == "DYN" ]; then
+ echo "patching $f library <<"
+ patchelf \
+ --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \
+ "$f" \
+ && patchelf --shrink-rpath "$f" \
+ || echo unable to patch ... ignoring 1>&2
+ else
+ echo "not patching $f <<: unknown elf type"
+ fi
+ done
+ '';
+
+ # all binaries are already stripped
+ dontStrip = true;
+
+ # we did this in prefixup already
+ dontPatchELF = true;
+
+ meta = {
+ description = "Wolfram Mathematica computational software system";
+ homepage = "http://www.wolfram.com/mathematica/";
+ license = stdenv.lib.licenses.unfree;
+ };
+}
diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index 4de4a0c261d..1a9adcd4782 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -26,7 +26,7 @@ let
throw "Mathematica requires i686-linux or x86_64 linux";
in
stdenv.mkDerivation rec {
- version = "10.0.2";
+ version = "11.0.1";
name = "mathematica-${version}";
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
already part of the store. Find the file on your Mathematica CD
and add it to the nix store with nix-store --add-fixed sha256 .
'';
- sha256 = "1d2yaiaikzcacjamlw64g3xkk81m3pb4vz4an12cv8nb7kb20x9l";
+ sha256 = "1qqwz8gbw74rnnyirpbdanwx3d25s4x0i4zc7bs6kp959x66cdkw";
};
buildInputs = [
@@ -89,9 +89,10 @@ stdenv.mkDerivation rec {
cd Installer
# don't restrict PATH, that has already been done
sed -i -e 's/^PATH=/# PATH=/' MathInstaller
+ sed -i -e 's/\/bin\/bash/\/bin\/sh/' MathInstaller
echo "=== Running MathInstaller ==="
- ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -platforms=${platform} -silent
+ ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -silent
'';
preFixup = ''
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 0cda65b32c3..64784facfb9 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -1,30 +1,56 @@
-{ stdenv, fetchurl, gmp, readline }:
+{ stdenv, fetchurl
+, gmp, readline, libX11, libpthreadstubs, tex, perl }:
stdenv.mkDerivation rec {
- version = "2.7.6";
+
name = "pari-${version}";
+ version = "2.9.1";
src = fetchurl {
url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
- sha256 = "04dqi697czd8mmw8aiwzrkgbvkjassqagg6lfy3lkf1k5qi9g9rr";
+ sha256 = "0rq7wz9df1xs4acdzzb5dapx8vs6m5py39n2wynw2qv4d2b0ylfw";
};
- buildInputs = [gmp readline];
+ buildInputs = [ gmp readline libX11 libpthreadstubs tex perl ];
configureScript = "./Configure";
configureFlags =
+ "--mt=pthread" +
"--with-gmp=${gmp.dev} " +
"--with-readline=${readline.dev}";
+ makeFlags = "all";
+
meta = with stdenv.lib; {
description = "Computer algebra system for high-performance number theory computations";
- homepage = "http://pari.math.u-bordeaux.fr/";
- license = licenses.gpl2Plus;
- maintainers = with maintainers; [ ertes raskin ];
- platforms = platforms.linux;
+ longDescription = ''
+ PARI/GP is a widely used computer algebra system designed for fast
+ computations in number theory (factorizations, algebraic number theory,
+ elliptic curves...), but also contains a large number of other useful
+ functions to compute with mathematical entities such as matrices,
+ polynomials, power series, algebraic numbers etc., and a lot of
+ transcendental functions. PARI is also available as a C library to allow
+ for faster computations.
- inherit version;
+ Originally developed by Henri Cohen and his co-workers (Université
+ Bordeaux I, France), PARI is now under the GPL and maintained by Karim
+ Belabas with the help of many volunteer contributors.
+
+ - PARI is a C library, allowing fast computations.
+ - gp is an easy-to-use interactive shell giving access to the
+ PARI functions.
+ - GP is the name of gp's scripting language.
+ - gp2c, the GP-to-C compiler, combines the best of both worlds
+ by compiling GP scripts to the C language and transparently loading
+ the resulting functions into gp. (gp2c-compiled scripts will typically
+ run 3 or 4 times faster.) gp2c currently only understands a subset
+ of the GP language.
+ '';
+ homepage = "http://pari.math.u-bordeaux.fr/";
downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ ertes raskin AndersonTorres ];
+ platforms = platforms.linux;
updateWalker = true;
};
}
diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix
new file mode 100644
index 00000000000..007514e6552
--- /dev/null
+++ b/pkgs/applications/science/math/pari/gp2c.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl
+, pari, perl }:
+
+stdenv.mkDerivation rec {
+
+ name = "gp2c-${version}";
+ version = "0.0.10";
+
+ src = fetchurl {
+ url = "http://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz";
+ sha256 = "1xhpz5p81iw261ay1kip283ggr0ir8ydz8qx3v24z8jfms1r3y70";
+ };
+
+ buildInputs = [ pari perl ];
+
+ configureFlags = [
+ "--with-paricfg=${pari}/lib/pari/pari.cfg"
+ "--with-perl=${perl}/bin/perl" ];
+
+ meta = with stdenv.lib; {
+ description = "A compiler to translate GP scripts to PARI programs";
+ homepage = "http://pari.math.u-bordeaux.fr/";
+ downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ AndersonTorres ];
+ };
+}
+# TODO: add it as "source file" for default package
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index 45d7686b3e5..d1106a75847 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -21,6 +21,9 @@ stdenv.mkDerivation rec {
sha256 = "186i7ni75yvjydy6lpmaplqxfb5z2019bgpbhff1n6zn2qlrff2r";
})
./sw_vers.patch
+
+ # this prevents thisroot.sh from setting $p, which interferes with stdenv setup
+ ./thisroot.patch
];
preConfigure = ''
diff --git a/pkgs/applications/science/misc/root/setup-hook.sh b/pkgs/applications/science/misc/root/setup-hook.sh
index 197dc78c3c2..fc2b697d8a8 100644
--- a/pkgs/applications/science/misc/root/setup-hook.sh
+++ b/pkgs/applications/science/misc/root/setup-hook.sh
@@ -6,4 +6,4 @@ thisroot () {
source @out@/bin/thisroot.sh
}
-envHooks+=(thisroot)
+postHooks+=(thisroot)
diff --git a/pkgs/applications/science/misc/root/thisroot.patch b/pkgs/applications/science/misc/root/thisroot.patch
new file mode 100644
index 00000000000..57cd5838e64
--- /dev/null
+++ b/pkgs/applications/science/misc/root/thisroot.patch
@@ -0,0 +1,15 @@
+diff --git a/config/thisroot.sh b/config/thisroot.sh
+index 85dee20..532cb28 100644
+--- a/config/thisroot.sh
++++ b/config/thisroot.sh
+@@ -15,8 +15,8 @@ drop_from_path()
+ return 1
+ fi
+
+- p=$1
+- drop=$2
++ local p=$1
++ local drop=$2
+
+ newpath=`echo $p | sed -e "s;:${drop}:;:;g" \
+ -e "s;:${drop};;g" \
diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix
index 5e4bda1aaa0..76b05c8a3a7 100644
--- a/pkgs/applications/science/robotics/yarp/default.nix
+++ b/pkgs/applications/science/robotics/yarp/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
name = "yarp-${version}";
- version = "2.3.66";
+ version = "2.3.68";
src = fetchFromGitHub {
owner = "robotology";
repo = "yarp";
- rev = "v${version}.1";
- sha256 = "0hznysxhk6pd92fymcrnbbl8ah7rcwhcvb6n92v09zjv6yl5xpiq";
+ rev = "v${version}";
+ sha256 = "1ksz2kv4v14fqgz3fsvvmdk2sikhnxr11jhhf7c2547x6jbzhda6";
};
buildInputs = [ cmake ace ];
diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix
index a397acddbcf..47d667a0c06 100644
--- a/pkgs/applications/version-management/bazaar/default.nix
+++ b/pkgs/applications/version-management/bazaar/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, python2Packages }:
+{ stdenv, fetchurl, python2Packages
+, withSFTP ? true
+ }:
python2Packages.buildPythonApplication rec {
version = "2.7";
@@ -12,6 +14,9 @@ python2Packages.buildPythonApplication rec {
doCheck = false;
+ propagatedBuildInputs = []
+ ++ stdenv.lib.optionals withSFTP [ python2Packages.paramiko ];
+
# Bazaar can't find the certificates alone
patches = [ ./add_certificates.patch ];
postPatch = ''
diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix
index e5937977994..86e555a989c 100644
--- a/pkgs/applications/version-management/bitkeeper/default.nix
+++ b/pkgs/applications/version-management/bitkeeper/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "bitkeeper-${version}";
- version = "7.3ce";
+ version = "7.3.1ce";
src = fetchurl {
- url = "https://www.bitkeeper.org/downloads/${version}/bk-${version}.tar.gz";
- sha256 = "0lk4vydpq5bi52m81h327gvzdzybf8kkak7yjwmpj6kg1jn9blaz";
+ url = "https://www.bitkeeper.org/downloads/${version}/bk-${version}.src.tar.gz";
+ sha256 = "0l6jwvcg4s1q00vb01hdv58jgv03l8x5mhjl73cwgfiff80zx147";
};
hardeningDisable = [ "fortify" ];
diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix
index 3aace6b7e02..74a2267043c 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/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix
index 2bfde38af29..90a9f26045f 100644
--- a/pkgs/applications/version-management/cvs2svn/default.nix
+++ b/pkgs/applications/version-management/cvs2svn/default.nix
@@ -1,4 +1,4 @@
-{stdenv, lib, fetchurl, python, cvs, makeWrapper}:
+{stdenv, lib, fetchurl, python2, cvs, makeWrapper}:
stdenv.mkDerivation rec {
name = "cvs2svn-2.4.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "05piyrcp81a1jgjm66xhq7h1sscx42ccjqaw30h40dxlwz1pyrx6";
};
- buildInputs = [python makeWrapper];
+ buildInputs = [python2 makeWrapper];
dontBuild = true;
installPhase = ''
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index d940e9b5659..14a492f6cc2 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -2,15 +2,15 @@
, tcllib, withJson ? true}:
stdenv.mkDerivation rec {
- name = "fossil-1.35";
+ name = "fossil-1.36";
src = fetchurl {
urls =
[
- https://www.fossil-scm.org/download/fossil-src-1.35.tar.gz
+ https://fossil-scm.org/index.html/uv/download/fossil-src-1.36.tar.gz
];
name = "${name}.tar.gz";
- sha256 = "07ds6rhq69bhydpm9a01mgdhxf88p9b6y5hdnhn8gjc7ba92zyf1";
+ sha256 = "04px1mnq5dlc6gaihxj5nj6k7ac43wfryzifaairjh74qmgc6xi6";
};
buildInputs = [ zlib openssl readline sqlite which ed ]
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 8aad853ca10..994dcb38f80 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -45,6 +45,8 @@ rec {
git-annex-remote-b2 = callPackage ./git-annex-remote-b2 { };
+ git-annex-remote-rclone = callPackage ./git-annex-remote-rclone { };
+
# support for bugzilla
git-bz = callPackage ./git-bz { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
new file mode 100644
index 00000000000..d1996b72154
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, rclone, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ name = "git-annex-remote-rclone-${version}";
+ version = "0.4";
+ rev = "v${version}";
+
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "DanielDent";
+ repo = "git-annex-remote-rclone";
+ sha256 = "1myk307hqm8dlxhkmwr347rdd28niv5h0gyrxm30y77zlly30ddk";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp git-annex-remote-rclone $out/bin
+ wrapProgram "$out/bin/git-annex-remote-rclone" \
+ --prefix PATH ":" "${stdenv.lib.makeBinPath [ rclone ]}"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/DanielDent/git-annex-remote-rclone;
+ description = "Use rclone supported cloud storage providers with git-annex";
+ license = licenses.gpl3;
+ maintainers = [ maintainers.montag451 ];
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
index d924437c2e1..4ed9c5c0509 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/git-bz \
+ --prefix PYTHONPATH : "$(toPythonPath "${pythonPackages.pycrypto}")" \
--prefix PYTHONPATH : "$(toPythonPath "${pythonPackages.pysqlite}")"
'';
diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
index d561f751cc9..f67d575b5b3 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, docutils, python2 }:
+{ stdenv, fetchFromGitHub, docutils, python2Packages }:
stdenv.mkDerivation rec {
name = "git-hub-${version}";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
owner = "sociomantic-tsunami";
};
- buildInputs = [ python2 ];
- nativeBuildInputs = [ docutils ];
+ buildInputs = [ python2Packages.python ];
+ nativeBuildInputs = [ python2Packages.docutils ];
postPatch = ''
substituteInPlace Makefile --replace rst2man rst2man.py
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 2ee34d3c6e3..ba2b7113806 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 e432543df45..c77c746c88f 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -11,7 +11,7 @@
}:
let
- version = "2.10.1";
+ version = "2.11.0";
svn = subversionClient.override { perlBindings = true; };
in
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
- sha256 = "1ijd1b6szvfw0dmqa3dz1m5g5hbkl9xkb86a9qcjrz0w0vwjvhx9";
+ sha256 = "02zx368id8rys0bh2sjrxz0ln2l2wm5nf1vhp1rj72clsilqszky";
};
hardeningDisable = [ "format" ];
@@ -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/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
index f572dbcf923..955fe90ff11 100644
--- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, git }:
+{ stdenv, fetchurl, python2, git }:
let
name = "stgit-0.17.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "1pka0ns9x0kabn036zsf0mwmwiynckhnva51kgxsch9fqah6acyl";
};
- buildInputs = [ python git ];
+ buildInputs = [ python2 git ];
makeFlags = "prefix=$$out";
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index ad3311d967a..001aa0c5b09 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, python }:
stdenv.mkDerivation {
- name = "git-repo-1.22";
+ name = "git-repo-1.23";
src = fetchurl {
# I could not find a versioned url for the 1.21 version. In case
# the sha mismatches, check the homepage for new version and sha.
url = "http://commondatastorage.googleapis.com/git-repo-downloads/repo";
- sha1 = "da0514e484f74648a890c0467d61ca415379f791";
+ sha256 = "1i8xymxh630a7d5nkqi49nmlwk77dqn36vsygpyhri464qwz0iz1";
};
unpackPhase = "true";
diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix
index 664f4d5147b..eea5242e6bc 100644
--- a/pkgs/applications/version-management/gitinspector/default.nix
+++ b/pkgs/applications/version-management/gitinspector/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchzip, pythonPackages}:
+{ stdenv, fetchzip, python2Packages}:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "gitinspector-${version}";
version = "0.4.4";
namePrefix = "";
diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix
index 2293d11331d..3bcf8cd4e1b 100644
--- a/pkgs/applications/version-management/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab-shell/default.nix
@@ -1,14 +1,14 @@
{ stdenv, ruby, bundler, fetchFromGitLab }:
stdenv.mkDerivation rec {
- version = "3.6.1";
+ version = "3.6.6";
name = "gitlab-shell-${version}";
srcs = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
- sha256 = "0j4kwsfzb7l871fma1b1q9h33vyng2nnghn5zz192sv4yp0w2pvq";
+ sha256 = "1dg9ldsyly2r3amkl0d96m084az360b7nz9rhhf61x06d4z09xif";
};
buildInputs = [
diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix
index 6fe65bb50ab..54be33beff5 100644
--- a/pkgs/applications/version-management/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitLab, git, go }:
stdenv.mkDerivation rec {
- version = "0.8.2";
+ version = "0.8.5";
name = "gitlab-workhorse-${version}";
srcs = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
- sha256 = "03y7f9x88sa8gxqaglriwn2793dn3i8dx4qhaarnm0gyrfl3rjag";
+ sha256 = "0q6kd59sb5wm63r8zdvbkn4j6fk2n743pjhkbmg4rzngvjivxqzr";
};
buildInputs = [ git go ];
diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index f9d95e121f5..ef131cb719a 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -6,10 +6,8 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3'
# Responders respond_to and respond_with
gem 'responders', '~> 2.0'
-# Specify a sprockets version due to increased performance
-# See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069
-gem 'sprockets', '~> 3.6.0'
-gem 'sprockets-es6'
+gem 'sprockets', '~> 3.7.0'
+gem 'sprockets-es6', '~> 0.9.2'
# Default values for AR models
gem 'default_value_for', '~> 3.0.0'
@@ -19,7 +17,7 @@ gem 'mysql2', '~> 0.3.16', group: :mysql
gem 'pg', '~> 0.18.2', group: :postgres
# Authentication libraries
-gem 'devise', '~> 4.0'
+gem 'devise', '~> 4.2'
gem 'doorkeeper', '~> 4.2.0'
gem 'omniauth', '~> 1.3.1'
gem 'omniauth-auth0', '~> 1.4.1'
@@ -31,7 +29,7 @@ gem 'omniauth-github', '~> 1.1.1'
gem 'omniauth-gitlab', '~> 1.0.0'
gem 'omniauth-google-oauth2', '~> 0.4.1'
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
-gem 'omniauth-saml', '~> 1.6.0'
+gem 'omniauth-saml', '~> 1.7.0'
gem 'omniauth-shibboleth', '~> 1.2.0'
gem 'omniauth-twitter', '~> 1.2.0'
gem 'omniauth_crowd', '~> 2.2.0'
@@ -53,7 +51,7 @@ gem 'browser', '~> 2.2'
# Extracting information from a git repository
# Provide access to Gitlab::Git library
-gem 'gitlab_git', '~> 10.6.6'
+gem 'gitlab_git', '~> 10.7.0'
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
@@ -101,17 +99,18 @@ gem 'unf', '~> 0.1.4'
gem 'seed-fu', '~> 2.3.5'
# Markdown and HTML processing
-gem 'html-pipeline', '~> 1.11.0'
-gem 'task_list', '~> 1.0.2', require: 'task_list/railtie'
-gem 'gitlab-markup', '~> 1.5.0'
-gem 'redcarpet', '~> 3.3.3'
-gem 'RedCloth', '~> 4.3.2'
-gem 'rdoc', '~>3.6'
-gem 'org-ruby', '~> 0.9.12'
-gem 'creole', '~> 0.5.0'
-gem 'wikicloth', '0.8.1'
-gem 'asciidoctor', '~> 1.5.2'
-gem 'rouge', '~> 2.0'
+gem 'html-pipeline', '~> 1.11.0'
+gem 'deckar01-task_list', '1.0.5', require: 'task_list/railtie'
+gem 'gitlab-markup', '~> 1.5.0'
+gem 'redcarpet', '~> 3.3.3'
+gem 'RedCloth', '~> 4.3.2'
+gem 'rdoc', '~>3.6'
+gem 'org-ruby', '~> 0.9.12'
+gem 'creole', '~> 0.5.0'
+gem 'wikicloth', '0.8.1'
+gem 'asciidoctor', '~> 1.5.2'
+gem 'rouge', '~> 2.0'
+gem 'truncato', '~> 0.7.8'
# See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
# and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
@@ -122,8 +121,8 @@ gem 'diffy', '~> 3.0.3'
# Application server
group :unicorn do
- gem 'unicorn', '~> 4.9.0'
- gem 'unicorn-worker-killer', '~> 0.4.2'
+ gem 'unicorn', '~> 5.1.0'
+ gem 'unicorn-worker-killer', '~> 0.4.4'
end
# State machine
@@ -132,11 +131,10 @@ gem 'state_machines-activerecord', '~> 0.4.0'
gem 'after_commit_queue', '~> 1.3.0'
# Issue tags
-gem 'acts-as-taggable-on', '~> 3.4'
+gem 'acts-as-taggable-on', '~> 4.0'
# Background jobs
-gem 'sinatra', '~> 1.4.4', require: false
-gem 'sidekiq', '~> 4.0'
+gem 'sidekiq', '~> 4.2'
gem 'sidekiq-cron', '~> 0.4.0'
gem 'redis-namespace', '~> 1.5.2'
@@ -213,7 +211,7 @@ gem 'oj', '~> 2.17.4'
gem 'chronic', '~> 0.10.2'
gem 'chronic_duration', '~> 0.10.6'
-gem 'sass-rails', '~> 5.0.0'
+gem 'sass-rails', '~> 5.0.6'
gem 'coffee-rails', '~> 4.1.0'
gem 'uglifier', '~> 2.7.2'
gem 'turbolinks', '~> 2.5.0'
@@ -227,7 +225,7 @@ gem 'gon', '~> 6.1.0'
gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'jquery-rails', '~> 4.1.0'
gem 'jquery-ui-rails', '~> 5.0.0'
-gem 'request_store', '~> 1.3.0'
+gem 'request_store', '~> 1.3'
gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1'
gem 'net-ssh', '~> 3.0.1'
@@ -298,12 +296,11 @@ group :development, :test do
gem 'spring-commands-spinach', '~> 1.1.0'
gem 'spring-commands-teaspoon', '~> 0.0.2'
- gem 'rubocop', '~> 0.42.0', require: false
+ gem 'rubocop', '~> 0.43.0', require: false
gem 'rubocop-rspec', '~> 1.5.0', require: false
gem 'scss_lint', '~> 0.47.0', require: false
gem 'haml_lint', '~> 0.18.2', require: false
gem 'simplecov', '0.12.0', require: false
- gem 'flog', '~> 4.3.2', require: false
gem 'flay', '~> 2.6.1', require: false
gem 'bundler-audit', '~> 0.5.0', require: false
@@ -311,6 +308,8 @@ group :development, :test do
gem 'license_finder', '~> 2.1.0', require: false
gem 'knapsack', '~> 1.11.0'
+
+ gem 'activerecord_sane_schema_dumper', '0.2'
end
group :test do
@@ -323,10 +322,6 @@ group :test do
gem 'timecop', '~> 0.8.0'
end
-group :production do
- gem 'gitlab_meta', '7.0'
-end
-
gem 'newrelic_rpm', '~> 3.16'
gem 'octokit', '~> 4.3.0'
@@ -335,7 +330,7 @@ gem 'mail_room', '~> 0.8.1'
gem 'email_reply_parser', '~> 0.5.8'
-gem 'ruby-prof', '~> 0.15.9'
+gem 'ruby-prof', '~> 0.16.2'
## CI
gem 'activerecord-session_store', '~> 1.0.0'
@@ -348,7 +343,7 @@ gem 'oauth2', '~> 1.2.0'
gem 'paranoia', '~> 2.0'
# Health check
-gem 'health_check', '~> 2.1.0'
+gem 'health_check', '~> 2.2.0'
# System information
gem 'vmstat', '~> 2.2'
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index 0dd9b47ff3e..b9501e68aae 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -40,14 +40,16 @@ GEM
multi_json (~> 1.11, >= 1.11.2)
rack (>= 1.5.2, < 3)
railties (>= 4.0, < 5.1)
+ activerecord_sane_schema_dumper (0.2)
+ rails (>= 4, < 5)
activesupport (4.2.7.1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- acts-as-taggable-on (3.5.0)
- activerecord (>= 3.2, < 5)
+ acts-as-taggable-on (4.0.0)
+ activerecord (>= 4.0)
addressable (2.3.8)
after_commit_queue (1.3.0)
activerecord (>= 3.0)
@@ -159,11 +161,15 @@ GEM
database_cleaner (1.5.3)
debug_inspector (0.0.2)
debugger-ruby_core_source (1.3.8)
+ deckar01-task_list (1.0.5)
+ activesupport (~> 4.0)
+ html-pipeline
+ rack (~> 1.0)
default_value_for (3.0.2)
activerecord (>= 3.2.0, < 5.1)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
- devise (4.1.1)
+ devise (4.2.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 5.1)
@@ -211,9 +217,6 @@ GEM
flay (2.6.1)
ruby_parser (~> 3.0)
sexp_processor (~> 4.0)
- flog (4.3.2)
- ruby_parser (~> 3.1, > 3.1.0)
- sexp_processor (~> 4.4)
flowdock (0.7.1)
httparty (~> 0.7)
multi_json
@@ -282,12 +285,11 @@ GEM
mime-types (>= 1.16, < 3)
posix-spawn (~> 0.3)
gitlab-markup (1.5.0)
- gitlab_git (10.6.6)
+ gitlab_git (10.7.0)
activesupport (~> 4.0)
charlock_holmes (~> 0.7.3)
github-linguist (~> 4.7.0)
rugged (~> 0.24.0)
- gitlab_meta (7.0)
gitlab_omniauth-ldap (1.2.1)
net-ldap (~> 0.9)
omniauth (~> 1.0)
@@ -337,7 +339,7 @@ GEM
thor
tilt
hashie (3.4.4)
- health_check (2.1.0)
+ health_check (2.2.1)
rails (>= 4.0)
hipchat (1.5.2)
httparty
@@ -473,9 +475,9 @@ GEM
omniauth-oauth2 (1.3.1)
oauth2 (~> 1.0)
omniauth (~> 1.2)
- omniauth-saml (1.6.0)
+ omniauth-saml (1.7.0)
omniauth (~> 1.3)
- ruby-saml (~> 1.3)
+ ruby-saml (~> 1.4)
omniauth-shibboleth (1.2.1)
omniauth (>= 1.0.0)
omniauth-twitter (1.2.1)
@@ -490,7 +492,7 @@ GEM
orm_adapter (0.5.0)
paranoia (2.1.4)
activerecord (~> 4.0)
- parser (2.3.1.2)
+ parser (2.3.1.4)
ast (~> 2.2)
pg (0.18.4)
pkg-config (1.1.7)
@@ -557,7 +559,7 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.1.0)
- raindrops (0.15.0)
+ raindrops (0.17.0)
rake (10.5.0)
rb-fsevent (0.9.6)
rb-inotify (0.9.5)
@@ -591,7 +593,7 @@ GEM
request_store (1.3.1)
rerun (0.11.0)
listen (~> 3.0)
- responders (2.1.1)
+ responders (2.3.0)
railties (>= 4.2.0, < 5.1)
rinku (2.0.0)
rotp (2.1.2)
@@ -623,7 +625,7 @@ GEM
rspec-retry (0.4.5)
rspec-core
rspec-support (3.5.0)
- rubocop (0.42.0)
+ rubocop (0.43.0)
parser (>= 2.3.1.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
@@ -633,9 +635,9 @@ GEM
rubocop (>= 0.40.0)
ruby-fogbugz (0.2.1)
crack (~> 0.4)
- ruby-prof (0.15.9)
+ ruby-prof (0.16.2)
ruby-progressbar (1.8.1)
- ruby-saml (1.3.0)
+ ruby-saml (1.4.1)
nokogiri (>= 1.5.10)
ruby_parser (3.8.2)
sexp_processor (~> 4.1)
@@ -648,7 +650,7 @@ GEM
sanitize (2.1.0)
nokogiri (>= 1.4.4)
sass (3.4.22)
- sass-rails (5.0.5)
+ sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
@@ -676,11 +678,11 @@ GEM
rack
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
- sidekiq (4.1.4)
+ sidekiq (4.2.1)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
+ rack-protection (~> 1.5)
redis (~> 3.2, >= 3.2.1)
- sinatra (>= 1.4.7)
sidekiq-cron (0.4.0)
redis-namespace (>= 1.5.2)
rufus-scheduler (>= 2.0.24)
@@ -690,10 +692,6 @@ GEM
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
- sinatra (1.4.7)
- rack (~> 1.5)
- rack-protection (~> 1.4)
- tilt (>= 1.3, < 3)
slack-notifier (1.2.1)
slop (3.6.0)
spinach (0.8.10)
@@ -713,10 +711,10 @@ GEM
spring (>= 0.9.1)
spring-commands-teaspoon (0.0.2)
spring (>= 0.9.1)
- sprockets (3.6.3)
+ sprockets (3.7.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
- sprockets-es6 (0.9.0)
+ sprockets-es6 (0.9.2)
babel-source (>= 5.8.11)
babel-transpiler
sprockets (>= 3.0.0)
@@ -736,8 +734,6 @@ GEM
ffi
sysexits (1.2.0)
systemu (2.6.5)
- task_list (1.0.2)
- html-pipeline
teaspoon (1.1.5)
railties (>= 3.2.5, < 6)
teaspoon-jasmine (2.2.0)
@@ -754,6 +750,9 @@ GEM
tilt (2.0.5)
timecop (0.8.1)
timfel-krb5-auth (0.8.3)
+ truncato (0.7.8)
+ htmlentities (~> 4.3.1)
+ nokogiri (~> 1.6.1)
turbolinks (2.5.3)
coffee-rails
tzinfo (1.2.2)
@@ -767,9 +766,8 @@ GEM
unf_ext
unf_ext (0.0.7.2)
unicode-display_width (1.1.1)
- unicorn (4.9.0)
+ unicorn (5.1.0)
kgio (~> 2.6)
- rack
raindrops (~> 0.7)
unicorn-worker-killer (0.4.4)
get_process_mem (~> 0)
@@ -813,7 +811,8 @@ DEPENDENCIES
ace-rails-ap (~> 4.1.0)
activerecord-nulldb-adapter
activerecord-session_store (~> 1.0.0)
- acts-as-taggable-on (~> 3.4)
+ activerecord_sane_schema_dumper (= 0.2)
+ acts-as-taggable-on (~> 4.0)
addressable (~> 2.3.8)
after_commit_queue (~> 1.3.0)
akismet (~> 2.0)
@@ -844,8 +843,9 @@ DEPENDENCIES
creole (~> 0.5.0)
d3_rails (~> 3.5.0)
database_cleaner (~> 1.5.0)
+ deckar01-task_list (= 1.0.5)
default_value_for (~> 3.0.0)
- devise (~> 4.0)
+ devise (~> 4.2)
devise-two-factor (~> 3.0.0)
diffy (~> 3.0.3)
doorkeeper (~> 4.2.0)
@@ -855,7 +855,6 @@ DEPENDENCIES
factory_girl_rails (~> 4.6.0)
ffaker (~> 2.0.0)
flay (~> 2.6.1)
- flog (~> 4.3.2)
fog-aws (~> 0.9)
fog-azure (~> 0.0)
fog-core (~> 1.40)
@@ -870,9 +869,8 @@ DEPENDENCIES
gemojione (~> 3.0)
github-linguist (~> 4.7.0)
gitlab-flowdock-git-hook (~> 1.0.1)
- github-markup (~> 1.5.0)
- gitlab_git (~> 10.6.6)
- gitlab_meta (= 7.0)
+ gitlab-markup (~> 1.5.0)
+ gitlab_git (~> 10.7.0)
gitlab_omniauth-ldap (~> 1.2.1)
gollum-lib (~> 4.2)
gollum-rugged_adapter (~> 0.4.2)
@@ -881,7 +879,7 @@ DEPENDENCIES
grape-entity (~> 0.4.2)
haml_lint (~> 0.18.2)
hamlit (~> 2.6.1)
- health_check (~> 2.1.0)
+ health_check (~> 2.2.0)
hipchat (~> 1.5.0)
html-pipeline (~> 1.11.0)
httparty (~> 0.13.3)
@@ -920,7 +918,7 @@ DEPENDENCIES
omniauth-gitlab (~> 1.0.0)
omniauth-google-oauth2 (~> 0.4.1)
omniauth-kerberos (~> 0.3.0)
- omniauth-saml (~> 1.6.0)
+ omniauth-saml (~> 1.7.0)
omniauth-shibboleth (~> 1.2.0)
omniauth-twitter (~> 1.2.0)
omniauth_crowd (~> 2.2.0)
@@ -943,19 +941,19 @@ DEPENDENCIES
redis (~> 3.2)
redis-namespace (~> 1.5.2)
redis-rails (~> 4.0.0)
- request_store (~> 1.3.0)
+ request_store (~> 1.3)
rerun (~> 0.11.0)
responders (~> 2.0)
rouge (~> 2.0)
rqrcode-rails3 (~> 0.1.7)
rspec-rails (~> 3.5.0)
rspec-retry (~> 0.4.5)
- rubocop (~> 0.42.0)
+ rubocop (~> 0.43.0)
rubocop-rspec (~> 1.5.0)
ruby-fogbugz (~> 0.2.1)
- ruby-prof (~> 0.15.9)
+ ruby-prof (~> 0.16.2)
sanitize (~> 2.0)
- sass-rails (~> 5.0.0)
+ sass-rails (~> 5.0.6)
scss_lint (~> 0.47.0)
sdoc (~> 0.3.20)
seed-fu (~> 2.3.5)
@@ -964,10 +962,9 @@ DEPENDENCIES
settingslogic (~> 2.0.9)
sham_rack (~> 1.3.6)
shoulda-matchers (~> 2.8.0)
- sidekiq (~> 4.0)
+ sidekiq (~> 4.2)
sidekiq-cron (~> 0.4.0)
simplecov (= 0.12.0)
- sinatra (~> 1.4.4)
slack-notifier (~> 1.2.0)
spinach-rails (~> 0.2.1)
spinach-rerun-reporter (~> 0.0.2)
@@ -975,23 +972,23 @@ DEPENDENCIES
spring-commands-rspec (~> 1.0.4)
spring-commands-spinach (~> 1.1.0)
spring-commands-teaspoon (~> 0.0.2)
- sprockets (~> 3.6.0)
- sprockets-es6
+ sprockets (~> 3.7.0)
+ sprockets-es6 (~> 0.9.2)
state_machines-activerecord (~> 0.4.0)
sys-filesystem (~> 1.1.6)
- task_list (~> 1.0.2)
teaspoon (~> 1.1.0)
teaspoon-jasmine (~> 2.2.0)
test_after_commit (~> 0.4.2)
thin (~> 1.7.0)
timecop (~> 0.8.0)
+ truncato (~> 0.7.8)
turbolinks (~> 2.5.0)
u2f (~> 0.2.1)
uglifier (~> 2.7.2)
underscore-rails (~> 1.8.0)
unf (~> 0.1.4)
- unicorn (~> 4.9.0)
- unicorn-worker-killer (~> 0.4.2)
+ unicorn (~> 5.1.0)
+ unicorn-worker-killer (~> 0.4.4)
version_sorter (~> 2.1.0)
virtus (~> 1.0.1)
vmstat (~> 2.2)
@@ -1000,4 +997,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
- 1.12.5
+ 1.13.5
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 92b5b552ec6..9e03135e89c 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -24,7 +24,7 @@ in
stdenv.mkDerivation rec {
name = "gitlab-${version}";
- version = "8.12.8";
+ version = "8.13.5";
buildInputs = [ env ruby bundler tzdata git nodejs procps ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
owner = "gitlabhq";
repo = "gitlabhq";
rev = "v${version}";
- sha256 = "1l2r3mjyra53wpq724d974zv9ax5hb1qrdsz4071b2p34s70gbl3";
+ sha256 = "1ir52fdg81jawkfk03xj6c2j4lmw8sy4mwc25p024l0zpsg2gpz3";
};
patches = [
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index a87d4f92c62..fc36db0d603 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -71,6 +71,14 @@
};
version = "1.0.0";
};
+ activerecord_sane_schema_dumper = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "122c7v7lvs0gwckvx2rar07waxnx1vv0lryz322nybb69d8vbhl6";
+ type = "gem";
+ };
+ version = "0.2";
+ };
activesupport = {
source = {
remotes = ["https://rubygems.org"];
@@ -80,13 +88,12 @@
version = "4.2.7.1";
};
acts-as-taggable-on = {
- dependencies = ["activerecord"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bz0z8dlp3fjzah9y9b6rr9mkidsav9l4hdm51fnq1gd05yv3pr7";
+ sha256 = "1h2y2zh4vrjf6bzdgvyq5a53a4gpr8xvq4a5rvq7fy1w43z4753s";
type = "gem";
};
- version = "3.5.0";
+ version = "4.0.0";
};
addressable = {
source = {
@@ -97,7 +104,6 @@
version = "2.3.8";
};
after_commit_queue = {
- dependencies = ["activerecord"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jrhvj4335dsrj0xndbf7a7m2inbwbx1knc0bwgvmkk1w47l43s0";
@@ -130,7 +136,6 @@
version = "6.0.3";
};
asana = {
- dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1560p13g57pl4xqkmhwn1vpqhm7mw9fwmmswk38k3i2r7g0b5y9z";
@@ -171,7 +176,6 @@
version = "1.0.0";
};
autoprefixer-rails = {
- dependencies = ["execjs" "json"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0m1w42ncz0p48r5hbyglayxkzrnplw18r99dc1ia2cb3nizkwllx";
@@ -188,7 +192,6 @@
version = "1.2.0";
};
axiom-types = {
- dependencies = ["descendants_tracker" "ice_nine" "thread_safe"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1";
@@ -261,7 +264,6 @@
version = "2.3.0";
};
better_errors = {
- dependencies = ["coderay" "erubis"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0v0q8bdkqqlcsfqbk4wvc3qnz8an44mgz720v5f11a4nr413mjgf";
@@ -270,7 +272,6 @@
version = "1.0.1";
};
binding_of_caller = {
- dependencies = ["debug_inspector"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15jg6dkaq2nzcd602d7ppqbdxw3aji961942w93crs6qw4n6h9yk";
@@ -279,7 +280,6 @@
version = "0.7.2";
};
bootstrap-sass = {
- dependencies = ["autoprefixer-rails" "sass"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12hhw42hk9clwfj6yz5v0c5p35wrn5yjnji7bnzsfs99vi2q00ld";
@@ -344,7 +344,6 @@
version = "2.6.2";
};
capybara-screenshot = {
- dependencies = ["capybara" "launchy"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17v1wihr3aqrxhrwswkdpdklj1xsfcaksblh1y8hixvm9bqfyz3y";
@@ -417,7 +416,6 @@
version = "1.1.0";
};
coercible = {
- dependencies = ["descendants_tracker"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah";
@@ -434,7 +432,6 @@
version = "4.1.1";
};
coffee-script = {
- dependencies = ["coffee-script-source" "execjs"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2";
@@ -475,7 +472,6 @@
version = "2.2.0";
};
crack = {
- dependencies = ["safe_yaml"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
@@ -500,7 +496,6 @@
version = "1.4.1";
};
d3_rails = {
- dependencies = ["railties"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12vxiiflnnkcxak2wmbajyf5wzmcv9wkl4drsp0am72azl8a6g9x";
@@ -540,6 +535,14 @@
};
version = "1.3.8";
};
+ deckar01-task_list = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1x2va9b7p2x82ind3cbk9dr4pk97c4g7vqccwzb20xdwdq0q4j91";
+ type = "gem";
+ };
+ version = "1.0.5";
+ };
default_value_for = {
source = {
remotes = ["https://rubygems.org"];
@@ -549,7 +552,6 @@
version = "3.0.2";
};
descendants_tracker = {
- dependencies = ["thread_safe"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79";
@@ -560,10 +562,10 @@
devise = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i5glkxmn0ymj50pz05nh6xcffc9giqajgfg6qrcbs2n552hbr5k";
+ sha256 = "045qw3186gkcm38wjbjhb7w2zycbqj85wfb1cdwvkqk8hf1a7dp0";
type = "gem";
};
- version = "4.1.1";
+ version = "4.2.0";
};
devise-two-factor = {
source = {
@@ -606,7 +608,6 @@
version = "4.2.0";
};
dropzonejs-rails = {
- dependencies = ["rails"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vqqxzv6qdqy47m2q28adnmccfvc17p2bmkkaqjvrczrhvkkha64";
@@ -623,7 +624,6 @@
version = "0.5.8";
};
email_spec = {
- dependencies = ["launchy" "mail"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00p1cc69ncrgg7m45va43pszip8anx5735w1lsb7p5ygkyw8nnpv";
@@ -712,7 +712,6 @@
version = "4.6.0";
};
faraday = {
- dependencies = ["multipart-post"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6";
@@ -721,7 +720,6 @@
version = "0.9.2";
};
faraday_middleware = {
- dependencies = ["faraday"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nxia26xzy8i56qfyz1bg8dg9yb26swpgci8n5jry8mh4bnx5r5h";
@@ -730,7 +728,6 @@
version = "0.10.0";
};
faraday_middleware-multi_json = {
- dependencies = ["faraday_middleware" "multi_json"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0651sxhzbq9xfq3hbpmrp0nbybxnm9ja3m97k386m4bqgamlvz1q";
@@ -755,7 +752,6 @@
version = "1.9.10";
};
flay = {
- dependencies = ["ruby_parser" "sexp_processor"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zcp9nmnfqixdcqa2dzwwjy5np4n2n16bj25gw7bbzbjp9hqzhn6";
@@ -763,17 +759,7 @@
};
version = "2.6.1";
};
- flog = {
- dependencies = ["ruby_parser" "sexp_processor"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1asrcdj6gh5mxcimqak94jjyyi5cxnqn904lc8pmrljg1nv1bxpm";
- type = "gem";
- };
- version = "4.3.2";
- };
flowdock = {
- dependencies = ["httparty" "multi_json"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04nrvg4gzgabf5mnnhccl8bwrkvn3y4pm7a1dqzqhpvfr4m5pafg";
@@ -814,7 +800,6 @@
version = "0.3.2";
};
fog-json = {
- dependencies = ["fog-core" "multi_json"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r";
@@ -847,7 +832,6 @@
version = "0.1.1";
};
fog-xml = {
- dependencies = ["fog-core" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1576sbzza47z48p0k9h1wg3rhgcvcvdd1dfz3xx1cgahwr564fqa";
@@ -864,7 +848,6 @@
version = "4.6.1.0";
};
foreman = {
- dependencies = ["thor"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1caz8mi7gq1hs4l1flcyyw1iw1bdvdbhppsvy12akr01k3s17xaq";
@@ -881,7 +864,6 @@
version = "0.2.5";
};
fuubar = {
- dependencies = ["rspec" "ruby-progressbar"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xwqs24y8s73aayh39si17kccsmr0bjgmi6jrjyfp7gkjb6iyhpv";
@@ -890,7 +872,6 @@
version = "2.0.0";
};
gemnasium-gitlab-service = {
- dependencies = ["rugged"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qv7fkahmqkah3770ycrxd0x2ais4z41hb43a0r8q8wcdklns3m3";
@@ -940,7 +921,6 @@
meta.priority = 10; # lower priority, exectuable conflicts with gitlab-markdown
};
gitlab-flowdock-git-hook = {
- dependencies = ["flowdock" "gitlab-grit" "multi_json"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1s3a10cdbh4xy732b92zcsm5zyc1lhi5v29d76j8mwbqmj11a2p8";
@@ -967,21 +947,12 @@
gitlab_git = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vg2k3nlws6ghbs80zy3v8yclsx61x36f17r0k8vwv1xwvfhyhgz";
+ sha256 = "0nnr6dlqq30syab2g7yvffgzinj5c8n9q7fvr3d88ix8hsawjrjm";
type = "gem";
};
- version = "10.6.6";
- };
- gitlab_meta = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "14vahv7gblcypbvip845sg3lvawf3kij61mkxz5vyfcv23niqvp9";
- type = "gem";
- };
- version = "7.0";
+ version = "10.7.0";
};
gitlab_omniauth-ldap = {
- dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vbdyi57vvlrigyfhmqrnkw801x57fwa3gxvj1rj2bn9ig5186ri";
@@ -1038,7 +1009,6 @@
version = "0.15.0";
};
grape-entity = {
- dependencies = ["activesupport" "multi_json"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hxghs2p9ncvdwhp6dwr1a74g552c49dd0jzy0szp4pg2xjbgjk8";
@@ -1081,13 +1051,12 @@
health_check = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jhm5342ngm2qfa1s6g0k09rszvb0h9jkxgda7dkwhg2v4cgj976";
+ sha256 = "0y8nzhs7ccpvbmqrxw5vdyf5x4fv8356cb8r29h8m3rxd8r388r7";
type = "gem";
};
- version = "2.1.0";
+ version = "2.2.1";
};
hipchat = {
- dependencies = ["httparty" "mimemagic"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k";
@@ -1096,7 +1065,6 @@
version = "1.5.2";
};
html-pipeline = {
- dependencies = ["activesupport" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yckdlrn4v5d7bgl8mbffax16640pgg9ny693kqi4j7g17vx2q9l";
@@ -1113,7 +1081,6 @@
version = "4.3.4";
};
httparty = {
- dependencies = ["json" "multi_xml"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0c9gvg6dqw2h3qyaxhrq1pzm6r69zfcmfh038wyhisqsd39g9hr2";
@@ -1146,7 +1113,6 @@
version = "0.11.1";
};
influxdb = {
- dependencies = ["cause" "json"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vhg5nd88nwvfa76lqcczld916nljswwq6clsixrzi3js8ym9y1w";
@@ -1179,7 +1145,6 @@
version = "4.1.1";
};
jquery-turbolinks = {
- dependencies = ["railties" "turbolinks"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d23mnl3lgamk9ziw4yyv2ixck6d8s8xp4f9pmwimk0by0jq7xhc";
@@ -1188,7 +1153,6 @@
version = "2.1.0";
};
jquery-ui-rails = {
- dependencies = ["railties"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gfygrv4bjpjd2c377lw7xzk1b77rxjyy3w6wl4bq1gkqvyrkx77";
@@ -1245,7 +1209,6 @@
version = "1.11.0";
};
launchy = {
- dependencies = ["addressable"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2";
@@ -1286,7 +1249,6 @@
version = "8.0.0";
};
listen = {
- dependencies = ["rb-fsevent" "rb-inotify"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "182wd2pkf690ll19lx6zbk01a3rqkk5lwsyin6kwydl7lqxj5z3g";
@@ -1295,7 +1257,6 @@
version = "3.0.5";
};
loofah = {
- dependencies = ["nokogiri"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "109ps521p0sr3kgc460d58b4pr1z4mqggan2jbsf0aajy9s6xis8";
@@ -1304,7 +1265,6 @@
version = "2.0.3";
};
macaddr = {
- dependencies = ["systemu"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1clii8mvhmh5lmnm95ljnjygyiyhdpja85c5vy487rhxn52scn0b";
@@ -1505,7 +1465,6 @@
version = "1.4.1";
};
omniauth-azure-oauth2 = {
- dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qay454zvyas8xfnfkycqpjkafaq5pw4gaji176cdfw0blhviz0s";
@@ -1514,7 +1473,6 @@
version = "0.0.6";
};
omniauth-bitbucket = {
- dependencies = ["multi_json" "omniauth" "omniauth-oauth"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lals2z1yixffrc97zh7zn1jpz9l6vpb3alcp13im42dq9q0g845";
@@ -1523,7 +1481,6 @@
version = "0.0.2";
};
omniauth-cas3 = {
- dependencies = ["addressable" "nokogiri" "omniauth"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13swm2hi2z63nvb2bps6g41kki8kr9b5c7014rk8259bxlpflrk7";
@@ -1540,7 +1497,6 @@
version = "4.0.0";
};
omniauth-github = {
- dependencies = ["omniauth" "omniauth-oauth2"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mbx3c8m1llhdxrqdciq8jh428bxj1nvf4yhziv2xqmqpjcqz617";
@@ -1549,7 +1505,6 @@
version = "1.1.2";
};
omniauth-gitlab = {
- dependencies = ["omniauth" "omniauth-oauth2"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "083yyc8612kq8ygd8y7s8lxg2d51jcsakbs4pa19aww67gcm72iz";
@@ -1566,7 +1521,6 @@
version = "0.4.1";
};
omniauth-kerberos = {
- dependencies = ["omniauth-multipassword" "timfel-krb5-auth"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05xsv76qjxcxzrvabaar2bchv7435y8l2j0wk4zgchh3yv85kiq7";
@@ -1575,7 +1529,6 @@
version = "0.3.0";
};
omniauth-multipassword = {
- dependencies = ["omniauth"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qykp76hw80lkgb39hyzrv68hkbivc8cv0vbvrnycjh9fwfp1lv8";
@@ -1584,7 +1537,6 @@
version = "0.4.2";
};
omniauth-oauth = {
- dependencies = ["oauth" "omniauth"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1n5vk4by7hkyc09d9blrw2argry5awpw4gbw1l4n2s9b3j4qz037";
@@ -1593,7 +1545,6 @@
version = "1.1.0";
};
omniauth-oauth2 = {
- dependencies = ["oauth2" "omniauth"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mskwlw5ibx9mz7ywqji6mm56ikf7mglbnfc02qhg6ry527jsxdm";
@@ -1604,13 +1555,12 @@
omniauth-saml = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xs7v08s34s2bpyd3i8i8kj73zqb6wgn51ix3pmcwsifns0c8npr";
+ sha256 = "1garppa83v53yr9bwfx51v4hqwfr5h4aq3d39gn2fmysnfav7c1x";
type = "gem";
};
- version = "1.6.0";
+ version = "1.7.0";
};
omniauth-shibboleth = {
- dependencies = ["omniauth"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0a8pwy23aybxhn545357zdjy0hnpfgldwqk5snmz9kxingpq12jl";
@@ -1619,7 +1569,6 @@
version = "1.2.1";
};
omniauth-twitter = {
- dependencies = ["json" "omniauth-oauth"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hqjpb1zx0pp3s12c83pkpk4kkx41f001jc5n8qz0h3wll0ld833";
@@ -1628,7 +1577,6 @@
version = "1.2.1";
};
omniauth_crowd = {
- dependencies = ["activesupport" "nokogiri" "omniauth"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12g5ck05h6kr9mnp870x8pkxsadg81ca70hg8n3k8xx007lfw2q7";
@@ -1637,7 +1585,6 @@
version = "2.2.3";
};
org-ruby = {
- dependencies = ["rubypants"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0x69s7aysfiwlcpd9hkvksfyld34d8kxr62adb59vjvh8hxfrjwk";
@@ -1654,7 +1601,6 @@
version = "0.5.0";
};
paranoia = {
- dependencies = ["activerecord"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0z2smnnghjhcs4l5fkz9scs1kj0bvj2n8xmzcvw4rg9yprdnlxr0";
@@ -1665,10 +1611,10 @@
parser = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0fxcs83z28wxn6bphbq5q40c1y5ab8zl8ww17jwkbi032wf6iik6";
+ sha256 = "0l92rqcfy16y7kmnkil88c5mv3vj8pvhj0llbhv0avmhkaixhld1";
type = "gem";
};
- version = "2.3.1.2";
+ version = "2.3.1.4";
};
pg = {
source = {
@@ -1727,7 +1673,6 @@
version = "1.9.2";
};
pry = {
- dependencies = ["coderay" "method_source" "slop"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x78rvp69ws37kwig18a8hr79qn36vh8g1fn75p485y3b3yiqszg";
@@ -1736,7 +1681,6 @@
version = "0.10.3";
};
pry-rails = {
- dependencies = ["pry"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0a2iinvabis2xmv0z7z7jmh7bbkkngxj2qixfdg5m6qj9x8k1kx6";
@@ -1761,7 +1705,6 @@
version = "1.6.4";
};
rack-accept = {
- dependencies = ["rack"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18jdipx17b4ki33cfqvliapd31sbfvs4mv727awynr6v95a7n936";
@@ -1770,7 +1713,6 @@
version = "0.4.5";
};
rack-attack = {
- dependencies = ["rack"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ihic8ar2ddfv15p5gia8nqzsl3y7iayg5v4rmg72jlvikgsabls";
@@ -1787,7 +1729,6 @@
version = "0.4.0";
};
rack-mount = {
- dependencies = ["rack"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09a1qfaxxsll1kbgz7z0q0nr48sfmfm7akzaviis5bjpa5r00ld2";
@@ -1804,7 +1745,6 @@
version = "1.2.3";
};
rack-protection = {
- dependencies = ["rack"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
@@ -1813,7 +1753,6 @@
version = "1.5.3";
};
rack-test = {
- dependencies = ["rack"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
@@ -1830,7 +1769,6 @@
version = "4.2.7.1";
};
rails-deprecated_sanitizer = {
- dependencies = ["activesupport"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj";
@@ -1839,7 +1777,6 @@
version = "1.0.3";
};
rails-dom-testing = {
- dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1v8jl6803mbqpxh4hn0szj081q1a3ap0nb8ni0qswi7z4la844v8";
@@ -1848,7 +1785,6 @@
version = "1.0.7";
};
rails-html-sanitizer = {
- dependencies = ["loofah"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "138fd86kv073zqfx0xifm646w6bgw2lr8snk16lknrrfrss8xnm7";
@@ -1875,10 +1811,10 @@
raindrops = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1hv0xhr762axywr937czi92fs0x3zk7k22vg6f4i7rr8d05sp560";
+ sha256 = "1syj5gdrgwzdqzc3p1bqg1wv6gn16s2iq8304mrglzhi7cyja73q";
type = "gem";
};
- version = "0.15.0";
+ version = "0.17.0";
};
rake = {
source = {
@@ -1897,7 +1833,6 @@
version = "0.9.6";
};
rb-inotify = {
- dependencies = ["ffi"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9";
@@ -1906,7 +1841,6 @@
version = "0.9.5";
};
rblineprof = {
- dependencies = ["debugger-ruby_core_source"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0m58kdjgncwf0h1qry3qk5h4bg8sj0idykqqijqcrr09mxfd9yc6";
@@ -1915,7 +1849,6 @@
version = "0.3.6";
};
rdoc = {
- dependencies = ["json"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1v9k4sp5yzj2bshngckdvivj6bszciskk1nd2r3wri2ygs7vgqm8";
@@ -1956,7 +1889,6 @@
version = "3.2.2";
};
redis-actionpack = {
- dependencies = ["actionpack" "redis-rack" "redis-store"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jjl6dhhpdapdaywq5iqz7z36mwbw0cn0m30wcc5wcbv7xmiiygw";
@@ -1965,7 +1897,6 @@
version = "4.0.1";
};
redis-activesupport = {
- dependencies = ["activesupport" "redis-store"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10y3kybz21n2z11478sf0cp4xzclvxf0b428787brmgpc6i7p7zg";
@@ -1974,7 +1905,6 @@
version = "4.1.5";
};
redis-namespace = {
- dependencies = ["redis"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rp8gfkznfxqzxk9s976k71jnljkh0clkrhnp6vgx46s5yhj9g25";
@@ -1983,7 +1913,6 @@
version = "1.5.2";
};
redis-rack = {
- dependencies = ["rack" "redis-store"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1y1mxx8gn0krdrpwllv7fqsbvki1qjnb2dz8b4q9gwc326829gk8";
@@ -1992,7 +1921,6 @@
version = "1.5.0";
};
redis-rails = {
- dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0igww7hb58aq74mh50dli3zjg78b54y8nhd0h1h9vz4vgjd4q8m7";
@@ -2001,7 +1929,6 @@
version = "4.0.0";
};
redis-store = {
- dependencies = ["redis"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gf462p0wx4hn7m1m8ghs701n6xx0ijzm5cff9xfagd2s6va145m";
@@ -2018,7 +1945,6 @@
version = "1.3.1";
};
rerun = {
- dependencies = ["listen"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0av239bpmy55fdx4qaw9n71aapjy2myr51h5plzjxsyr0fdwn1xq";
@@ -2027,13 +1953,12 @@
version = "0.11.0";
};
responders = {
- dependencies = ["railties"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i00bxp8fa67rzl50wfiaw16w21j5d5gwjjkdiwr0sw9q6ixmpz1";
+ sha256 = "16h343srb6msivc2mpm1dbihsmniwvyc9jk3g4ip08g9fpmxfc2i";
type = "gem";
};
- version = "2.1.1";
+ version = "2.3.0";
};
rinku = {
source = {
@@ -2060,7 +1985,6 @@
version = "2.0.6";
};
rqrcode = {
- dependencies = ["chunky_png"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "188n1mvc7klrlw30bai16sdg4yannmy7cz0sg0nvm6f1kjx5qflb";
@@ -2069,7 +1993,6 @@
version = "0.7.0";
};
rqrcode-rails3 = {
- dependencies = ["rqrcode"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1i28rwmj24ssk91chn0g7qsnvn003y3s5a7jsrg3w4l5ckr841bg";
@@ -2136,10 +2059,10 @@
rubocop = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "064rh2fhr05mjgsmi1viljn9arcm2ggfaxkpk92ns9kf3ym7dz8v";
+ sha256 = "0r2p4v6w5w1zx4skj9i3g3pshg3rykhgswimydrswp6nb8nkaphj";
type = "gem";
};
- version = "0.42.0";
+ version = "0.43.0";
};
rubocop-rspec = {
source = {
@@ -2150,7 +2073,6 @@
version = "1.5.0";
};
ruby-fogbugz = {
- dependencies = ["crack"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jj0gpkycbrivkh2q3429vj6mbgx6axxisg69slj3c4mgvzfgchm";
@@ -2161,10 +2083,10 @@
ruby-prof = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qvz8yclvxch3bmwh7wmnb5h8jsbmb8jmqcf94jjrakpcs2sc072";
+ sha256 = "0y13gdcdajfgrkx5rc9pvb7bwkyximwl5yrhq05gkmhflzdr7kag";
type = "gem";
};
- version = "0.15.9";
+ version = "0.16.2";
};
ruby-progressbar = {
source = {
@@ -2177,10 +2099,10 @@
ruby-saml = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qhma3cdmi9acpsn6r3x5mjjgfqxkhzxgy2pd3bc6rddghpa3x5l";
+ sha256 = "1abhf16vbyzck4pv06qd5c59780glaf682ssjzpjwd9h9d7nqvl5";
type = "gem";
};
- version = "1.3.0";
+ version = "1.4.1";
};
ruby_parser = {
source = {
@@ -2239,7 +2161,6 @@
version = "1.0.4";
};
sanitize = {
- dependencies = ["nokogiri"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3";
@@ -2258,10 +2179,10 @@
sass-rails = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ag66qa1f4agghdmnmn199s4sp7x54msa3abs31vl89ncbdf933i";
+ sha256 = "0iji20hb8crncz14piss1b29bfb6l89sz3ai5fny3iw39vnxkdcb";
type = "gem";
};
- version = "5.0.5";
+ version = "5.0.6";
};
sawyer = {
source = {
@@ -2280,7 +2201,6 @@
version = "0.47.1";
};
sdoc = {
- dependencies = ["json" "rdoc"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17l8qk0ld47z4h5avcnylvds8nc6dp25zc64w23z8li2hs341xf2";
@@ -2297,7 +2217,6 @@
version = "2.3.6";
};
select2-rails = {
- dependencies = ["thor"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ni2k74n73y3gv56gs37gkjlh912szjf6k9j483wz41m3xvlz7fj";
@@ -2330,7 +2249,6 @@
version = "4.7.0";
};
sham_rack = {
- dependencies = ["rack"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zs6hpgg87x5jrykjxgfp2i7m5aja53s5kamdhxam16wki1hid3i";
@@ -2339,7 +2257,6 @@
version = "1.3.6";
};
shoulda-matchers = {
- dependencies = ["activesupport"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0d3ryqcsk1n9y35bx5wxnqbgw4m8b3c79isazdjnnbg8crdp72d0";
@@ -2350,13 +2267,12 @@
sidekiq = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0j0yz9fv79d7sasz7lsrb9fnymxg58jpykgr58r73nv2v8nsx1nm";
+ sha256 = "1l9ji9lmgvgc9p45js3hrbpv6fj0kvrvx5lkrjd751g8r3h98z0l";
type = "gem";
};
- version = "4.1.4";
+ version = "4.2.1";
};
sidekiq-cron = {
- dependencies = ["redis-namespace" "rufus-scheduler" "sidekiq"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xnbvh8kjv6954vsiwfcpp7bn8sgpwvnyapnq7b94w8h7kj3ykqy";
@@ -2380,14 +2296,6 @@
};
version = "0.10.0";
};
- sinatra = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp";
- type = "gem";
- };
- version = "1.4.7";
- };
slack-notifier = {
source = {
remotes = ["https://rubygems.org"];
@@ -2405,7 +2313,6 @@
version = "3.6.0";
};
spinach = {
- dependencies = ["colorize" "gherkin-ruby" "json"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0phfjs4iw2iqxdaljzwk6qxmi2x86pl3hirmpgw2pgfx76wfx688";
@@ -2414,7 +2321,6 @@
version = "0.8.10";
};
spinach-rails = {
- dependencies = ["capybara" "railties" "spinach"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nfacfylkncfgi59g2wga6m4nzdcjqb8s50cax4nbx362ap4bl70";
@@ -2439,7 +2345,6 @@
version = "1.7.2";
};
spring-commands-rspec = {
- dependencies = ["spring"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0b0svpq3md1pjz5drpa5pxwg8nk48wrshq8lckim4x3nli7ya0k2";
@@ -2456,7 +2361,6 @@
version = "1.1.0";
};
spring-commands-teaspoon = {
- dependencies = ["spring"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g7n4m2s9d0frh7y1xibzpphqajfnx4fvgfc66nh545dd91w2nqz";
@@ -2467,18 +2371,18 @@
sprockets = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0flynmaaxa53pv15x7kcxr7z6h1hn7ifrxk13dfhhvh6h38jnzkv";
+ sha256 = "0jzsfiladswnzbrwqfiaj1xip68y58rwx0lpmj907vvq47k87gj1";
type = "gem";
};
- version = "3.6.3";
+ version = "3.7.0";
};
sprockets-es6 = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17hjwpzkdg5dsgzky7hmaly2jih8867ya35855p3lxqpd3gyfpny";
+ sha256 = "0508h3vnjz08c64k11za6cqnbvvifka9pmdrycamzzjd4dmf10y3";
type = "gem";
};
- version = "0.9.0";
+ version = "0.9.2";
};
sprockets-rails = {
source = {
@@ -2544,15 +2448,6 @@
};
version = "2.6.5";
};
- task_list = {
- dependencies = ["html-pipeline"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1iv1fizb04463c4mp4gxd8v0414fhvmiwvwvjby5b9qq79d8zwab";
- type = "gem";
- };
- version = "1.0.2";
- };
teaspoon = {
source = {
remotes = ["https://rubygems.org"];
@@ -2562,7 +2457,6 @@
version = "1.1.5";
};
teaspoon-jasmine = {
- dependencies = ["teaspoon"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00wygrv1jm4aj15p1ab9d5fdrj6y83kv26xgp52mx4lp78h2ms9q";
@@ -2579,7 +2473,6 @@
version = "0.7.7";
};
test_after_commit = {
- dependencies = ["activerecord"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fzg8qan6f0n0ynr594bld2k0rwwxj99yzhiga2f3pkj9ina1abb";
@@ -2635,8 +2528,15 @@
};
version = "0.8.3";
};
+ truncato = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "09ngwz2mpfsi1ms94j7nmms4kbd5sgcqv5dshrbwaqf585ja7cm5";
+ type = "gem";
+ };
+ version = "0.7.8";
+ };
turbolinks = {
- dependencies = ["coffee-rails"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ddrx25vvvqxlz4h59lrmjhc2bfwxf4bpicvyhgbpjd48ckj81jn";
@@ -2645,7 +2545,6 @@
version = "2.5.3";
};
tzinfo = {
- dependencies = ["thread_safe"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx";
@@ -2662,7 +2561,6 @@
version = "0.2.1";
};
uglifier = {
- dependencies = ["execjs" "json"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mzs64z3m1b98rh6ssxpqfz9sc87f6ml6906b0m57vydzfgrh1cz";
@@ -2679,7 +2577,6 @@
version = "1.8.3";
};
unf = {
- dependencies = ["unf_ext"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
@@ -2706,13 +2603,12 @@
unicorn = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02xgk7gajnp8zqd2wvk1hbbwz7czlbpk29ahs9ph0jprsssnzzrv";
+ sha256 = "1rcvg9381yw3wrnpny5c01mvm35caycshvfbg96wagjhscw6l72v";
type = "gem";
};
- version = "4.9.0";
+ version = "5.1.0";
};
unicorn-worker-killer = {
- dependencies = ["get_process_mem" "unicorn"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rrdxpwdsapx47axjin8ymxb4f685qlpx8a26bql4ay1559c3gva";
@@ -2729,7 +2625,6 @@
version = "1.10.0";
};
uuid = {
- dependencies = ["macaddr"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gr2mxg27l380wpiy66mgv9wq02myj6m4gmp6c4g1vsbzkh0213v";
@@ -2746,7 +2641,6 @@
version = "2.1.0";
};
virtus = {
- dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06iphwi3c4f7y9i2rvhvaizfswqbaflilziz4dxqngrdysgkn1fk";
@@ -2779,7 +2673,6 @@
version = "2.3.0";
};
webmock = {
- dependencies = ["addressable" "crack"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p7hqdxk5359xwp59pcx841fhbnqx01ra98rnwhdyz61nrc6piv3";
@@ -2788,7 +2681,6 @@
version = "1.21.0";
};
websocket-driver = {
- dependencies = ["websocket-extensions"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1v39w1ig6ps8g55xhz6x1w53apl17ii6kpy0jg9249akgpdvb0k9";
@@ -2805,7 +2697,6 @@
version = "0.1.2";
};
wikicloth = {
- dependencies = ["builder" "expression_parser" "rinku"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s";
@@ -2822,7 +2713,6 @@
version = "1.1.5";
};
xpath = {
- dependencies = ["nokogiri"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04kcr127l34p7221z13blyl0dvh0bmxwx326j72idayri36a394w";
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 503ae4e90b9..05db6d964c3 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, itstool, pythonPackages, intltool, wrapGAppsHook
+{ stdenv, fetchurl, itstool, python2Packages, intltool, wrapGAppsHook
, libxml2, gobjectIntrospection, gtk3, gnome3, cairo, file
}:
let
minor = "3.16";
- version = "${minor}.2";
- inherit (pythonPackages) python buildPythonApplication pycairo pygobject3;
+ version = "${minor}.4";
+ inherit (python2Packages) python buildPythonApplication pycairo pygobject3;
in buildPythonApplication rec {
name = "meld-${version}";
src = fetchurl {
url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz";
- sha256 = "2dd3f58b95444bf721e0c912668c29cf8f47a402440b772ea12c4b9a0c94966f";
+ sha256 = "0rwflfkfnb9ydnk4k591x0il29d4dvz95cjs2f279blx64lgki4k";
};
buildInputs = [
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 034bde6911e..eddbc0e56dd 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -103,15 +103,13 @@ let
});
in {
-
subversion18 = common {
- version = "1.8.16";
- sha256 = "0imkxn25n6sbcgfldrx4z29npjprb1lxjm5fb89q4297161nx3zi";
+ version = "1.8.17";
+ sha256 = "1450fkj1jmxyphqn6cd95z1ykwsabajm9jw4i412qpwss8w9a4fy";
};
subversion19 = common {
- version = "1.9.4";
- sha256 = "16cjkvvq628hbznkhqkppzs8nifcr7k43s5y4c32cgwqmgigjrqj";
+ version = "1.9.5";
+ sha256 = "1ramwly6p74jhb2rdm5ygxjri7jds940cilyvnsdq60xzy5cckwa";
};
-
}
diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix
index dde09dfe22d..424a402780a 100644
--- a/pkgs/applications/version-management/tailor/default.nix
+++ b/pkgs/applications/version-management/tailor/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, python2Packages }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "tailor-${version}";
version = "0.9.35";
diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
index e5c704f71c7..fd61e490402 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -1,6 +1,6 @@
-{lib, fetchurl, mercurial, pythonPackages}:
+{lib, fetchurl, mercurial, python2Packages}:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "tortoisehg-${version}";
version = "3.9.2";
@@ -9,15 +9,15 @@ pythonPackages.buildPythonApplication rec {
sha256 = "17wcsf91z7dnb7c8vyagasj5vvmas6ms5lx1ny4pnm94qzslkfh2";
};
- pythonPath = with pythonPackages; [ pyqt4 mercurial qscintilla iniparse ];
+ pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];
- propagatedBuildInputs = with pythonPackages; [ qscintilla iniparse ];
+ propagatedBuildInputs = with python2Packages; [ qscintilla iniparse ];
doCheck = false;
dontStrip = true;
buildPhase = "";
installPhase = ''
- ${pythonPackages.python.executable} setup.py install --prefix=$out
+ ${python2Packages.python.executable} setup.py install --prefix=$out
ln -s $out/bin/thg $out/bin/tortoisehg #convenient alias
'';
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 96017a7ba19..01687b58867 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -14,11 +14,11 @@
}:
let
- version = "2.6.12";
+ version = "2.6.15";
src = fetchurl {
url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz";
- sha256 = "0nz52yih8sff53inndkh2dba759xjzsh4b8xjww419lcpk0qp6kn";
+ sha256 = "0mr2nll81ki9d1s68klhm19jmr15450wjaws1p0b0y2qqwyrprdh";
};
common = {
@@ -43,7 +43,7 @@ let
;
meta = {
- homepage = http://fixounet.free.fr/avidemux/;
+ homepage = "http://fixounet.free.fr/avidemux/";
description = "Free video editor designed for simple video editing tasks";
maintainers = with stdenv.lib.maintainers; [ viric abbradar ];
platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/video/avidemux/dynamic_install_dir.patch b/pkgs/applications/video/avidemux/dynamic_install_dir.patch
index f2f963e5169..803cde02ec2 100644
--- a/pkgs/applications/video/avidemux/dynamic_install_dir.patch
+++ b/pkgs/applications/video/avidemux/dynamic_install_dir.patch
@@ -1,12 +1,12 @@
-diff -ru3 avidemux_2.6.12.old/avidemux_core/ADM_core/src/ADM_fileio.cpp avidemux_2.6.12/avidemux_core/ADM_core/src/ADM_fileio.cpp
---- avidemux_2.6.12.old/avidemux_core/ADM_core/src/ADM_fileio.cpp 2016-03-25 15:26:00.368213627 +0300
-+++ avidemux_2.6.12/avidemux_core/ADM_core/src/ADM_fileio.cpp 2016-03-26 02:32:56.163550537 +0300
-@@ -393,7 +393,7 @@
-
- return ADM_getRelativePath(buffer, base1, base2, base3);
- #else
-- return ADM_getRelativePath(ADM_INSTALL_DIR, base1, base2, base3);
-+ return ADM_getRelativePath(getenv("ADM_ROOT_DIR"), base1, base2, base3);
- #endif
- }
-
+diff -ru3 avidemux_2.6.15-old/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.6.15/avidemux_core/ADM_core/src/ADM_folder_linux.cpp
+--- avidemux_2.6.15-old/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2016-11-23 02:13:41.406566362 +0300
++++ avidemux_2.6.15/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2016-11-23 02:14:33.433566147 +0300
+@@ -92,7 +92,7 @@
+
+ char *ADM_getInstallRelativePath(const char *base1, const char *base2, const char *base3)
+ {
+- return ADM_getRelativePath(ADM_INSTALL_DIR, base1, base2, base3);
++ return ADM_getRelativePath(getenv("ADM_ROOT_DIR"), base1, base2, base3);
+ }
+ const std::string ADM_getI8NDir(const std::string &flavor)
+ {
diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix
index efd0f257ca0..e6d3fbb090f 100644
--- a/pkgs/applications/video/kodi/wrapper.nix
+++ b/pkgs/applications/video/kodi/wrapper.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
done)
'';
- preferLocalBuilds = true;
+ preferLocalBuild = true;
meta = with kodi.meta; {
inherit license homepage;
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 0af19aeca95..9c987534065 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -10,13 +10,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "mkvtoolnix-${version}";
- version = "9.5.0";
+ version = "9.6.0";
src = fetchFromGitHub {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
- sha256 = "1v6rqlb5srhwzad45b50pvfbi1c9n719ihi54hzbkzklj7h4s70h";
+ sha256 = "14v6iclzkqxibzcdxr65bb5frmnsjyyly0d3lwv1gg7g1mkcw3jd";
};
nativeBuildInputs = [ pkgconfig autoconf automake gettext ruby ];
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 3ed58017fe2..dd9c67b952f 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -79,13 +79,13 @@ let
};
in stdenv.mkDerivation rec {
name = "mpv-${version}";
- version = "0.21.0";
+ version = "0.22.0";
src = fetchFromGitHub {
owner = "mpv-player";
repo = "mpv";
rev = "v${version}";
- sha256 = "1v1qfppysi0qn40q9z7cx9gs7pcrz2hn1g44iynygvgj29h1gify";
+ sha256 = "0mv8fs2zxp6pvpi5xdrpvvqcaa5f0c83jdfi0pfqnwbpkz1kb9s6";
};
patchPhase = ''
@@ -160,6 +160,11 @@ in stdenv.mkDerivation rec {
--prefix PATH : "${youtube-dl}/bin" \
'' + optionalString vapoursynthSupport ''
--prefix PYTHONPATH : "$(toPythonPath ${vapoursynth}):$PYTHONPATH"
+ '' + ''
+
+ cp TOOLS/umpv $out/bin
+ wrapProgram $out/bin/umpv \
+ --set MPV "$out/bin/mpv"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix
index 8dc2fc037e6..9e36f790c78 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/quvi/library.nix b/pkgs/applications/video/quvi/library.nix
index 3fa426d9f6f..26e0d947954 100644
--- a/pkgs/applications/video/quvi/library.nix
+++ b/pkgs/applications/video/quvi/library.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libproxy, libgcrypt}:
+{ stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libproxy, libgcrypt, glib }:
stdenv.mkDerivation rec {
name = "libquvi-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1cl1kbgxl1jnx2nwx4z90l0lap09lnnj1fg7hxsxk3m6aj4y4grd";
};
- buildInputs = [ pkgconfig lua5 curl quvi_scripts libproxy libgcrypt ];
+ buildInputs = [ pkgconfig lua5 curl quvi_scripts libproxy libgcrypt glib ];
meta = {
description = "Web video downloader";
diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/applications/video/w_scan/default.nix
new file mode 100644
index 00000000000..59ba63b32ee
--- /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/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 921558a2d12..088dddb3de7 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -11,13 +11,13 @@ with lib;
stdenv.mkDerivation rec {
name = "docker-${version}";
- version = "1.12.3";
+ version = "1.12.5";
src = fetchFromGitHub {
owner = "docker";
repo = "docker";
rev = "v${version}";
- sha256 = "0jifd35h22lgh36w1j2k97pgndjh5sppr3cwndlv0saf9618wx5k";
+ sha256 = "1hnxmh2j1vm8714f7jwjrslkqkd1ry25g5wq76aqlpsz5fh2kqb0";
};
buildInputs = [
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index f81781987cc..a99b37f0d17 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, fetchpatch, python, zlib, pkgconfig, glib
+{ stdenv, fetchurl, fetchpatch, python2, zlib, pkgconfig, glib
, ncurses, perl, pixman, vde2, alsaLib, texinfo, libuuid, flex
-, bison, lzo, snappy, libaio, gnutls, nettle
+, bison, lzo, snappy, libaio, gnutls, nettle, curl
, makeWrapper
, attr, libcap, libcap_ng
, CoreServices, Cocoa, rez, setfile
@@ -11,6 +11,7 @@
, vncSupport ? true, libjpeg, libpng
, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol, usbredir
, x86Only ? false
+, nixosTestRunner ? false
}:
with stdenv.lib;
@@ -22,7 +23,10 @@ let
in
stdenv.mkDerivation rec {
- name = "qemu-" + stdenv.lib.optionalString x86Only "x86-only-" + version;
+ name = "qemu-"
+ + stdenv.lib.optionalString x86Only "x86-only-"
+ + stdenv.lib.optionalString nixosTestRunner "for-vm-tests-"
+ + version;
src = fetchurl {
url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
@@ -30,9 +34,9 @@ stdenv.mkDerivation rec {
};
buildInputs =
- [ python zlib pkgconfig glib ncurses perl pixman
+ [ python2 zlib pkgconfig glib ncurses perl pixman
vde2 texinfo libuuid flex bison makeWrapper lzo snappy
- gnutls nettle
+ gnutls nettle curl
]
++ optionals stdenv.isDarwin [ CoreServices Cocoa rez setfile ]
++ optionals seccompSupport [ libseccomp ]
@@ -113,12 +117,27 @@ 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";
+ })
+ (fetchpatch {
+ name = "qemu-CVE-2016-7907.patch";
+ url = "http://git.qemu.org/?p=qemu.git;a=patch;h=070c4b92b8cd5390889716677a0b92444d6e087a";
+ sha256 = "0in89697r6kwkf302v3cg16390q7qs33n2b4kba26m4x65632dxm";
+ })
# FIXME: Fix for CVE-2016-9101 not yet ready: https://lists.gnu.org/archive/html/qemu-devel/2016-10/msg03024.html
# from http://git.qemu.org/?p=qemu.git;a=patch;h=ff55e94d23ae94c8628b0115320157c763eb3e06
./CVE-2016-9102.patch
- ];
+ ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
hardeningDisable = [ "stackprotector" ];
configureFlags =
diff --git a/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch b/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
new file mode 100644
index 00000000000..9578d595129
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
@@ -0,0 +1,77 @@
+diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
+index 3f271fc..dc273f4 100644
+--- a/hw/9pfs/9p-local.c
++++ b/hw/9pfs/9p-local.c
+@@ -45,6 +45,23 @@
+
+ #define VIRTFS_META_DIR ".virtfs_metadata"
+
++static int is_in_store_path(const char *path)
++{
++ static char *store_path = NULL;
++ int store_path_len = -1;
++
++ if (store_path_len == -1) {
++ if ((store_path = getenv("NIX_STORE")) != NULL)
++ store_path_len = strlen(store_path);
++ else
++ store_path_len = 0;
++ }
++
++ if (store_path_len > 0)
++ return strncmp(path, store_path, strlen(store_path)) == 0;
++ return 0;
++}
++
+ static char *local_mapped_attr_path(FsContext *ctx, const char *path)
+ {
+ int dirlen;
+@@ -128,6 +145,8 @@ static int local_lstat(FsContext *fs_ctx, V9fsPath *fs_path, struct stat *stbuf)
+ if (err) {
+ goto err_out;
+ }
++ stbuf->st_uid = 0;
++ stbuf->st_gid = 0;
+ if (fs_ctx->export_flags & V9FS_SM_MAPPED) {
+ /* Actual credentials are part of extended attrs */
+ uid_t tmp_uid;
+@@ -462,6 +481,11 @@ static ssize_t local_pwritev(FsContext *ctx, V9fsFidOpenState *fs,
+ return ret;
+ }
+
++static inline int maybe_chmod(const char *path, mode_t mode)
++{
++ return is_in_store_path(path) ? 0 : chmod(path, mode);
++}
++
+ static int local_chmod(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp)
+ {
+ char *buffer;
+@@ -477,7 +501,7 @@ static int local_chmod(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp)
+ } else if ((fs_ctx->export_flags & V9FS_SM_PASSTHROUGH) ||
+ (fs_ctx->export_flags & V9FS_SM_NONE)) {
+ buffer = rpath(fs_ctx, path);
+- ret = chmod(buffer, credp->fc_mode);
++ ret = maybe_chmod(buffer, credp->fc_mode);
+ g_free(buffer);
+ }
+ return ret;
+@@ -621,6 +645,8 @@ static int local_fstat(FsContext *fs_ctx, int fid_type,
+ if (err) {
+ return err;
+ }
++ stbuf->st_uid = 0;
++ stbuf->st_gid = 0;
+ if (fs_ctx->export_flags & V9FS_SM_MAPPED) {
+ /* Actual credentials are part of extended attrs */
+ uid_t tmp_uid;
+@@ -916,7 +942,8 @@ static int local_chown(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp)
+ (fs_ctx->export_flags & V9FS_SM_PASSTHROUGH) ||
+ (fs_ctx->export_flags & V9FS_SM_NONE)) {
+ buffer = rpath(fs_ctx, path);
+- ret = lchown(buffer, credp->fc_uid, credp->fc_gid);
++ ret = is_in_store_path(buffer)
++ ? 0 : lchown(buffer, credp->fc_uid, credp->fc_gid);
+ g_free(buffer);
+ } else if (fs_ctx->export_flags & V9FS_SM_MAPPED) {
+ buffer = rpath(fs_ctx, path);
diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix
index 63389153a0a..a99e6f56956 100644
--- a/pkgs/applications/virtualization/remotebox/default.nix
+++ b/pkgs/applications/virtualization/remotebox/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "remotebox-${version}";
- version = "2.1";
+ version = "2.2";
src = fetchurl {
url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2";
- sha256 = "0pyi433pwbpyh58p08q8acav7mk90gchgjghvl9f8wqafx7bp404";
+ sha256 = "0g7lx5zk9fk5k8alpag45z2zw9bnrlx1zfs63rc3ilfyvm4k4zc5";
};
buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ];
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index e22e8468e9f..f3f5a88c0af 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -4,7 +4,7 @@
let
# Always get the information from
# https://github.com/coreos/rkt/blob/v${VERSION}/stage1/usr_from_coreos/coreos-common.mk
- coreosImageRelease = "1192.0.0";
+ coreosImageRelease = "1235.0.0";
coreosImageSystemdVersion = "231";
# TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor.
@@ -12,7 +12,7 @@ let
stage1Dir = "lib/rkt/stage1-images";
in stdenv.mkDerivation rec {
- version = "1.18.0";
+ version = "1.21.0";
name = "rkt-${version}";
BUILDDIR="build-${name}";
@@ -20,12 +20,12 @@ in stdenv.mkDerivation rec {
owner = "coreos";
repo = "rkt";
rev = "v${version}";
- sha256 = "0vvkwdpl9y0g5m00m1h7q8f95hj5qxigpxrb5zwfqrcv3clzn5a6";
+ sha256 = "0zd7f3yrnzik96a634m2qyrz25f5mi28caadghqdl9q2apxfb896";
};
stage1BaseImage = fetchurl {
url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
- sha256 = "1j75ad1g217aqar84m9ycl2m71g821hq9yahl4bgjaipx9xnj23g";
+ sha256 = "05gk28a7zzp3j0d1y96cr1xwy9gdl4s0lpnbakzqppa4w3c4m3lq";
};
buildInputs = [
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
new file mode 100644
index 00000000000..e318a0b64d7
--- /dev/null
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, fetchFromGitHub
+, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+ name = "singularity-${version}";
+ version = "2.2";
+
+ src = fetchFromGitHub {
+ owner = "singularityware";
+ repo = "singularity";
+ rev = version;
+ sha256 = "19g43gfdy5s8y4252474cp39d6ypn5dd37wp0s21fgd13vqy26px";
+ };
+
+ buildInputs = [ autoreconfHook ];
+
+ meta = with stdenv.lib; {
+ homepage = http://singularity.lbl.gov/;
+ description = "Designed around the notion of extreme mobility of compute and reproducible science, Singularity enables users to have full control of their operating system environment";
+ license = "BSD license with 2 modifications";
+ platforms = platforms.linux;
+ maintainers = [ maintainers.jbedo ];
+ };
+}
diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix
index 04223d9a9e9..75f90c234e8 100644
--- a/pkgs/applications/virtualization/virtinst/default.nix
+++ b/pkgs/applications/virtualization/virtinst/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl }:
+{ stdenv, fetchurl, python2Packages, intltool, libxml2Python, curl }:
with stdenv.lib;
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "175laiy49dni8hzi0cn14bbsdsigvgr9h6d9z2bcvbpa29spldvf";
};
- pythonPath = with pythonPackages;
+ pythonPath = with python2Packages;
[ setuptools eventlet greenlet gflags netaddr carrot routes
PasteDeploy m2crypto ipy twisted
distutils_extra simplejson glanceclient cheetah lockfile httplib2
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
];
buildInputs =
- [ pythonPackages.python
- pythonPackages.wrapPython
- pythonPackages.mox
+ [ python2Packages.python
+ python2Packages.wrapPython
+ python2Packages.mox
intltool
] ++ pythonPath;
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 64275448651..14a87151e97 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -4,7 +4,7 @@
, which, alsaLib, curl, libvpx, gawk, nettools, dbus
, xorriso, makeself, perl, pkgconfig
, javaBindings ? false, jdk ? null
-, pythonBindings ? false, python ? null
+, pythonBindings ? false, python2 ? null
, enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null
, pulseSupport ? false, libpulseaudio ? null
, enableHardening ? false
@@ -15,6 +15,7 @@
with stdenv.lib;
let
+ python = python2;
buildType = "release";
inherit (importJSON ./upstream-info.json) version extpackRev extpack main;
@@ -48,10 +49,10 @@ in stdenv.mkDerivation {
buildInputs =
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL
- libcap glib lvm2 python alsaLib curl libvpx pam xorriso makeself perl
- pkgconfig which libXmu libpng patchelfUnstable ]
+ libcap glib lvm2 alsaLib curl libvpx pam xorriso makeself perl
+ pkgconfig which libXmu libpng patchelfUnstable python ]
++ optional javaBindings jdk
- ++ optional pythonBindings python
+ ++ optional pythonBindings python # Python is needed even when not building bindings
++ optional pulseSupport libpulseaudio
++ optionals (headless) [ libXrandr ]
++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ];
diff --git a/pkgs/applications/virtualization/virtualbox/update.py b/pkgs/applications/virtualization/virtualbox/update.py
index ff1b2e2fffb..6e8bfd5c825 100755
--- a/pkgs/applications/virtualization/virtualbox/update.py
+++ b/pkgs/applications/virtualization/virtualbox/update.py
@@ -1,4 +1,6 @@
-#!/usr/bin/env python3
+#!/usr/bin/env nix-shell
+#!nix-shell -i python3 -p python3
+
import os
import re
import json
diff --git a/pkgs/applications/virtualization/virtualbox/upstream-info.json b/pkgs/applications/virtualization/virtualbox/upstream-info.json
index d861a7e7932..1b85d2b8847 100644
--- a/pkgs/applications/virtualization/virtualbox/upstream-info.json
+++ b/pkgs/applications/virtualization/virtualbox/upstream-info.json
@@ -1,8 +1,8 @@
{
"__NOTE": "Generated using update.py from the same directory.",
- "extpack": "d28bcd01c14eb07eedd2b964d1abe4876f0a7e0e89530e7ba285a5d6267bf322",
- "extpackRev": "111374",
- "guest": "347fd39df6ddee8079ad41fbc038e2fb64952a40255d75292e8e49a0a0cbf657",
- "main": "e447031de468aee746529b2cf60768922f9beff22a13c54284aa430f5e925933",
- "version": "5.1.8"
+ "extpack": "3982657fd4853bcbc79b9162e618545a479b65aca08e9ced43a904aeeba3ffa5",
+ "extpackRev": "112026",
+ "guest": "29fa0af66a3dd273b0c383c4adee31a52061d52f57d176b67f444698300b8c41",
+ "main": "98073b1b2adee4e6553df73cb5bb6ea8ed7c3a41a475757716fd9400393bea40",
+ "version": "5.1.10"
}
diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix
index 271ab7e7fe9..7b89fabaa1c 100644
--- a/pkgs/applications/virtualization/xen/4.5.nix
+++ b/pkgs/applications/virtualization/xen/4.5.nix
@@ -1,4 +1,4 @@
-{ callPackage, fetchurl, fetchgit, ... } @ args:
+{ callPackage, fetchurl, fetchpatch, fetchgit, ... } @ args:
let
# Xen 4.5.5
@@ -54,7 +54,23 @@ let
xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
- ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch ];
+ ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
+ (fetchpatch {
+ url = "https://bugzilla.redhat.com/attachment.cgi?id=1218547";
+ name = "CVE-2016-9385.patch";
+ sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr";
+ })
+ (fetchpatch {
+ url = "https://bugzilla.redhat.com/attachment.cgi?id=1218536";
+ name = "CVE-2016-9377-CVE-2016-9378-part1.patch";
+ sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6";
+ })
+ (fetchpatch {
+ url = "https://bugzilla.redhat.com/attachment.cgi?id=1218537";
+ name = "CVE-2016-9377-CVE-2016-9378-part2.patch";
+ sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz";
+ })
+ ];
};
in callPackage ./generic.nix (args // { xenConfig=xenConfig; })
diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix
index b641a571b24..e9f5d9bdbf2 100644
--- a/pkgs/applications/window-managers/compiz/default.nix
+++ b/pkgs/applications/window-managers/compiz/default.nix
@@ -5,14 +5,15 @@
, libstartup_notification, libpthreadstubs, libxcb, intltool
, ORBit2, libXau, libICE, libSM
, dbus, dbus_glib, librsvg, mesa
-, libXdmcp, libnotify, pythonPackages
+, libXdmcp, libnotify, python2Packages
, hicolor_icon_theme, libjpeg_turbo, libsigcxx, protobuf
, xdg_utils
, gettext, boost, pyrex
, makeWrapper
}:
let
- inherit (pythonPackages) python dbus-python pygtk;
+ # FIXME: Use python.withPackages so we can get rid of PYTHONPATH wrapper
+ inherit (python2Packages) python dbus-python pygtk;
s = # Generated upstream information
rec {
diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix
index 61b35631178..159468f7904 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/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index ada6e8e742e..b6de07bff8a 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -1,25 +1,31 @@
{ fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms
-, xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl
-, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon
+, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev
+, yajl, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon
, xorgserver, xvfb_run, dmenu, i3status }:
stdenv.mkDerivation rec {
name = "i3-${version}";
- version = "4.12";
+ version = "4.13";
src = fetchurl {
url = "http://i3wm.org/downloads/${name}.tar.bz2";
- sha256 = "1d3q3lgpjbkmcwzjhp0dfr0jq847silcfg087slcnj95ikh1r7p1";
+ sha256 = "12ngz32swh9n85xy0cz1lq16aqi9ys5hq19v589q9a97wn1k3hcl";
};
+ nativeBuildInputs = [ which pkgconfig makeWrapper ];
+
buildInputs = [
- which pkgconfig makeWrapper libxcb xcbutilkeysyms xcbutil xcbutilwm libxkbcommon
+ libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon
libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango
perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun
perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC
xorgserver xvfb_run
];
+ configureFlags = [ "--disable-builddir" ];
+
+ enableParallelBuilding = true;
+
postPatch = ''
patchShebangs .
'';
@@ -45,12 +51,8 @@ stdenv.mkDerivation rec {
! grep -q '^not ok' testcases/latest/complete-run.log
'';
- configurePhase = "makeFlags=PREFIX=$out";
-
postInstall = ''
wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB"
- mkdir -p $out/man/man1
- cp man/*.1 $out/man/man1
for program in $out/bin/i3-sensible-*; do
sed -i 's/which/command -v/' $program
done
@@ -59,7 +61,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A tiling window manager";
homepage = "http://i3wm.org";
- maintainers = with maintainers; [ garbas modulistic ];
+ maintainers = with maintainers; [ garbas modulistic fpletz ];
license = licenses.bsd3;
platforms = platforms.all;
diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix
index fa03bc47d9e..f3472be7a72 100644
--- a/pkgs/applications/window-managers/i3/gaps.nix
+++ b/pkgs/applications/window-managers/i3/gaps.nix
@@ -1,28 +1,24 @@
-{ fetchurl, stdenv, i3 }:
+{ fetchurl, stdenv, i3, autoreconfHook }:
i3.overrideDerivation (super : rec {
name = "i3-gaps-${version}";
- version = "4.12";
- releaseDate = "2016-03-06";
+ version = "4.13";
+ releaseDate = "2016-11-08";
src = fetchurl {
url = "https://github.com/Airblader/i3/archive/${version}.tar.gz";
- sha256 = "1i9l993cak85fcw12zgrb5cpspmjixr3yf8naa4zb8589mg4rb8s";
+ sha256 = "0w959nx2crn00fckqwb5y78vcr1j9mvq5lh25wyjszx04pjhf378";
};
+ nativeBuildInputs = super.nativeBuildInputs ++ [ autoreconfHook ];
+
postUnpack = ''
- echo -n "${version} (${releaseDate}, branch \\\"gaps-next\\\")" > ./i3-${version}/I3_VERSION
- echo -n "${version}" > ./i3-${version}/VERSION
- '';
-
- postInstall = ''
- wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB"
- for program in $out/bin/i3-sensible-*; do
- sed -i 's/which/command -v/' $program
- done
+ echo -n "${version} (${releaseDate})" > ./i3-${version}/I3_VERSION
'';
+ # fatal error: GENERATED_config_enums.h: No such file or directory
+ enableParallelBuilding = false;
}) // {
meta = with stdenv.lib; {
diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix
index f4199073077..c13b950599e 100644
--- a/pkgs/applications/window-managers/ion-3/default.nix
+++ b/pkgs/applications/window-managers/ion-3/default.nix
@@ -5,6 +5,8 @@ stdenv.mkDerivation {
meta = {
description = "Tiling tabbed window manager designed with keyboard users in mind";
homepage = http://modeemi.fi/~tuomov/ion;
+ platforms = with stdenv.lib.platforms; linux;
+ license = stdenv.lib.licenses.lgpl21;
};
src = fetchurl {
url = http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz;
diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix
index 86f798e07e9..a8b5be83234 100644
--- a/pkgs/applications/window-managers/windowmaker/default.nix
+++ b/pkgs/applications/window-managers/windowmaker/default.nix
@@ -4,16 +4,17 @@
stdenv.mkDerivation rec {
name = "windowmaker-${version}";
- version = "0.95.6";
+ version = "0.95.7";
srcName = "WindowMaker-${version}";
src = fetchurl {
url = "http://windowmaker.org/pub/source/release/${srcName}.tar.gz";
- sha256 = "1i3dw1yagsa3rs9x2na2ynqlgmbahayws0kz4vl00fla6550nns3";
+ sha256 = "1acph0nq6fsb452sl7j7a7kcc87zqqaw7qms1p8ijar19dn4hbc4";
};
- buildInputs = [ pkgconfig
- libX11 libXext libXft libXmu libXinerama libXrandr libXpm
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs = [ libX11 libXext libXft libXmu libXinerama libXrandr libXpm
imagemagick libpng libjpeg libexif libtiff libungif libwebp ];
configureFlags = [
diff --git a/pkgs/applications/window-managers/xmonad-log-applet/default.nix b/pkgs/applications/window-managers/xmonad-log-applet/default.nix
index f27e7a953dd..b09dfebfd12 100644
--- a/pkgs/applications/window-managers/xmonad-log-applet/default.nix
+++ b/pkgs/applications/window-managers/xmonad-log-applet/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
patches = [ ./fix-paths.patch ];
meta = with stdenv.lib; {
- homepage = http://github.com/alexkay/xmonad-log-applet;
+ homepage = "http://github.com/alexkay/xmonad-log-applet";
license = licenses.bsd3;
description = "An applet that will display XMonad log information (${desktopSupport} version)";
platforms = platforms.linux;
diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh
index 481d642f967..aba5f3295a9 100644
--- a/pkgs/build-support/cc-wrapper/utils.sh
+++ b/pkgs/build-support/cc-wrapper/utils.sh
@@ -34,7 +34,7 @@ expandResponseParams() {
@*)
if [ -e "${p:1}" ]; then
args=$(<"${p:1}")
- eval 'for arg in '$args'; do params+=("$arg"); done'
+ eval 'for arg in '${args//$/\\$}'; do params+=("$arg"); done'
else
params+=("$p")
fi
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 21e0d2b5128..27575053954 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -247,7 +247,7 @@ rec {
echo "Adding contents..."
for item in $contents; do
echo "Adding $item"
- rsync -a $item/ layer/
+ rsync -ak $item/ layer/
done
else
echo "No contents to add to layer."
@@ -310,7 +310,7 @@ rec {
echo "Adding contents..."
for item in ${toString contents}; do
echo "Adding $item..."
- rsync -a $item/ layer/
+ rsync -ak $item/ layer/
done
'';
diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix
index ecec51590b9..3c2e0524eea 100644
--- a/pkgs/build-support/fetchdarcs/default.nix
+++ b/pkgs/build-support/fetchdarcs/default.nix
@@ -7,8 +7,7 @@ stdenv.mkDerivation {
outputHashAlgo = if sha256 == "" then "md5" else "sha256";
outputHashMode = "recursive";
- outputHash = if sha256 == "" then
- (stdenv.lib.fetchMD5warn "fetchdarcs" url md5) else sha256;
+ outputHash = if sha256 == "" then md5 else sha256;
inherit url rev context;
}
diff --git a/pkgs/build-support/fetchegg/default.nix b/pkgs/build-support/fetchegg/default.nix
index e82d4d95ac2..3e0d5d566ad 100644
--- a/pkgs/build-support/fetchegg/default.nix
+++ b/pkgs/build-support/fetchegg/default.nix
@@ -11,8 +11,7 @@ stdenv.mkDerivation {
outputHashAlgo = if sha256 == "" then "md5" else "sha256";
outputHashMode = "recursive";
- outputHash = if sha256 == "" then
- (stdenv.lib.fetchMD5warn "fetchegg" name md5) else sha256;
+ outputHash = if sha256 == "" then md5 else sha256;
inherit version;
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 59e06c95ebb..e40b460d390 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)
@@ -50,8 +50,7 @@ stdenv.mkDerivation {
outputHashAlgo = if sha256 == "" then "md5" else "sha256";
outputHashMode = "recursive";
- outputHash = if sha256 == "" then
- (stdenv.lib.fetchMD5warn "fetchgit" url md5) else sha256;
+ outputHash = if sha256 == "" then md5 else sha256;
inherit url rev leaveDotGit fetchSubmodules deepClone branchName;
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 705d84c648b..f71d9ac55bc 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -291,8 +291,8 @@ _clone_user_rev() {
pushd "$dir" >/dev/null
fullRev=$( (git rev-parse "$rev" 2>/dev/null || git rev-parse "refs/heads/$branchName") | tail -n1)
humanReadableRev=$(git describe "$fullRev" 2> /dev/null || git describe --tags "$fullRev" 2> /dev/null || echo -- none --)
- commitDate=$(git show --no-patch --pretty=%ci "$fullRev")
- commitDateStrict8601=$(git show --no-patch --pretty=%cI "$fullRev")
+ commitDate=$(git show -1 --no-patch --pretty=%ci "$fullRev")
+ commitDateStrict8601=$(git show -1 --no-patch --pretty=%cI "$fullRev")
popd >/dev/null
# Allow doing additional processing before .git removal
@@ -322,6 +322,18 @@ clone_user_rev() {
fi
}
+json_escape() {
+ local s="$1"
+ s="${s//\\/\\\\}" # \
+ s="${s//\"/\\\"}" # "
+ s="${s//^H/\\\b}" # \b (backspace)
+ s="${s//^L/\\\f}" # \f (form feed)
+ s="${s//
+/\\\n}" # \n (newline)
+ s="${s//^M/\\\r}" # \r (carriage return)
+ s="${s// /\\t}" # \t (tab)
+ echo "$s"
+}
print_results() {
hash="$1"
@@ -338,17 +350,15 @@ print_results() {
fi
fi
if test -n "$hash"; then
- echo "{"
- echo " \"url\": \"$url\","
- echo " \"rev\": \"$fullRev\","
- echo " \"date\": \"$commitDateStrict8601\","
- echo -n " \"$hashType\": \"$hash\""
- if test -n "$fetchSubmodules"; then
- echo ","
- echo -n " \"fetchSubmodules\": true"
- fi
- echo ""
- echo "}"
+ cat <
-
-use Archive::Cpio;
-
-my $cpio = Archive::Cpio->new;
-my $IN = \*STDIN;
-my $ino = 1;
-$cpio->read_with_handler($IN, sub {
- my ($e) = @_;
- $e->{mtime} = 1;
- $cpio->write_one(\*STDOUT, $e);
- });
-$cpio->write_trailer(\*STDOUT);
diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix
index 895160616b7..092ab4586b3 100644
--- a/pkgs/build-support/kernel/make-initrd.nix
+++ b/pkgs/build-support/kernel/make-initrd.nix
@@ -12,10 +12,10 @@
# `contents = {object = ...; symlink = /init;}' is a typical
# argument.
-{ stdenv, perl, perlArchiveCpio, cpio, contents, ubootChooser, compressor, prepend }:
+{ stdenv, perl, cpio, contents, ubootChooser, compressor, prepend }:
let
- inputsFun = ubootName : [perl cpio perlArchiveCpio ]
+ inputsFun = ubootName : [ perl cpio ]
++ stdenv.lib.optional (ubootName != null) [ (ubootChooser ubootName) ];
makeUInitrdFun = ubootName : (ubootName != null);
in
@@ -30,12 +30,11 @@ stdenv.mkDerivation {
objects = map (x: x.object) contents;
symlinks = map (x: x.symlink) contents;
suffices = map (x: if x ? suffix then x.suffix else "none") contents;
-
+
# For obtaining the closure of `contents'.
exportReferencesGraph =
map (x: [("closure-" + baseNameOf x.symlink) x.object]) contents;
pathsFromGraph = ./paths-from-graph.pl;
- cpioClean = ./cpio-clean.pl;
crossAttrs = {
nativeBuildInputs = inputsFun stdenv.cross.platform.uboot;
diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh
index 89021caa583..0aeaedeb372 100644
--- a/pkgs/build-support/kernel/make-initrd.sh
+++ b/pkgs/build-support/kernel/make-initrd.sh
@@ -39,7 +39,8 @@ mkdir -p $out
for PREP in $prepend; do
cat $PREP >> $out/initrd
done
-(cd root && find * -print0 | cpio -o -H newc -R 0:0 --null | perl $cpioClean | $compressor >> $out/initrd)
+(cd root && find * -print0 | xargs -0r touch -h -d '@1')
+(cd root && find * -print0 | sort -z | cpio -o -H newc -R +0:+0 --reproducible --null | $compressor >> $out/initrd)
if [ -n "$makeUInitrd" ]; then
mv $out/initrd $out/initrd.gz
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index bbea045f637..a69ef5c6b07 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -6,6 +6,7 @@
, logLevel ? ""
, buildInputs ? []
, cargoUpdateHook ? ""
+, cargoDepsHook ? ""
, ... } @ args:
let
@@ -28,6 +29,8 @@ in stdenv.mkDerivation (args // {
configurePhase = args.configurePhase or "true";
postUnpack = ''
+ eval "$cargoDepsHook"
+
echo "Using cargo deps from $cargoDeps"
cp -r "$cargoDeps" deps
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index ae491e8a7ef..eafc770a8e1 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -98,7 +98,8 @@ moveToOutput() {
if [ "${!output}" = "$dstOut" ]; then continue; fi
local srcPath
for srcPath in "${!output}"/$patt; do
- if [ ! -e "$srcPath" ]; then continue; fi
+ # apply to existing files/dirs, *including* broken symlinks
+ if [ ! -e "$srcPath" ] && [ ! -L "$srcPath" ]; then continue; fi
if [ "$dstOut" = REMOVE ]; then
echo "Removing $srcPath"
diff --git a/pkgs/build-support/setup-hooks/win-dll-link.sh b/pkgs/build-support/setup-hooks/win-dll-link.sh
index be63f69ca10..634a9d18f00 100644
--- a/pkgs/build-support/setup-hooks/win-dll-link.sh
+++ b/pkgs/build-support/setup-hooks/win-dll-link.sh
@@ -33,7 +33,7 @@ _linkDLLs() {
# That DLL might have its own (transitive) dependencies,
# so add also all DLLs from its directory to be sure.
local dllPath2
- for dllPath2 in "$dllPath" "$(dirname "$dllPath")"/*.dll; do
+ for dllPath2 in "$dllPath" "$(dirname $(readlink "$dllPath" || echo "$dllPath"))"/*.dll; do
if [ -e ./"$(basename "$dllPath2")" ]; then continue; fi
ln -sr "$dllPath2" .
linkCount=$(($linkCount+1))
diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix
new file mode 100644
index 00000000000..3c27b9fc1ad
--- /dev/null
+++ b/pkgs/build-support/singularity-tools/default.nix
@@ -0,0 +1,100 @@
+{ runCommand
+, stdenv
+, storeDir ? builtins.storeDir
+, writeScript
+, singularity
+, writeReferencesToFile
+, bash
+, vmTools
+, gawk
+, utillinux
+, e2fsprogs
+, squashfsTools }:
+
+rec {
+ shellScript = name: text:
+ writeScript name ''
+ #!${stdenv.shell}
+ set -e
+ ${text}
+ '';
+
+ mkLayer = {
+ name,
+ contents ? [],
+ }:
+ runCommand "singularity-layer-${name}" {
+ inherit contents;
+ } ''
+ mkdir $out
+ for f in $contents ; do
+ cp -ra $f $out/
+ done
+ '';
+
+ buildImage = {
+ name,
+ contents ? [],
+ diskSize ? 1024,
+ runScript ? "#!${stdenv.shell}\nexec /bin/sh",
+ runAsRoot ? null,
+ extraSpace ? 0
+ }:
+ let layer = mkLayer {
+ inherit name;
+ contents = contents ++ [ bash runScriptFile ];
+ };
+ runAsRootFile = shellScript "run-as-root.sh" runAsRoot;
+ runScriptFile = shellScript "run-script.sh" runScript;
+ result = vmTools.runInLinuxVM (
+ runCommand "singularity-image-${name}.img" {
+ buildInputs = [ singularity e2fsprogs utillinux gawk ];
+ layerClosure = writeReferencesToFile layer;
+ preVM = vmTools.createEmptyImage {
+ size = diskSize;
+ fullName = "singularity-run-disk";
+ };
+ }
+ ''
+ rm -rf $out
+ mkdir disk
+ mkfs -t ext3 -b 4096 /dev/${vmTools.hd}
+ mount /dev/${vmTools.hd} disk
+ cd disk
+
+ # Run root script
+ ${stdenv.lib.optionalString (runAsRoot != null) ''
+ mkdir -p ./${storeDir}
+ mount --rbind ${storeDir} ./${storeDir}
+ unshare -imnpuf --mount-proc chroot ./ ${runAsRootFile}
+ umount -R ./${storeDir}
+ ''}
+
+ # Build /bin and copy across closure
+ mkdir -p bin nix/store
+ for f in $(cat $layerClosure) ; do
+ cp -ar $f ./$f
+ for f in $f/bin/* ; do
+ if [ ! -e bin/$(basename $f) ] ; then
+ ln -s $f bin/
+ fi
+ done
+ done
+
+ # Create runScript
+ ln -s ${runScriptFile} singularity
+
+ # Size calculation
+ cd ..
+ umount disk
+ size=$(resize2fs -P /dev/${vmTools.hd} | awk '{print $NF}')
+ mount /dev/${vmTools.hd} disk
+ cd disk
+
+ export PATH=$PATH:${e2fsprogs}/bin/
+ singularity create -s $((1 + size * 4 / 1024 + ${toString extraSpace})) $out
+ tar -c . | singularity import $out
+ '');
+
+ in result;
+}
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index d6f390ddfb1..1529869aa33 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -108,8 +108,9 @@ rec {
# Quickly create a set of symlinks to derivations.
# entries is a list of attribute sets like { name = "name" ; path = "/nix/store/..."; }
- linkFarm = name: entries: runCommand name {} ("mkdir -p $out; cd $out; \n" +
- (lib.concatMapStrings (x: "ln -s '${x.path}' '${x.name}';\n") entries));
+ linkFarm = name: entries: runCommand name { preferLocalBuild = true; }
+ ("mkdir -p $out; cd $out; \n" +
+ (lib.concatMapStrings (x: "ln -s '${x.path}' '${x.name}';\n") entries));
# Print an error message if the file with the specified name and
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 0661e6e1257..f739479ac0a 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
};
makeFlags = [ "MANDIR=$(out)/share/man" ];
+ postInstall = ''
+ # conflict with shadow-utils
+ rm $out/share/man/man5/passwd.5 \
+ $out/share/man/man3/getspnam.3
+ '';
outputDocdev = "out";
meta = with stdenv.lib; {
diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix
index 4fae5378463..e14505f61bd 100644
--- a/pkgs/data/fonts/fira-code/default.nix
+++ b/pkgs/data/fonts/fira-code/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "fira-code-${version}";
- version = "1.203";
+ version = "1.204";
src = fetchurl {
url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode_${version}.zip";
- sha256 = "0pjziaklmkpl67ybp45q9ndya5adf9x8svhdv9643dq9jsrxbkj1";
+ sha256 = "17wky221b3igrqhmxgmqiyv1xdfn0nw471vzhpkrvv1w2w1w1k18";
};
sourceRoot = "otf";
diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix
new file mode 100644
index 00000000000..df96241542d
--- /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/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix
index ee637f880ad..fd3425e3c7c 100644
--- a/pkgs/data/fonts/google-fonts/default.nix
+++ b/pkgs/data/fonts/google-fonts/default.nix
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
ofl/mrbedford \
ofl/siamreap \
ofl/terminaldosislight
+
+ if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then
+ echo "error: duplicate font names"
+ exit 1
+ fi
'';
installPhase = ''
diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix
index c8f7717103b..7650c13961e 100644
--- a/pkgs/data/fonts/pecita/default.nix
+++ b/pkgs/data/fonts/pecita/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "pecita-${version}";
- version = "5.3";
+ version = "5.4";
src = fetchurl {
url = "http://archive.rycee.net/pecita/${name}.tar.xz";
- sha256 = "1glr21gi1b9db17ln8qn4zk9gwpxs0frm76i4hp3anlpivbwiis8";
+ sha256 = "1cqzj558ldzzsbfbvlwp5fjh2gxa03l16dki0n8z5lmrdq8hrkws";
};
phases = ["unpackPhase" "installPhase"];
diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/data/fonts/roboto/default.nix
index 711cca5b164..e0d2545973b 100644
--- a/pkgs/data/fonts/roboto/default.nix
+++ b/pkgs/data/fonts/roboto/default.nix
@@ -2,18 +2,18 @@
stdenv.mkDerivation rec {
name = "roboto-${version}";
- version = "2.134";
+ version = "2.135";
src = fetchurl {
url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip";
- sha256 = "1l033xc2n4754gwakxshh5235cnrnzy7q6zsp5zghn8ib0gdp5rb";
+ sha256 = "1ndlh36bcx4mhi58sxfx6ywbib586brh6s5sk3jyji78h1i7j8zr";
};
nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $out/share/fonts/truetype
- cp -a * $out/share/fonts/truetype/
+ cp -a *.ttf $out/share/fonts/truetype/
'';
meta = {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
Material Design.
'';
license = stdenv.lib.licenses.asl20;
- maintainers = [ stdenv.lib.maintainers.romildo ];
platforms = stdenv.lib.platforms.all;
+ maintainers = [ stdenv.lib.maintainers.romildo ];
};
}
diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix
new file mode 100644
index 00000000000..e9adc4c0422
--- /dev/null
+++ b/pkgs/data/fonts/terminus-font-ttf/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+ name = "terminus-font-ttf-${version}";
+ version = "4.40.1";
+
+ src = fetchurl {
+ url = "http://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip";
+ sha256 = "c3cb690c2935123035a0b1f3bfdd9511c282dab489cd423e161a47c592edf188";
+ };
+
+ buildInputs = [unzip];
+
+ installPhase = ''
+ for i in *.ttf; do
+ local destname="$(echo "$i" | sed -E 's|-[[:digit:].]+\.ttf$|.ttf|')"
+ install -Dm 644 "$i" "$out/share/fonts/truetype/$destname"
+ done
+
+ install -Dm 644 COPYING "$out/share/doc/COPYING"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A clean fixed width TTF font";
+ longDescription = ''
+ Monospaced bitmap font designed for long work with computers
+ (TTF version, mainly for Java applications)
+ '';
+ homepage = http://files.ax86.net/terminus-ttf;
+ license = licenses.ofl;
+ maintainers = with maintainers; [ okasu ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix
new file mode 100644
index 00000000000..d318f5db7a7
--- /dev/null
+++ b/pkgs/data/fonts/unscii/default.nix
@@ -0,0 +1,36 @@
+{stdenv, fetchurl, perl, bdftopcf, perlPackages, fontforge, SDL, SDL_image}:
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "unscii";
+ version = "1.1";
+ # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
+ src = fetchurl {
+ url = "http://pelulamu.net/${pname}/${name}-src.tar.gz";
+ sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1";
+ };
+ buildInputs = [];
+ nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge
+ SDL SDL_image];
+ preConfigure = ''
+ patchShebangs .
+ '';
+ installPhase = ''
+ mkdir -p "$out/share/fonts"/{truetype,opentype,web,svg}
+ cp *.hex "$out/share/fonts/"
+ cp *.pcf "$out/share/fonts/"
+ cp *.ttf "$out/share/fonts/truetype"
+ cp *.otf "$out/share/fonts/opentype"
+ cp *.svg "$out/share/fonts/svg"
+ cp *.woff "$out/share/fonts/web"
+ '';
+ meta = {
+ inherit version;
+ description = ''Bitmapped character-art-friendly Unicode fonts'';
+ # Basically GPL2+ with font exception — because of the Unifont-augmented
+ # version. The reduced version is public domain.
+ license = http://unifoundry.com/LICENSE.txt;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ homepage = "http://pelulamu.net/unscii/";
+ };
+}
diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix
index 773aa74ce39..12f8c1c741e 100644
--- a/pkgs/data/fonts/xits-math/default.nix
+++ b/pkgs/data/fonts/xits-math/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, python2Packages, fontforge }:
stdenv.mkDerivation rec {
name = "xits-math-${version}";
@@ -11,7 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "08nn676c41a7gmmhrzi8mm0g74z8aiaafjk48pqcwxvjj9av7xjg";
};
- phases = [ "unpackPhase" "installPhase" ];
+ nativeBuildInputs = [ fontforge ] ++ (with python2Packages; [ python fonttools ]);
+
+ postPatch = ''
+ rm *.otf
+ '';
installPhase = ''
mkdir -p $out/share/fonts/opentype
@@ -19,7 +23,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = https://github.com/khaledhosny/xits-math;
+ homepage = "https://github.com/khaledhosny/xits-math";
description = "OpenType implementation of STIX fonts with math support";
license = licenses.ofl;
platforms = platforms.all;
diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix
index 760329a94bf..91e379de223 100644
--- a/pkgs/data/icons/arc-icon-theme/default.nix
+++ b/pkgs/data/icons/arc-icon-theme/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${package-name}-${version}";
package-name = "arc-icon-theme";
- version = "2016-07-07";
+ version = "2016-11-22";
src = fetchFromGitHub {
owner = "horst3180";
repo = package-name;
- rev = "664c05e723ac2971feb123d7baca3d298248e7f9";
- sha256 = "10vicnrv2v7y4capvllaz9x3nzjkjj9fs1dspjjjg6if3gcif7m4";
+ rev = "55a575386a412544c3ed2b5617a61f842ee4ec15";
+ sha256 = "1ch3hp08qri93510hypzz6m2x4xgg2h15wvnhjwh1x1s1b7jvxjd";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix
index b15e8dea5bc..008a4112531 100644
--- a/pkgs/data/icons/elementary-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-icon-theme/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- version = "4.0.1";
+ version = "4.0.1.1";
package-name = "elementary-icon-theme";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://launchpad.net/elementaryicons/4.x/${version}/+download/${name}.tar.xz";
- sha256 = "0cbgbd9fqxk6rbsrj0gbh1rcapkkdlaig79kilq798v94jfdskrl";
+ sha256 = "1p20569lxgkif4gzvgpisd8vg93zxd6447y634lv7ay85nq4lx76";
};
dontBuild = true;
diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index 5c7464098ad..33734e15c9c 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, numix-icon-theme }:
stdenv.mkDerivation rec {
- version = "2016-09-27";
+ version = "2016-11-10";
package-name = "numix-icon-theme-circle";
-
+
name = "${package-name}-${version}";
src = fetchFromGitHub {
owner = "numixproject";
repo = package-name;
- rev = "481bc1100f01e25e92deb7facf61436b27f9ca8a";
- sha256 = "0fkr7w6z6sz5yblgshr3qr2bszia6dsjszv3gmcbi2xqvjjd8wij";
+ rev = "ba72743b0ee78cf56585bb498eb59e83d0de17a2";
+ sha256 = "0zyvcpa8d8jc7r08chhv0chp7z29w6ir9hkgm9aq23aa80i6pdgv";
};
buildInputs = [ numix-icon-theme ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
install -dm 755 $out/share/icons
cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/share/icons/
'';
-
+
meta = with stdenv.lib; {
description = "Numix icon theme (circle version)";
homepage = https://numixproject.org;
diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
new file mode 100644
index 00000000000..4485351b9c3
--- /dev/null
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, numix-icon-theme }:
+
+stdenv.mkDerivation rec {
+ version = "2016-11-23";
+
+ package-name = "numix-icon-theme-square";
+
+ name = "${package-name}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "numixproject";
+ repo = package-name;
+ rev = "1c30eb02aea3d95c49f95c212702b56e93ac9043";
+ sha256 = "1d2car4dsh1dnim9jlakm035ydqd1f115cagm6zm8gwa5w9annag";
+ };
+
+ buildInputs = [ numix-icon-theme ];
+
+ dontBuild = true;
+
+ installPhase = ''
+ mkdir -p $out/share/icons
+ cp -a Numix-Square{,-Light} $out/share/icons/
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Numix icon theme (square version)";
+ homepage = https://numixproject.org;
+ license = licenses.gpl3;
+ platforms = with platforms; allBut darwin;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index be224f418e8..8732172ead4 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- version = "2016-10-05";
+ version = "2016-11-13";
package-name = "numix-icon-theme";
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "numixproject";
repo = package-name;
- rev = "e03eb71454c176a98733eafa268ff79995f8159d";
- sha256 = "1f8prwq9zvzfk0ncwzbrwkpjggc8nadny81dqv1cr0014jc85bxi";
+ rev = "45878a1195abd997341c91d51381625644f9a356";
+ sha256 = "0in7vx8mdwbfkgylh9p95kcsnn7dnv2vpmv788n0bbgldxmrldga";
};
dontBuild = true;
diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix
index 4baaca194bf..13adb7efaaf 100644
--- a/pkgs/data/icons/paper-icon-theme/default.nix
+++ b/pkgs/data/icons/paper-icon-theme/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${package-name}-${version}";
package-name = "paper-icon-theme";
- version = "2016-06-08";
+ version = "2016-11-05";
src = fetchFromGitHub {
owner = "snwh";
repo = package-name;
- rev = "6aa0a2c8d802199d0a9f71579f136bd6476d5d8e";
- sha256 = "07ak1lnvd0gwaclkcvccjbxikh701vfi07gmjp4zcqi6b5crl7f5";
+ rev = "2a1f25a47fe8fb92e9d4db5537bbddb539586602";
+ sha256 = "0v956wrfraaj5qznz86q7s3zi55xd3gxmg7pzcfsw2ghgfv13swd";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/data/misc/adapta-backgrounds/default.nix b/pkgs/data/misc/adapta-backgrounds/default.nix
new file mode 100644
index 00000000000..72ee323030a
--- /dev/null
+++ b/pkgs/data/misc/adapta-backgrounds/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+ name = "adapta-backgrounds-${version}";
+ version = "0.4.0.6";
+
+ src = fetchFromGitHub {
+ owner = "adapta-project";
+ repo = "adapta-backgrounds";
+ rev = version;
+ sha256 = "1yqxrwhjl6g92wm52kalbns41i2l5g45qbd4185b22crhbrn5x79";
+ };
+
+ nativeBuildInputs = [ autoreconfHook ];
+
+ meta = with stdenv.lib; {
+ description = "A wallpaper collection for adapta-project";
+ homepage = https://github.com/adapta-project/adapta-backgrounds;
+ license = with licenses; [ gpl2 cc-by-sa-30 ];
+ platforms = platforms.all;
+ maintainers = [ maintainers.romildo ];
+ };
+}
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index 8df9b48a8bf..45e547f4a22 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "efl-${version}";
- version = "1.18.2";
+ version = "1.18.4";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
- sha256 = "1vbvsrrpkvvrmvjavwnp5q77kw5i7vmbaj2vq5mnmrbzamvaybr9";
+ sha256 = "09c0ajszjarcs6d62zlgnf1aha2f921mfr0gxg6nwza36xzc1srr";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index e3d676fd4f6..b16b10952a2 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -4,11 +4,11 @@ mesa_glu , xkeyboard_config }:
stdenv.mkDerivation rec {
name = "enlightenment-${version}";
- version = "0.21.3";
+ version = "0.21.5";
src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
- sha256 = "1ljzcq775njhbcaj8vdnypf2rgc6yqqdwfkf7c22603qvv9if1dr";
+ sha256 = "1fslq70z4s6v9ipahnk8s5fgqnqq4njv4rlqv951r1bh1xk5lx7h";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
new file mode 100644
index 00000000000..36608f4294b
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, glib, gnome2, dbus_glib, gmime, libnotify, libgnome_keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor_icon_theme, tango-icon-theme }:
+
+stdenv.mkDerivation rec {
+ rev = "9ae8768";
+ version = "5.4";
+ name = "mail-notification-${version}";
+
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "epienbroek";
+ repo = "mail-notification";
+ sha256 = "1slb7gajn30vdaq0hf5rikwdly1npmg1cf83hpjs82xd98knl13d";
+ };
+
+ buildInputs = [ pkgconfig glib dbus_glib gmime libnotify libgnome_keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus_glib gmime libnotify gnome2.gnome_keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor_icon_theme tango-icon-theme ];
+
+ prePatch = ''
+ sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c
+
+ # currently disable the check for missing sheme until a better solution
+ # is found; needed, because otherwise the application doesn't even start
+ # and fails saying it unable to find gconf scheme values.
+ sed -i -e 's/(schema_missing)/(!schema_missing)/g' src/mn-conf.c
+ '';
+
+ patches = [
+ ./patches/mail-notification-dont-link-against-bsd-compat.patch
+ ];
+
+ patchFlags = "-p0";
+ NIX_CFLAGS_COMPILE = "-Wno-error";
+
+ preConfigure = "./jb configure prefix=$out";
+
+ postConfigure = ''
+ substituteInPlace build/config \
+ --replace "omf-dir|string|1|${gnome2.scrollkeeper}/share/omf" "omf-dir|string|1|$out/share/omf" \
+ --replace "scrollkeeper-dir|string|1|${gnome2.scrollkeeper}/var/lib/scrollkeeper" "omf-dir|string|1|$out/var/lib/scrollkeeper" \
+ '';
+
+ buildPhase = "./jb build";
+ installPhase = "./jb install";
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "Tray status icon, which notifies us when new email arrives";
+ homepage = "http://www.nongnu.org/mailnotify/";
+ license = with licenses; [ gpl3 ];
+ platforms = platforms.unix;
+ maintainers = [ maintainers.eleanor ];
+ };
+}
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-dont-link-against-bsd-compat.patch b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-dont-link-against-bsd-compat.patch
new file mode 100644
index 00000000000..e246a8cc938
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-dont-link-against-bsd-compat.patch
@@ -0,0 +1,10 @@
+--- jbsrc/jb.c.orig 2014-01-19 20:06:48.525462981 +0100
++++ jbsrc/jb.c 2014-01-19 20:07:36.087934897 +0100
+@@ -425,7 +425,6 @@
+ */
+ jb_compile_options_add_cflags(object->compile_options, "-std=c99");
+ jb_compile_options_add_cppflags(object->compile_options, "-D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L");
+- jb_compile_options_add_libs(object->compile_options, "-lbsd-compat");
+ }
+
+ jb_compile_options_add_string_defines(object->compile_options,
diff --git a/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix
index cc31c7e7b97..e472014e38f 100644
--- a/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix
@@ -2,7 +2,7 @@
, bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool
, webkitgtk214x, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit
, sqlite, gcr, avahi, nss, isocodes, itstool, file, which
-, gdk_pixbuf, librsvg, gnome_common }:
+, gdk_pixbuf, librsvg, gnome_common, gst_all_1 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@@ -19,7 +19,9 @@ stdenv.mkDerivation rec {
sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common
gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf
- gnome3.glib_networking ];
+ gnome3.glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
+ gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
+ gst_all_1.gst-libav];
NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix
index 23cdf41d5c0..3df800f402d 100644
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
homepage = https://wiki.gnome.org/action/show/Apps/Calculator;
description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment";
maintainers = gnome3.maintainers;
- license = licenses.gpl2;
+ license = licenses.gpl3;
platforms = platforms.linux;
};
}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix
index 78fc82ebaed..726f47d0cde 100644
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
gnome3.vino udev libcanberra_gtk3 libgudev
- networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo ];
+ networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo tracker ];
preBuild = ''
substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
diff --git a/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix b/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix
index 467bb13a74e..5592e3bd7f8 100644
--- a/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix
@@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
- name = "nautilus-3.20.2";
+ name = "nautilus-3.20.3";
src = fetchurl {
- url = mirror://gnome/sources/nautilus/3.20/nautilus-3.20.2.tar.xz;
- sha256 = "8d6e679b880dc78c0c2e2dabf6025e6da34ff279dee501f7c75f3649c1a6caae";
+ url = mirror://gnome/sources/nautilus/3.20/nautilus-3.20.3.tar.xz;
+ sha256 = "46600a2361a022a0170304aef7167caa29c0d52232063a3556bec6a77881310e";
};
}
diff --git a/pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix
index 3cb62fef6c2..6a50834f105 100644
--- a/pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
- itstool, python, makeWrapper }:
+ itstool, python2, makeWrapper }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
- gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper
+ gnome3.libgda gnome3.gtksourceview intltool itstool python2 makeWrapper
gnome3.gsettings_desktop_schemas
];
diff --git a/pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix
index 1cfae754cfe..f6e67be8d53 100644
--- a/pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, webkitgtk, intltool }:
+, webkitgtk, intltool, gsettings_desktop_schemas }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
buildInputs = [
pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme
+ gsettings_desktop_schemas
];
meta = with stdenv.lib; {
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 1927585fd32..a827831c801 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/gnome-3/3.22/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix
index 9d36648d5cd..015f8213b44 100644
--- a/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix
@@ -2,7 +2,7 @@
, bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool
, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit
, sqlite, gcr, avahi, nss, isocodes, itstool, file, which
-, gdk_pixbuf, librsvg, gnome_common }:
+, gdk_pixbuf, librsvg, gnome_common, gst_all_1 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@@ -19,7 +19,9 @@ stdenv.mkDerivation rec {
sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common
gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf
- gnome3.glib_networking ];
+ gnome3.glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
+ gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
+ gst_all_1.gst-libav];
NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix
index e1b81339e91..0a177fbab31 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
homepage = https://wiki.gnome.org/action/show/Apps/Calculator;
description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment";
maintainers = gnome3.maintainers;
- license = licenses.gpl2;
+ license = licenses.gpl3;
platforms = platforms.linux;
};
}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
index 78fc82ebaed..17a4514d6f8 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality
accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile
- shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
+ shared_mime_info icu libtool docbook_xsl docbook_xsl_ns
gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
gnome3.vino udev libcanberra_gtk3 libgudev
- networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo ];
+ networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo tracker ];
preBuild = ''
substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix
index 3cb62fef6c2..6a50834f105 100644
--- a/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
- itstool, python, makeWrapper }:
+ itstool, python2, makeWrapper }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
- gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper
+ gnome3.libgda gnome3.gtksourceview intltool itstool python2 makeWrapper
gnome3.gsettings_desktop_schemas
];
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix
index 1cfae754cfe..f6e67be8d53 100644
--- a/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, webkitgtk, intltool }:
+, webkitgtk, intltool, gsettings_desktop_schemas }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
buildInputs = [
pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme
+ gsettings_desktop_schemas
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix
index 0b670ec9f65..c55650e705a 100644
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
homepage = https://wiki.gnome.org/Apps/Mines;
description = "Clear hidden mines from a minefield";
maintainers = gnome3.maintainers;
- license = licenses.gpl2;
+ license = licenses.gpl3;
platforms = platforms.linux;
};
}
diff --git a/pkgs/desktops/kde-5/applications/akonadi-contacts.nix b/pkgs/desktops/kde-5/applications/akonadi-contacts.nix
new file mode 100644
index 00000000000..7acfa3a230b
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications/akonadi-contacts.nix
@@ -0,0 +1,19 @@
+{
+ kdeApp, lib,
+ ecm,
+ akonadi-mime, grantlee, kcontacts, kio, kitemmodels, kmime, qtwebengine,
+ akonadi
+}:
+
+kdeApp {
+ name = "akonadi-contacts";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 ];
+ maintainers = [ lib.maintainers.ttuegel ];
+ };
+ nativeBuildInputs = [ ecm ];
+ buildInputs = [
+ akonadi-mime grantlee kcontacts kio kitemmodels kmime qtwebengine
+ ];
+ propagatedBuildInputs = [ akonadi ];
+}
diff --git a/pkgs/desktops/kde-5/applications/akonadi-mime.nix b/pkgs/desktops/kde-5/applications/akonadi-mime.nix
new file mode 100644
index 00000000000..26e1559c779
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications/akonadi-mime.nix
@@ -0,0 +1,15 @@
+{
+ kdeApp, lib,
+ ecm,
+ akonadi, kdbusaddons, kio, kitemmodels, kmime
+}:
+
+kdeApp {
+ name = "akonadi-mime";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 ];
+ maintainers = [ lib.maintainers.ttuegel ];
+ };
+ nativeBuildInputs = [ ecm ];
+ buildInputs = [ akonadi kdbusaddons kio kitemmodels kmime ];
+}
diff --git a/pkgs/desktops/kde-5/applications/akonadi.nix b/pkgs/desktops/kde-5/applications/akonadi.nix
new file mode 100644
index 00000000000..03483e5ec0d
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications/akonadi.nix
@@ -0,0 +1,20 @@
+{
+ kdeApp, lib,
+ ecm,
+ kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes,
+ kio,
+ boost, kitemmodels
+}:
+
+kdeApp {
+ name = "akonadi";
+ meta = {
+ license = [ lib.licenses.lgpl21 ];
+ maintainers = [ lib.maintainers.ttuegel ];
+ };
+ nativeBuildInputs = [ ecm ];
+ buildInputs = [
+ kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio
+ ];
+ propagatedBuildInputs = [ boost kitemmodels ];
+}
diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix
index 942bd5eb977..db255a1d5b7 100644
--- a/pkgs/desktops/kde-5/applications/default.nix
+++ b/pkgs/desktops/kde-5/applications/default.nix
@@ -31,6 +31,9 @@ let
inherit (pkgs) attica phonon;
};
+ akonadi = callPackage ./akonadi.nix {};
+ akonadi-contacts = callPackage ./akonadi-contacts.nix {};
+ akonadi-mime = callPackage ./akonadi-mime.nix {};
ark = callPackage ./ark/default.nix {};
baloo-widgets = callPackage ./baloo-widgets.nix {};
dolphin = callPackage ./dolphin.nix {};
@@ -39,18 +42,20 @@ let
ffmpeg = pkgs.ffmpeg_2;
};
filelight = callPackage ./filelight.nix {};
- gpgmepp = callPackage ./gpgmepp.nix {};
gwenview = callPackage ./gwenview.nix {};
kate = callPackage ./kate.nix {};
kdenlive = callPackage ./kdenlive.nix {};
kcalc = callPackage ./kcalc.nix {};
kcolorchooser = callPackage ./kcolorchooser.nix {};
+ kcontacts = callPackage ./kcontacts.nix {};
+ kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
kdf = callPackage ./kdf.nix {};
- kgpg = callPackage ./kgpg.nix { inherit (pkgs.kde4) kdepimlibs; };
+ kgpg = callPackage ./kgpg.nix {};
khelpcenter = callPackage ./khelpcenter.nix {};
kio-extras = callPackage ./kio-extras.nix {};
+ kmime = callPackage ./kmime.nix {};
kompare = callPackage ./kompare.nix {};
konsole = callPackage ./konsole.nix {};
kwalletmanager = callPackage ./kwalletmanager.nix {};
@@ -67,6 +72,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/applications/fetch.sh b/pkgs/desktops/kde-5/applications/fetch.sh
index 666acf1a8cb..eb1b1654bb8 100644
--- a/pkgs/desktops/kde-5/applications/fetch.sh
+++ b/pkgs/desktops/kde-5/applications/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://ftp.ussg.iu.edu/kde/stable/applications/16.08.2/ --cut-dirs=1 -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/applications/16.12.0/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/kde-5/applications/kcontacts.nix b/pkgs/desktops/kde-5/applications/kcontacts.nix
new file mode 100644
index 00000000000..441d73d363d
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications/kcontacts.nix
@@ -0,0 +1,15 @@
+{
+ kdeApp, lib,
+ ecm, ki18n,
+ kcoreaddons, kconfig, kcodecs
+}:
+
+kdeApp {
+ name = "kcontacts";
+ meta = {
+ license = [ lib.licenses.lgpl21 ];
+ maintainers = [ lib.maintainers.ttuegel ];
+ };
+ nativeBuildInputs = [ ecm ki18n ];
+ buildInputs = [ kcoreaddons kconfig kcodecs ];
+}
diff --git a/pkgs/desktops/kde-5/applications/gpgmepp.nix b/pkgs/desktops/kde-5/applications/kdegraphics-mobipocket.nix
similarity index 50%
rename from pkgs/desktops/kde-5/applications/gpgmepp.nix
rename to pkgs/desktops/kde-5/applications/kdegraphics-mobipocket.nix
index 0e5cb15029c..984524dc1b2 100644
--- a/pkgs/desktops/kde-5/applications/gpgmepp.nix
+++ b/pkgs/desktops/kde-5/applications/kdegraphics-mobipocket.nix
@@ -1,15 +1,15 @@
{
kdeApp, lib,
ecm,
- boost, gpgme
+ kio
}:
kdeApp {
- name = "gpgmepp";
+ name = "kdegraphics-mobipocket";
meta = {
- license = with lib.licenses; [ lgpl21 bsd3 ];
+ license = [ lib.licenses.gpl2Plus ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ ecm ];
- propagatedBuildInputs = [ boost gpgme ];
+ buildInputs = [ kio ];
}
diff --git a/pkgs/desktops/kde-5/applications/kgpg.nix b/pkgs/desktops/kde-5/applications/kgpg.nix
index 6717dc1511d..cd462acdf2b 100644
--- a/pkgs/desktops/kde-5/applications/kgpg.nix
+++ b/pkgs/desktops/kde-5/applications/kgpg.nix
@@ -1,17 +1,19 @@
{
kdeApp, lib,
- automoc4, cmake, makeWrapper, perl, pkgconfig,
- boost, gpgme, kdelibs, kdepimlibs, gnupg
+ ecm, kdoctools, ki18n,
+ akonadi-contacts, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash,
+ kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
+ ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem
}:
kdeApp {
name = "kgpg";
- nativeBuildInputs = [ automoc4 cmake makeWrapper perl pkgconfig ];
- buildInputs = [ boost gpgme kdelibs kdepimlibs ];
- postInstall = ''
- wrapProgram "$out/bin/kgpg" \
- --prefix PATH : "${gnupg}/bin"
- '';
+ nativeBuildInputs = [ ecm kdoctools ki18n ];
+ buildInputs = [
+ akonadi-contacts gpgme karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons
+ kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui
+ kwidgetsaddons kwindowsystem
+ ];
meta = {
license = [ lib.licenses.gpl2 ];
maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/desktops/kde-5/applications/kmime.nix b/pkgs/desktops/kde-5/applications/kmime.nix
new file mode 100644
index 00000000000..d60909ec7bc
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications/kmime.nix
@@ -0,0 +1,15 @@
+{
+ kdeApp, lib,
+ ecm, ki18n,
+ kcodecs
+}:
+
+kdeApp {
+ name = "kmime";
+ meta = {
+ license = [ lib.licenses.lgpl21 ];
+ maintainers = [ lib.maintainers.ttuegel ];
+ };
+ nativeBuildInputs = [ ecm ki18n ];
+ buildInputs = [ kcodecs ];
+}
diff --git a/pkgs/desktops/kde-5/applications/l10n.nix b/pkgs/desktops/kde-5/applications/l10n.nix
index 9b211faf444..f2e5f843b5d 100644
--- a/pkgs/desktops/kde-5/applications/l10n.nix
+++ b/pkgs/desktops/kde-5/applications/l10n.nix
@@ -205,7 +205,7 @@ lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) {
}) {};
qt5 = callPackage (kdeLocale5 "sr" {
preConfigure = ''
- patchShebangs 5/sr/data/resolve-sr-hybrid
+ patchShebangs 5/sr/cmake_modules/resolve-sr-hybrid
sed -e 's/add_subdirectory(kdesdk)//' -i 5/sr/data/CMakeLists.txt
'';
}) {};
@@ -222,13 +222,10 @@ lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) {
qt4 = callPackage (kdeLocale4 "ug" {}) {};
qt5 = callPackage (kdeLocale5 "ug" {}) {};
};
- # TODO: build broken in 15.11.80; re-enable in next release
- /*
uk = {
qt4 = callPackage (kdeLocale4 "uk" {}) {};
qt5 = callPackage (kdeLocale5 "uk" {}) {};
};
- */
wa = {
qt4 = callPackage (kdeLocale4 "wa" {}) {};
qt5 = callPackage (kdeLocale5 "wa" {}) {};
diff --git a/pkgs/desktops/kde-5/applications/okular.nix b/pkgs/desktops/kde-5/applications/okular.nix
index 6e6f1407c55..b8780a7ccc1 100644
--- a/pkgs/desktops/kde-5/applications/okular.nix
+++ b/pkgs/desktops/kde-5/applications/okular.nix
@@ -1,21 +1,30 @@
{
- kdeApp, lib,
- automoc4, cmake, perl, pkgconfig, kdelibs, qimageblitz,
- poppler_qt4, libspectre, libkexiv2, djvulibre, libtiff, freetype,
- ebook_tools
+ kdeApp, lib, kdeWrapper,
+ ecm, kdoctools,
+ djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion,
+ kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket,
+ kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2,
+ libspectre, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver
}:
-kdeApp {
- name = "okular";
- nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
- buildInputs = [
- kdelibs qimageblitz poppler_qt4 libspectre libkexiv2 djvulibre libtiff
- freetype ebook_tools
- ];
- meta = {
- platforms = lib.platforms.linux;
- homepage = "http://www.kde.org";
- license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
- maintainers = [ lib.maintainers.ttuegel ];
+let
+ unwrapped = kdeApp {
+ name = "okular";
+ nativeBuildInputs = [ ecm kdoctools ];
+ buildInputs = [
+ djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig
+ kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes
+ kjs khtml kio kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler
+ qca-qt5 qtdeclarative qtsvg threadweaver
+ ];
+ meta = {
+ platforms = lib.platforms.linux;
+ homepage = "http://www.kde.org";
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
+ maintainers = [ lib.maintainers.ttuegel ];
+ };
};
+in
+kdeWrapper unwrapped {
+ targets = [ "bin/okular" ];
}
diff --git a/pkgs/desktops/kde-5/applications/srcs.nix b/pkgs/desktops/kde-5/applications/srcs.nix
index a8c984ad645..ae014032851 100644
--- a/pkgs/desktops/kde-5/applications/srcs.nix
+++ b/pkgs/desktops/kde-5/applications/srcs.nix
@@ -3,2067 +3,2227 @@
{
akonadi = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/akonadi-16.08.2.tar.xz";
- sha256 = "141da3xj9d5gwksh9lz93s4zsvpadf314345ai6lirhhi99683g6";
- name = "akonadi-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/akonadi-16.12.0.tar.xz";
+ sha256 = "1gqjaxq8b3mcwjm28aqc9kss4p46hga252j27vsg85pzvw58q718";
+ name = "akonadi-16.12.0.tar.xz";
};
};
akonadi-calendar = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/akonadi-calendar-16.08.2.tar.xz";
- sha256 = "0jpmh5051mxcndaf1clldz7zzfhfyi8qxz87lj20s0d4gzrf6cpw";
- name = "akonadi-calendar-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/akonadi-calendar-16.12.0.tar.xz";
+ sha256 = "1y6yg4f9ayl0il074fln2496pfh6jdsr489yh25jjcs8wf52669h";
+ name = "akonadi-calendar-16.12.0.tar.xz";
+ };
+ };
+ akonadi-calendar-tools = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/akonadi-calendar-tools-16.12.0.tar.xz";
+ sha256 = "0wwchjf2pisbj5hp9hfs8m2bhxgzkxf6c0rj8zv5p66lcl964iad";
+ name = "akonadi-calendar-tools-16.12.0.tar.xz";
+ };
+ };
+ akonadiconsole = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/akonadiconsole-16.12.0.tar.xz";
+ sha256 = "033rx5nqkwyrshacm3bykd8w2c2dffx6wfhm26l7siicaa6kani6";
+ name = "akonadiconsole-16.12.0.tar.xz";
};
};
akonadi-contacts = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/akonadi-contacts-16.08.2.tar.xz";
- sha256 = "0d3cjyq4i778zvy13wm2gfpzkibsr17wgxydqm5ac5wkl30wb07l";
- name = "akonadi-contacts-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/akonadi-contacts-16.12.0.tar.xz";
+ sha256 = "1imiv3w78gsk33yiwpkrfzgdlcyqwrzmjid6wwbxjh52rawjvvzc";
+ name = "akonadi-contacts-16.12.0.tar.xz";
+ };
+ };
+ akonadi-import-wizard = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/akonadi-import-wizard-16.12.0.tar.xz";
+ sha256 = "1nz7ca3457cmlrvmk33hphlm3q2fq3qcq36rmandsv5n1jplfcf5";
+ name = "akonadi-import-wizard-16.12.0.tar.xz";
};
};
akonadi-mime = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/akonadi-mime-16.08.2.tar.xz";
- sha256 = "0q1g6g1dyj82ya8dfnq87asx9qnmqypsmb873y20i8x3pkzjwzld";
- name = "akonadi-mime-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/akonadi-mime-16.12.0.tar.xz";
+ sha256 = "06547ixg4054lm8clyfsmkmwc8zai3w9swyw7hyjz257fd0147dr";
+ name = "akonadi-mime-16.12.0.tar.xz";
};
};
akonadi-notes = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/akonadi-notes-16.08.2.tar.xz";
- sha256 = "0ryw21y25iq28rn75gibfxlwgyx0fz1y37lkgnqfcl3mwj16gcb4";
- name = "akonadi-notes-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/akonadi-notes-16.12.0.tar.xz";
+ sha256 = "03cadn97fa1jkbpljk0764w8dwv5k1brm1iv554gmag0xky2a6in";
+ name = "akonadi-notes-16.12.0.tar.xz";
};
};
akonadi-search = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/akonadi-search-16.08.2.tar.xz";
- sha256 = "063y170nfdi279pbh9zdyhrga2hf0xsb20bn2p210vhmwhi7l51r";
- name = "akonadi-search-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/akonadi-search-16.12.0.tar.xz";
+ sha256 = "08y7rk9i30d3kg61xfzck0a78dyrgb6jzs3w4i7rxq28z374mi2m";
+ name = "akonadi-search-16.12.0.tar.xz";
+ };
+ };
+ akregator = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/akregator-16.12.0.tar.xz";
+ sha256 = "0ibls40w0wad1gkdj3djmmvdd89pia3fbykqfjwrvnxslr7zfvnl";
+ name = "akregator-16.12.0.tar.xz";
};
};
analitza = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/analitza-16.08.2.tar.xz";
- sha256 = "1rh58dfpnxyahpqz49p935pa01mxci9bbqddayv1807my2i5kz2h";
- name = "analitza-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/analitza-16.12.0.tar.xz";
+ sha256 = "1ws1whss7p5ijyaw7vs5lfvrisljk2b4m6iqbnr1v4n45cr27vrq";
+ name = "analitza-16.12.0.tar.xz";
};
};
ark = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ark-16.08.2.tar.xz";
- sha256 = "043nl64g6374diczkrq7prid4fr8ll625df2nhqnaz79fnh1ysv8";
- name = "ark-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ark-16.12.0.tar.xz";
+ sha256 = "0gg84p1qaamklgvyqw5pjcdm2934srkvclrvn07jdpcf8xirn51a";
+ name = "ark-16.12.0.tar.xz";
};
};
artikulate = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/artikulate-16.08.2.tar.xz";
- sha256 = "1pcpwqpd7xk796bc5gyydqqrvqm592jhyh8swvlsdqadczlqnn9h";
- name = "artikulate-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/artikulate-16.12.0.tar.xz";
+ sha256 = "1ahz3kypszfc5smzdblbr47yb320p4sc28frl7b5vvbx2mj77iyi";
+ name = "artikulate-16.12.0.tar.xz";
};
};
audiocd-kio = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/audiocd-kio-16.08.2.tar.xz";
- sha256 = "0m85j4lrdas47l501f20i44q7w7qwxvpdy754zp4nf5wzm7nvjdv";
- name = "audiocd-kio-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/audiocd-kio-16.12.0.tar.xz";
+ sha256 = "0hl5qiafp6yqi87qncp1kgd6178jn7bh2paz4fxyc4v92w2mzlcy";
+ name = "audiocd-kio-16.12.0.tar.xz";
};
};
baloo-widgets = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/baloo-widgets-16.08.2.tar.xz";
- sha256 = "1r784qd1j3y1ff6y494m8qyfdjsz626agwdj05h6igngvw1ywff2";
- name = "baloo-widgets-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/baloo-widgets-16.12.0.tar.xz";
+ sha256 = "06w0f54m9bw7640049gl10v6krdm5c0xlb6bjf61ay99mbyv7cgq";
+ name = "baloo-widgets-16.12.0.tar.xz";
};
};
blinken = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/blinken-16.08.2.tar.xz";
- sha256 = "0nqkw6abnzbx80d25ba0b6bix1ngr3wfrxlfjqdk4gmb1m34dkcm";
- name = "blinken-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/blinken-16.12.0.tar.xz";
+ sha256 = "0l3l3fjhsxm13m99mvcqgnyw0vmnjvx5akaa3nyx0mfzm1y1iw4v";
+ name = "blinken-16.12.0.tar.xz";
+ };
+ };
+ blogilo = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/blogilo-16.12.0.tar.xz";
+ sha256 = "0582dfznwvwc28zqzmbayypgy6kn2gq87q7j1y6q8m0lm017xgqy";
+ name = "blogilo-16.12.0.tar.xz";
};
};
bomber = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/bomber-16.08.2.tar.xz";
- sha256 = "1zcqxkfy57lw03v6fpf44asbdf8q9ivn323li9ks0kwzzc2nk7f9";
- name = "bomber-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/bomber-16.12.0.tar.xz";
+ sha256 = "0qxs0slw4q75bhakmp7di2izi3sz9niq7v0kjincis9vc2l13dd9";
+ name = "bomber-16.12.0.tar.xz";
};
};
bovo = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/bovo-16.08.2.tar.xz";
- sha256 = "0clbhcg6bw8nrjw3nynlhcglgxasxw2b15ski25cf9cvrq3cahn7";
- name = "bovo-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/bovo-16.12.0.tar.xz";
+ sha256 = "0cmxf4i5zpzc1lc9ggbvbd74i4ks29q915mygdam99b2bzfbq9qv";
+ name = "bovo-16.12.0.tar.xz";
};
};
calendarsupport = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/calendarsupport-16.08.2.tar.xz";
- sha256 = "1h9w8mk2gwnfbm9520bfmqbzjjg1211lpvzbq8ba4jg3l99d69j6";
- name = "calendarsupport-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/calendarsupport-16.12.0.tar.xz";
+ sha256 = "11jz7vl8ay4fkxifpyg4vpdw7cl9m8dj6bgbmfw8nhdf8v8m9i6v";
+ name = "calendarsupport-16.12.0.tar.xz";
};
};
cantor = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/cantor-16.08.2.tar.xz";
- sha256 = "1zi989fklw4qs0yj2zs0rpbaq1yfd9dax6ric376s2r85mrdfvjc";
- name = "cantor-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/cantor-16.12.0.tar.xz";
+ sha256 = "0k1ps1dxilikm1qnfpd0fmbxsrqi5mrf2wyl07b67a3sfl7bzw98";
+ name = "cantor-16.12.0.tar.xz";
};
};
cervisia = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/cervisia-16.08.2.tar.xz";
- sha256 = "1pnjiww36689vzqg8aixn8q7jf9j295i18gr8ggck80ccxrrf7rd";
- name = "cervisia-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/cervisia-16.12.0.tar.xz";
+ sha256 = "0c8g3l0q0inyggikqlz7spb32v26lz63ghs1m2cfjagvzisiylbg";
+ name = "cervisia-16.12.0.tar.xz";
};
};
dolphin = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/dolphin-16.08.2.tar.xz";
- sha256 = "1d6r7fi4cmdhxbrks8x0ar9s147zi4d6ap1pbxjmlxfa1v7jmmls";
- name = "dolphin-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/dolphin-16.12.0.tar.xz";
+ sha256 = "0dyzlpd7pj21jl4k5j6x6fbxzj7vlp7ww4z82rkld3x7kmmi4b4v";
+ name = "dolphin-16.12.0.tar.xz";
};
};
dolphin-plugins = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/dolphin-plugins-16.08.2.tar.xz";
- sha256 = "0cpcfgl77s02zi4hhsg9fnnmfrl0crk8vyacfis8j59zwcjf5n3d";
- name = "dolphin-plugins-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/dolphin-plugins-16.12.0.tar.xz";
+ sha256 = "0ab62pbvb6n47b86j1bdicahwqvcnv401872f5q08na1zybxklx3";
+ name = "dolphin-plugins-16.12.0.tar.xz";
};
};
dragon = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/dragon-16.08.2.tar.xz";
- sha256 = "0rv300ggjz4mclw5k406hjbg0a7jh5gkp9ycb897qaj4cfzw59x8";
- name = "dragon-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/dragon-16.12.0.tar.xz";
+ sha256 = "08sasdzd22l8mdzlb0jf780qcy374qg5ngispq78vn2x8zkyk3q2";
+ name = "dragon-16.12.0.tar.xz";
};
};
eventviews = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/eventviews-16.08.2.tar.xz";
- sha256 = "1mphb53nl2y8z42m47prh9nm6s42z2xcsk3c0ssk5glyq52g3z00";
- name = "eventviews-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/eventviews-16.12.0.tar.xz";
+ sha256 = "048sgmr3ws48xmfp1h6zyrizyigp2qqhiz3lrwla39iblxi0l4sf";
+ name = "eventviews-16.12.0.tar.xz";
};
};
ffmpegthumbs = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ffmpegthumbs-16.08.2.tar.xz";
- sha256 = "1q2gkbfy57r23k7wchlnxmcy0phw41rwz5hl7mi9hliz1dlvkhc0";
- name = "ffmpegthumbs-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ffmpegthumbs-16.12.0.tar.xz";
+ sha256 = "036py6cgkb7zismbffavk3jzjz2lzrh4jbknqrdrwli4fxsxbpi6";
+ name = "ffmpegthumbs-16.12.0.tar.xz";
};
};
filelight = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/filelight-16.08.2.tar.xz";
- sha256 = "0jw6vpd6nnn9fbmfcas5g938ir7q3sk5b0x6advspci0asngnins";
- name = "filelight-16.08.2.tar.xz";
- };
- };
- gpgmepp = {
- version = "16.08.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/gpgmepp-16.08.2.tar.xz";
- sha256 = "0828qlhdi1i26n2xgyb01c0q77m6jlppbxv6mprryxq0ma88940a";
- name = "gpgmepp-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/filelight-16.12.0.tar.xz";
+ sha256 = "05v0db9n6s3fxn31450biij0w0vf7s4bsvfbyiy3cnf33habgz4d";
+ name = "filelight-16.12.0.tar.xz";
};
};
granatier = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/granatier-16.08.2.tar.xz";
- sha256 = "0qx1rlgm9dznk387yv6ylvi2i97a652bi1nvr86syiwgydawb5ag";
- name = "granatier-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/granatier-16.12.0.tar.xz";
+ sha256 = "1hzqqsdq7xj7ackc11yn966cnns82200ff7yc1wiazgivg39l8wj";
+ name = "granatier-16.12.0.tar.xz";
+ };
+ };
+ grantlee-editor = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/grantlee-editor-16.12.0.tar.xz";
+ sha256 = "049fvgyri9bqm792gyyz6qx7mrriqb3gmdbd2i8zs0x1i1lxfbn7";
+ name = "grantlee-editor-16.12.0.tar.xz";
};
};
grantleetheme = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/grantleetheme-16.08.2.tar.xz";
- sha256 = "0mviqfbzd8jb8ni4maydcdni034p52wm2ndms0r5f4az5mq1vs8i";
- name = "grantleetheme-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/grantleetheme-16.12.0.tar.xz";
+ sha256 = "07i2vidzvh9z05iz8xs08w918x7917mckfm1w5agpi4ma8iz8g4b";
+ name = "grantleetheme-16.12.0.tar.xz";
};
};
gwenview = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/gwenview-16.08.2.tar.xz";
- sha256 = "0y2pk0a0wk2srfcyk401ymy2qmp413448r7larmgnw1yy0fbp8l2";
- name = "gwenview-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/gwenview-16.12.0.tar.xz";
+ sha256 = "0pqzqfb604qfcck2jml65aya6gyjqvx8gnl047mr04yd4x65mjnn";
+ name = "gwenview-16.12.0.tar.xz";
};
};
incidenceeditor = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/incidenceeditor-16.08.2.tar.xz";
- sha256 = "1z25z2pc3m6lnw3hpcjrrpj0f8jfbjav4i9kz6f97cs1rrklabym";
- name = "incidenceeditor-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/incidenceeditor-16.12.0.tar.xz";
+ sha256 = "1ylkxx7j2dsipcxrdj3cs142hjnz25c76q6jlpwj6p4vv7vzhvq9";
+ name = "incidenceeditor-16.12.0.tar.xz";
};
};
jovie = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/jovie-16.08.2.tar.xz";
- sha256 = "1iia5ja90ypid2mm59njr2jg4hlsqz727fipa1v88c5nx31fqn9s";
- name = "jovie-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/jovie-16.12.0.tar.xz";
+ sha256 = "0qm853z8g620klmcay955yfc76mb8ggfdx65zrhiiq5nkfaybwkr";
+ name = "jovie-16.12.0.tar.xz";
};
};
juk = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/juk-16.08.2.tar.xz";
- sha256 = "0l0scc3706ap2jfyvhv0shp3l5jw5r5jma1y6ikv0r85h9sxv6lw";
- name = "juk-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/juk-16.12.0.tar.xz";
+ sha256 = "05jk2gp9mcsjjdppahg3r70vjr203wf63mb5kqmdr98gfm9wfm74";
+ name = "juk-16.12.0.tar.xz";
};
};
kaccessible = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kaccessible-16.08.2.tar.xz";
- sha256 = "1j7zm4qk0sfax3h85mljrh40ys0snmilj5fqbqv5cad8kna3v3gg";
- name = "kaccessible-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kaccessible-16.12.0.tar.xz";
+ sha256 = "1mh3610my9l21cq1zyjfk991q1gi6mii0z83zwq83wyi146b42mx";
+ name = "kaccessible-16.12.0.tar.xz";
};
};
kaccounts-integration = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kaccounts-integration-16.08.2.tar.xz";
- sha256 = "03k7h6lg39d6yvmz6b1i9a4cfakfncr91iw5bvy47xf4myp16dkr";
- name = "kaccounts-integration-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kaccounts-integration-16.12.0.tar.xz";
+ sha256 = "14v3pifz0diz3dscbyl49bp4fm2ivwdwm6hhxycv69fd221wkx5x";
+ name = "kaccounts-integration-16.12.0.tar.xz";
};
};
kaccounts-providers = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kaccounts-providers-16.08.2.tar.xz";
- sha256 = "1lz3wx78h0kpc218ngrgqnws89ar1cpra0h7dywswvh3ndnd1iiz";
- name = "kaccounts-providers-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kaccounts-providers-16.12.0.tar.xz";
+ sha256 = "0fiq8zkaz3jyxnphi7z2r6q8xjsqlkzzjcs51akal5dm2cp1i6px";
+ name = "kaccounts-providers-16.12.0.tar.xz";
+ };
+ };
+ kaddressbook = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/kaddressbook-16.12.0.tar.xz";
+ sha256 = "11hnrf1cwjnjysx8wgwnkfj0vkfv7vgv4wdrllnxj5mpx8mcw3k7";
+ name = "kaddressbook-16.12.0.tar.xz";
};
};
kajongg = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kajongg-16.08.2.tar.xz";
- sha256 = "08wz24z1rdqz3vkg0vwfm2w6mjl8psbs1c13x4h3ia2l456b2y73";
- name = "kajongg-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kajongg-16.12.0.tar.xz";
+ sha256 = "1aymlzrw331z8ch46cwpv8x1v4j8ilhz42hzji1x06rh4s0xn5k6";
+ name = "kajongg-16.12.0.tar.xz";
+ };
+ };
+ kalarm = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/kalarm-16.12.0.tar.xz";
+ sha256 = "1kbrq5d854szx6nknyx2jbzmr47xajicaqgjfg59jwbb453mdbkm";
+ name = "kalarm-16.12.0.tar.xz";
};
};
kalarmcal = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kalarmcal-16.08.2.tar.xz";
- sha256 = "0h9xx2k78i0jyiqn4rcr79lcgqp7zsy980mbvv5zyddisjs5hd9x";
- name = "kalarmcal-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kalarmcal-16.12.0.tar.xz";
+ sha256 = "16qqk1wqyjxfjnz9jaihcj7mdn8iixvmcm1i0cjfpck0bja9sj0p";
+ name = "kalarmcal-16.12.0.tar.xz";
};
};
kalgebra = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kalgebra-16.08.2.tar.xz";
- sha256 = "02y4nrkf7dk8crmqdz7wg6gflm0zg3392m55zfsj6ad3vy78p1gg";
- name = "kalgebra-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kalgebra-16.12.0.tar.xz";
+ sha256 = "0av4k54cil7jl545q5m7klwvw586hcdfpnvq95bcng8is0bnfrgs";
+ name = "kalgebra-16.12.0.tar.xz";
};
};
kalzium = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kalzium-16.08.2.tar.xz";
- sha256 = "0jl77cr107gykfkdkxgnknlg1rhb9w6llwhva6863v57n6gq1hgh";
- name = "kalzium-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kalzium-16.12.0.tar.xz";
+ sha256 = "03l8dbhhcqaz009g1lxqkq9mci3v0kqx03mxgfdsjq0pzf2hq1ah";
+ name = "kalzium-16.12.0.tar.xz";
};
};
kamera = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kamera-16.08.2.tar.xz";
- sha256 = "1pghfxs3l20iv92dl39qh9rvdgqcrzmlrwjbmdjs8rdyb4cm0ivc";
- name = "kamera-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kamera-16.12.0.tar.xz";
+ sha256 = "02q8kbkwg7w2iqn76dchyqhwmx6k2a2q3dz3pn1ah0b0ildqr93n";
+ name = "kamera-16.12.0.tar.xz";
};
};
kanagram = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kanagram-16.08.2.tar.xz";
- sha256 = "0q4v7g0a746qj62vjy09z5d50b6p6x3dfzciracz3jngsbngkkh6";
- name = "kanagram-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kanagram-16.12.0.tar.xz";
+ sha256 = "1xsph7983qnpg0zisbrw9r18i98zdy9xrpsdhq89wz895iqrfxqn";
+ name = "kanagram-16.12.0.tar.xz";
};
};
kapman = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kapman-16.08.2.tar.xz";
- sha256 = "0rfbn8p2fbgb3w9w7kn6s7q8yk6024sqc5l1f2k1b79g4f3mng82";
- name = "kapman-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kapman-16.12.0.tar.xz";
+ sha256 = "1p8h6xr7na9ihgcvc63c537kd9d4zhhvhim559dbf371cpkfm40l";
+ name = "kapman-16.12.0.tar.xz";
};
};
kapptemplate = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kapptemplate-16.08.2.tar.xz";
- sha256 = "1anjn061cbssbdvv9mvbafjwpxck9lxvxrmbjj1hq4z47z2hdh4h";
- name = "kapptemplate-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kapptemplate-16.12.0.tar.xz";
+ sha256 = "07sd32hkmw07afw65hi4rbzwvxasan01clag4z4smqscibz4dfr1";
+ name = "kapptemplate-16.12.0.tar.xz";
};
};
kate = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kate-16.08.2.tar.xz";
- sha256 = "0ch23k1n3csk2pc8xmsbp262ya3vng3n5lc3hcr2g03jkrjab214";
- name = "kate-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kate-16.12.0.tar.xz";
+ sha256 = "0n769wn2ja81mzhynqab034a7644nd0dcz3digqcf7hxplcjwcrz";
+ name = "kate-16.12.0.tar.xz";
};
};
katomic = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/katomic-16.08.2.tar.xz";
- sha256 = "07njyf7lnysvy2h6jql0z28yl1h6j3njrqnlxz4mf83ds09d73w6";
- name = "katomic-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/katomic-16.12.0.tar.xz";
+ sha256 = "1kk7h293qcxmq8wn597xc8awnfr5pbz8gf3h6zicvcmmcl6a2v6r";
+ name = "katomic-16.12.0.tar.xz";
};
};
kblackbox = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kblackbox-16.08.2.tar.xz";
- sha256 = "13spiwy2sjcfiz7hjg2jrx5aflnmccg3d5ki37bk72vcwg21i30y";
- name = "kblackbox-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kblackbox-16.12.0.tar.xz";
+ sha256 = "146x0rj6408d96aw426qcs5h43xw9dash51spys0frsrgnblm7ji";
+ name = "kblackbox-16.12.0.tar.xz";
};
};
kblocks = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kblocks-16.08.2.tar.xz";
- sha256 = "0ck0b8jxxcpz84sailh4i9c80dqqrw95fy8jgknwwb85w1a82r5v";
- name = "kblocks-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kblocks-16.12.0.tar.xz";
+ sha256 = "0h60w4x003ypip5svbda88sxbyxxpjf6kxxfyxniv81hq5vag49d";
+ name = "kblocks-16.12.0.tar.xz";
};
};
kblog = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kblog-16.08.2.tar.xz";
- sha256 = "1n9camf91p4igbn54j3n8jgqv9154y54fvyn0dlajmwf3ir8lyk9";
- name = "kblog-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kblog-16.12.0.tar.xz";
+ sha256 = "1ph86xkjc42m3mysg68xwfy0d364vjqlm4wsn8yx0ag0ndr34vw2";
+ name = "kblog-16.12.0.tar.xz";
};
};
kbounce = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kbounce-16.08.2.tar.xz";
- sha256 = "0mka3s4vx1gbzavhdbhy24jfginkl8v6ab9za47cfyiwnirscry7";
- name = "kbounce-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kbounce-16.12.0.tar.xz";
+ sha256 = "0jr0pgdp9nmiikbrnx82ydjkh4mgv0wcqjp7fdfyh1rmcz8r02v1";
+ name = "kbounce-16.12.0.tar.xz";
};
};
kbreakout = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kbreakout-16.08.2.tar.xz";
- sha256 = "0kyxd112yfdp14d73s3dbg393r11gmb7bc0ibb4a5ab7ki3vvp5h";
- name = "kbreakout-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kbreakout-16.12.0.tar.xz";
+ sha256 = "0pk2hn2bzx3cdxmilsd3rbrvajv2ysipybmd5ca3q65rf8d0l727";
+ name = "kbreakout-16.12.0.tar.xz";
};
};
kbruch = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kbruch-16.08.2.tar.xz";
- sha256 = "0m4zk03gxim4bxxzy391jkspjslf4i3gk23h7jpzwvp2yppibzxk";
- name = "kbruch-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kbruch-16.12.0.tar.xz";
+ sha256 = "1q7zbixix29qcakixra11ffb6x2l64cxigxc9jw40hpggh9rki16";
+ name = "kbruch-16.12.0.tar.xz";
};
};
kcachegrind = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kcachegrind-16.08.2.tar.xz";
- sha256 = "0hflqnx4cbqjx61cmxh4y2xkxzqxfw52m7snwhzyd9nlc1f842f4";
- name = "kcachegrind-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kcachegrind-16.12.0.tar.xz";
+ sha256 = "0660b13vsky54lfw42nzk136a5pdhdszqr53ahfa2966ij5dswwz";
+ name = "kcachegrind-16.12.0.tar.xz";
};
};
kcalc = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kcalc-16.08.2.tar.xz";
- sha256 = "19zxdikqw922q4nc5nfm63pcaq3dg2d6bvcgxw7nd8r1jbn94acm";
- name = "kcalc-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kcalc-16.12.0.tar.xz";
+ sha256 = "0vx71zv2fs0di28h1g0cvnmawjyadd7jc6z9ahf4w55ycmamxj71";
+ name = "kcalc-16.12.0.tar.xz";
};
};
kcalcore = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kcalcore-16.08.2.tar.xz";
- sha256 = "1r0r0mk7yzi8h6mn81aaldcfa4vgxsz17sj5dm5m2p0mr42jxip3";
- name = "kcalcore-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kcalcore-16.12.0.tar.xz";
+ sha256 = "0f86yz4jrrfvf869kppmms4l3w8xwaygjqa1wqxrrmm7wsvrysd7";
+ name = "kcalcore-16.12.0.tar.xz";
};
};
kcalutils = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kcalutils-16.08.2.tar.xz";
- sha256 = "0achb65qs07b17qhdvfhl7w2qjfls00bycmg8jl789lz0jpdsgg7";
- name = "kcalutils-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kcalutils-16.12.0.tar.xz";
+ sha256 = "088lbl9zgjbrhy0ahjmjn8qx8gd10171jprab7d083ny7crx27ik";
+ name = "kcalutils-16.12.0.tar.xz";
};
};
kcharselect = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kcharselect-16.08.2.tar.xz";
- sha256 = "1r50jpyl8a79qgz3gb1apzwrgkx5h7s9m645smi1y5af7qh6dkvy";
- name = "kcharselect-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kcharselect-16.12.0.tar.xz";
+ sha256 = "1pcphx845r0kjah94n1b2j7fmrrqy4kvrhiyc40wmqp12fp0km8b";
+ name = "kcharselect-16.12.0.tar.xz";
};
};
kcolorchooser = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kcolorchooser-16.08.2.tar.xz";
- sha256 = "1sms0wms94lrykpsj45y8g34dnkkibszahv5303zbzg1ndak4a5i";
- name = "kcolorchooser-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kcolorchooser-16.12.0.tar.xz";
+ sha256 = "0zdkpn0i53wv49ynwmkz0pd0yvh1f2fjkdgqrs8i4bslipp0411z";
+ name = "kcolorchooser-16.12.0.tar.xz";
};
};
kcontacts = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kcontacts-16.08.2.tar.xz";
- sha256 = "0y8i5302jndpwms0wksf71yqxvz67x8wbwfkjjmlr3n6g477cvf3";
- name = "kcontacts-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kcontacts-16.12.0.tar.xz";
+ sha256 = "1qxxh7bqadrbq28b9fmjj748az9ir6rznn179pvlr2v32ch25vrw";
+ name = "kcontacts-16.12.0.tar.xz";
};
};
kcron = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kcron-16.08.2.tar.xz";
- sha256 = "05v5lwcdys0r715x21ddzgl1f3m1vqw8jmyb7igcb4m14iixvfwk";
- name = "kcron-16.08.2.tar.xz";
- };
- };
- kde-baseapps = {
- version = "16.08.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-baseapps-16.08.2.tar.xz";
- sha256 = "1p7h1jygqiwdgwi1g5pr7rq0219i6qq6mrg0c0shcfvvi926dg10";
- name = "kde-baseapps-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kcron-16.12.0.tar.xz";
+ sha256 = "1cqx4k384kk3g48qp9vdxd46cijzdskay3a67k7jwszinjnhqgbx";
+ name = "kcron-16.12.0.tar.xz";
};
};
kdebugsettings = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kdebugsettings-16.08.2.tar.xz";
- sha256 = "0aixcx4fcnrhz7g9dwl65khn2d5a667jchsxjnlwwrxhff2djy3z";
- name = "kdebugsettings-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kdebugsettings-16.12.0.tar.xz";
+ sha256 = "1nkqqcrbkwfcvnqylniqlwlay4x2ma2i7jdp0msm2yr2q743k01l";
+ name = "kdebugsettings-16.12.0.tar.xz";
};
};
kde-dev-scripts = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-dev-scripts-16.08.2.tar.xz";
- sha256 = "1iis5zlfz0ylycpz1i9s99grhp6pzskwv9hmsr620mj2fhcy3nwv";
- name = "kde-dev-scripts-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-dev-scripts-16.12.0.tar.xz";
+ sha256 = "1qadnwi4ph4hdjzfrjfqr4idw8ky4j14mc37w7r7025mdlfbj06n";
+ name = "kde-dev-scripts-16.12.0.tar.xz";
};
};
kde-dev-utils = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-dev-utils-16.08.2.tar.xz";
- sha256 = "1sm540r4nfr8azw9bvsmjbqy709039sk0z7rv3d5mh3d6f363my1";
- name = "kde-dev-utils-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-dev-utils-16.12.0.tar.xz";
+ sha256 = "039i3by9hl3h6yc1bbkf4y1bx3gxclncx69mh0z4fh5h58z5vz1r";
+ name = "kde-dev-utils-16.12.0.tar.xz";
};
};
kdeedu-data = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kdeedu-data-16.08.2.tar.xz";
- sha256 = "1m8831nr9f97fz9vxca4bcwwvv5nicd4y74sgp6xm3v41xqwda6b";
- name = "kdeedu-data-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kdeedu-data-16.12.0.tar.xz";
+ sha256 = "144px97jyfc258cwaqp8jw8jfnw22bnpa4p48mzxdl70p0q6maal";
+ name = "kdeedu-data-16.12.0.tar.xz";
};
};
kdegraphics-mobipocket = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kdegraphics-mobipocket-16.08.2.tar.xz";
- sha256 = "0y19q7r4pbfkqf0mb80h9rqzc13q9csllb9b8ca536bcjh41r6yy";
- name = "kdegraphics-mobipocket-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kdegraphics-mobipocket-16.12.0.tar.xz";
+ sha256 = "1wpnijyvacajz96zaqa0185qwbg1ma5c1lvkzd1ww6h04dychfvi";
+ name = "kdegraphics-mobipocket-16.12.0.tar.xz";
};
};
kdegraphics-thumbnailers = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kdegraphics-thumbnailers-16.08.2.tar.xz";
- sha256 = "155nfj6apbvrs2p69yj0ic0ybp59air0a3wdwz5sw84y47dslnaz";
- name = "kdegraphics-thumbnailers-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kdegraphics-thumbnailers-16.12.0.tar.xz";
+ sha256 = "1r8f1167sqnd4qd9ibgknp1w9jfbw4yr2rcyp62xi3xlp04mn9fm";
+ name = "kdegraphics-thumbnailers-16.12.0.tar.xz";
};
};
kde-l10n-ar = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ar-16.08.2.tar.xz";
- sha256 = "0aaxwb4sr2bq5cmcr0j7n7dbvih52d5gwbcx17ksip0fp7y0cgnr";
- name = "kde-l10n-ar-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ar-16.12.0.tar.xz";
+ sha256 = "1hz9bi8z3z2vgxbmsqv8vp4pi03gg6vjnxcf1jngc7jix91iqaf4";
+ name = "kde-l10n-ar-16.12.0.tar.xz";
};
};
kde-l10n-ast = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ast-16.08.2.tar.xz";
- sha256 = "1s55wrb2ll4fh0f648yybg6mxgsvikanwplw88kk254gxailbvi4";
- name = "kde-l10n-ast-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ast-16.12.0.tar.xz";
+ sha256 = "1kj0l96wz5j1s8kr5za9az62v7qgw1z9ig4m38hxb9635m2zrp59";
+ name = "kde-l10n-ast-16.12.0.tar.xz";
};
};
kde-l10n-bg = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-bg-16.08.2.tar.xz";
- sha256 = "15slc3an490xcbkwhfkysrzx3xg0h1mrwzp4bxsrsvqcjw4nlrdy";
- name = "kde-l10n-bg-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-bg-16.12.0.tar.xz";
+ sha256 = "0xy5icllcq56lmqrpnmyja8kycnr3njzg1adrr2dnvdhwgjm8knj";
+ name = "kde-l10n-bg-16.12.0.tar.xz";
};
};
kde-l10n-bs = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-bs-16.08.2.tar.xz";
- sha256 = "1117i784lwi9ci1ryd46x01pjraw30lma0z4kcg987xpj6ww22ha";
- name = "kde-l10n-bs-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-bs-16.12.0.tar.xz";
+ sha256 = "1wrdqcargx9qfmkmk0scwvrb1x5dqcxfba1mj44biijzxmaxy6v7";
+ name = "kde-l10n-bs-16.12.0.tar.xz";
};
};
kde-l10n-ca = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ca-16.08.2.tar.xz";
- sha256 = "07f6h2prkm7iq3bwvn5p9y32xzis3p21sgxpg1x6663w3603w2pa";
- name = "kde-l10n-ca-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ca-16.12.0.tar.xz";
+ sha256 = "0w8k81jar52hy60cwdn5l6n3d535cyvf72rdsshs148s4hpx1naz";
+ name = "kde-l10n-ca-16.12.0.tar.xz";
};
};
kde-l10n-ca_valencia = {
- version = "ca_valencia-16.08.2";
+ version = "ca_valencia-16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ca@valencia-16.08.2.tar.xz";
- sha256 = "05fw1dj1rfsi1j8mzvjvqwvdv7zkjcj4y0fb9wm9wzcqlsl742wv";
- name = "kde-l10n-ca_valencia-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ca@valencia-16.12.0.tar.xz";
+ sha256 = "1raj2w8ixaxi43nh44z19xd9m2iqg5b2wrqccd8pjyip73c1la3q";
+ name = "kde-l10n-ca_valencia-16.12.0.tar.xz";
};
};
kde-l10n-cs = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-cs-16.08.2.tar.xz";
- sha256 = "1vfn41kayimddrcg2h6zrx3sc31vq2zlv6bkpg29h6yddir6xjgk";
- name = "kde-l10n-cs-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-cs-16.12.0.tar.xz";
+ sha256 = "143h9gkb2l5h3fm6phv07x0az5i7fzs9m53xck71wpahz1z244km";
+ name = "kde-l10n-cs-16.12.0.tar.xz";
};
};
kde-l10n-da = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-da-16.08.2.tar.xz";
- sha256 = "0k8cs5m9aypgjkrvwrff4qvaanppaizryc6wncqr9jj13hr2vz1q";
- name = "kde-l10n-da-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-da-16.12.0.tar.xz";
+ sha256 = "03p1npjikfmb3a1hgmcd14lx3x9vfvf1x3mzz25493wlwzkb5lbm";
+ name = "kde-l10n-da-16.12.0.tar.xz";
};
};
kde-l10n-de = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-de-16.08.2.tar.xz";
- sha256 = "01kfh8zlf7r3dlmi96nvl4gksxryd10aqrnddhwjxni29l2sqjil";
- name = "kde-l10n-de-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-de-16.12.0.tar.xz";
+ sha256 = "146zb25f54ig4zkmys4wq5j057k9ajfp9jyyfqmmpch33567llb6";
+ name = "kde-l10n-de-16.12.0.tar.xz";
};
};
kde-l10n-el = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-el-16.08.2.tar.xz";
- sha256 = "1b6q3xriy9bv5537v2salz4vi4yx4hlx73aga4ic4pas8n0fn155";
- name = "kde-l10n-el-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-el-16.12.0.tar.xz";
+ sha256 = "0vcf8wi1wd358hs1ynyil2ahb26w9dp8snlszyhr63zbg9qwwic4";
+ name = "kde-l10n-el-16.12.0.tar.xz";
};
};
kde-l10n-en_GB = {
- version = "en_GB-16.08.2";
+ version = "en_GB-16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-en_GB-16.08.2.tar.xz";
- sha256 = "12cf5cx7kmc0wg752xpaz4jr4m3vxaahhxd0cp41p3lrb3079g2c";
- name = "kde-l10n-en_GB-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-en_GB-16.12.0.tar.xz";
+ sha256 = "1bvcgasl672xawfd8alwcindyj16j5p3cplqndw4z1pybnsmzgmk";
+ name = "kde-l10n-en_GB-16.12.0.tar.xz";
};
};
kde-l10n-eo = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-eo-16.08.2.tar.xz";
- sha256 = "07rwf3jcrs7r16hpyf4mz9fk41qi1nfm6x6qlf6xlpi7ynxgyyj0";
- name = "kde-l10n-eo-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-eo-16.12.0.tar.xz";
+ sha256 = "1sln4krw8l8zm3q4h7q7rhd5lf7s7rfb6n73wybxmwypawyz0qqn";
+ name = "kde-l10n-eo-16.12.0.tar.xz";
};
};
kde-l10n-es = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-es-16.08.2.tar.xz";
- sha256 = "1m366lxafwxa390nyvxwslbk653m1g6nwv9hr4mmpcnf2xxqsq2b";
- name = "kde-l10n-es-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-es-16.12.0.tar.xz";
+ sha256 = "1kp1ihmlkkg053bplsjbbiixp0yzidd4gidpcj9axsa74f04084w";
+ name = "kde-l10n-es-16.12.0.tar.xz";
};
};
kde-l10n-et = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-et-16.08.2.tar.xz";
- sha256 = "0n08x8102hlzl3xp3d306lxf47b7870wxvr95krnchbrnmb847jv";
- name = "kde-l10n-et-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-et-16.12.0.tar.xz";
+ sha256 = "0w48lirqnsgk78hkiam8cc7r7h5h4mrd7b8wssvxwbknyz33jfkz";
+ name = "kde-l10n-et-16.12.0.tar.xz";
};
};
kde-l10n-eu = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-eu-16.08.2.tar.xz";
- sha256 = "0kacy7cbjd4pgzr54x9y28lk28rdbilqamg5gv2lxz3l2rqbnkpf";
- name = "kde-l10n-eu-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-eu-16.12.0.tar.xz";
+ sha256 = "0mpjr6yklvvfjhrssvn1m27gqs7r9jvdr0prp6yss8v00ij9i3ig";
+ name = "kde-l10n-eu-16.12.0.tar.xz";
};
};
kde-l10n-fa = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-fa-16.08.2.tar.xz";
- sha256 = "1nznmql7i2dkziyam6czyd8j0spjg276l9nwqnznrzpjnpks1dl2";
- name = "kde-l10n-fa-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-fa-16.12.0.tar.xz";
+ sha256 = "167lq8fnlfhrmvivzpznmv7x82izs9jdl6w4p8dg2i3801jwi9ff";
+ name = "kde-l10n-fa-16.12.0.tar.xz";
};
};
kde-l10n-fi = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-fi-16.08.2.tar.xz";
- sha256 = "0rxf7hcjrhmv7zrrrc9bv65dxwiw0vywwn7j92jvsw5psbb9yf1x";
- name = "kde-l10n-fi-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-fi-16.12.0.tar.xz";
+ sha256 = "19y8jrxfl0nh4dcrl7sdz8r9cyka3cjg0dp8cs84v5c10fab4w8l";
+ name = "kde-l10n-fi-16.12.0.tar.xz";
};
};
kde-l10n-fr = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-fr-16.08.2.tar.xz";
- sha256 = "07b9a4vlnampg7i7nb4ykh1cp77pdf5k0h6aa0mjg1rjycpwflv3";
- name = "kde-l10n-fr-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-fr-16.12.0.tar.xz";
+ sha256 = "1p487x8jsihxn7lrjmssi6i3is01498szblqn84yc8bgc7pgfdly";
+ name = "kde-l10n-fr-16.12.0.tar.xz";
};
};
kde-l10n-ga = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ga-16.08.2.tar.xz";
- sha256 = "08dgs9rz52mk4bl41h5k4p0cpqjw381aw3h6xw8080lj9zh0nvbn";
- name = "kde-l10n-ga-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ga-16.12.0.tar.xz";
+ sha256 = "0avpkwmdac9c8n8l0ddssgmn2pk9lkn7zhs532ird8axv4i9ynk4";
+ name = "kde-l10n-ga-16.12.0.tar.xz";
};
};
kde-l10n-gl = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-gl-16.08.2.tar.xz";
- sha256 = "0986i04gfa6yw3ljmlx857src7lda8cwqdkk68cbxfi371ly0spl";
- name = "kde-l10n-gl-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-gl-16.12.0.tar.xz";
+ sha256 = "1qdwfxgaqbymgqwmpki3zk3d5h18fmb7n62basn2yqhbj7cdpkil";
+ name = "kde-l10n-gl-16.12.0.tar.xz";
};
};
kde-l10n-he = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-he-16.08.2.tar.xz";
- sha256 = "0xbbf3jpsmyq8k3d2qq3y75jq9wmf6iy46s52qbmr0pbdg288h3c";
- name = "kde-l10n-he-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-he-16.12.0.tar.xz";
+ sha256 = "19nkvhs7gjrcxsynraqmgvif1n5m1zmjm6j7h1zviqmwcn9zncj4";
+ name = "kde-l10n-he-16.12.0.tar.xz";
};
};
kde-l10n-hi = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-hi-16.08.2.tar.xz";
- sha256 = "1cfmn3qafmps51mld735synlsf8h1nfb84ji9qv64qpw2gjvpp9n";
- name = "kde-l10n-hi-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-hi-16.12.0.tar.xz";
+ sha256 = "1m5qlc3mf9ns7ka8kmj5c2iqaqkb68hcab13hp5y5j4i7miqpp6d";
+ name = "kde-l10n-hi-16.12.0.tar.xz";
};
};
kde-l10n-hr = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-hr-16.08.2.tar.xz";
- sha256 = "11kfxqjavmh9bcaivm5zd82r0b3d4rz8zmc2awc1433i6wgdxrkq";
- name = "kde-l10n-hr-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-hr-16.12.0.tar.xz";
+ sha256 = "1lbf25apks10c1byy0z8zjsfqd7f07xzhpdrinxbpdsa69ln28k2";
+ name = "kde-l10n-hr-16.12.0.tar.xz";
};
};
kde-l10n-hu = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-hu-16.08.2.tar.xz";
- sha256 = "0m714qii2z1bc8kv112bf9wpq078yaqgzd1m4h2apyj1rzl8sni8";
- name = "kde-l10n-hu-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-hu-16.12.0.tar.xz";
+ sha256 = "0m2pv1zddfflpgmvab84j19b0nb7fymslqy2pzcdx6ga9f0k37gl";
+ name = "kde-l10n-hu-16.12.0.tar.xz";
};
};
kde-l10n-ia = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ia-16.08.2.tar.xz";
- sha256 = "1r10w7dpxmgby3igh57yli6hp1paxwh1m4vkzi5f91fgh2s8qjjg";
- name = "kde-l10n-ia-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ia-16.12.0.tar.xz";
+ sha256 = "0x6h4k29s6pqd0k6c7lv15pa6837a59g5dskfph38kjdiv8lfwvq";
+ name = "kde-l10n-ia-16.12.0.tar.xz";
};
};
kde-l10n-id = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-id-16.08.2.tar.xz";
- sha256 = "1r26h3rlgh91f00qzmkzmd3sflsmvyxdcy92ljj1g64wh9cigh66";
- name = "kde-l10n-id-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-id-16.12.0.tar.xz";
+ sha256 = "12ysf2q9cjfmsc00p6rdwhykbwvhzq6n5j0i296506hhmvbz2n15";
+ name = "kde-l10n-id-16.12.0.tar.xz";
};
};
kde-l10n-is = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-is-16.08.2.tar.xz";
- sha256 = "0ldxw1sl7sr7v0783cby6qp5ig2x5dq2s8w7k3fh1qa88cp1nsld";
- name = "kde-l10n-is-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-is-16.12.0.tar.xz";
+ sha256 = "1042skag9p1d1x1yg0jr8a3k1qsbr65nrswvmi2bqxmv59ls60zz";
+ name = "kde-l10n-is-16.12.0.tar.xz";
};
};
kde-l10n-it = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-it-16.08.2.tar.xz";
- sha256 = "0knvilb2p9s1cr354bzwhxzmfi49g17v3clqdvlcyglghkz94aam";
- name = "kde-l10n-it-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-it-16.12.0.tar.xz";
+ sha256 = "0q44bcan48rjngc892prgqd0nyagh0wsha47hhxb9lm5cnf8kzis";
+ name = "kde-l10n-it-16.12.0.tar.xz";
};
};
kde-l10n-ja = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ja-16.08.2.tar.xz";
- sha256 = "0x3sfprw1pvjkivva05cg9nbzml2g4vzidvjq37vp7nkyfdxldcp";
- name = "kde-l10n-ja-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ja-16.12.0.tar.xz";
+ sha256 = "100wlprb149vpccypw5i0f6jj3f9yb77rkifn65h8brfmiiynisa";
+ name = "kde-l10n-ja-16.12.0.tar.xz";
};
};
kde-l10n-kk = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-kk-16.08.2.tar.xz";
- sha256 = "1jmqahyhxz798yqlc25lyj3x6xa426czkydbikpngb3775wy918z";
- name = "kde-l10n-kk-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-kk-16.12.0.tar.xz";
+ sha256 = "045sni4cb70r94zb3vgprplr2nnpixbdx80c7cc99m2z4dd9bk01";
+ name = "kde-l10n-kk-16.12.0.tar.xz";
};
};
kde-l10n-km = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-km-16.08.2.tar.xz";
- sha256 = "00p7grks0cjca5r2xvmf4kxvpjqasbjcss938x9ss6wc0knq8laa";
- name = "kde-l10n-km-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-km-16.12.0.tar.xz";
+ sha256 = "025cp9xpqa1hiax5lwpbqabdcdjpkm3szcbhwf607gz51ck6l4q3";
+ name = "kde-l10n-km-16.12.0.tar.xz";
};
};
kde-l10n-ko = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ko-16.08.2.tar.xz";
- sha256 = "0w14n8vzvmwiliqnakg4s76cka1qp0j0azc632aaiy6d17g0yw2k";
- name = "kde-l10n-ko-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ko-16.12.0.tar.xz";
+ sha256 = "1aga8cmf2mv5746b5ix6j2ims2xp7s1mmn8dksipj0inrg9bim3b";
+ name = "kde-l10n-ko-16.12.0.tar.xz";
};
};
kde-l10n-lt = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-lt-16.08.2.tar.xz";
- sha256 = "1yj119r7p9bjk405ml5383y5jqrhaj9v4ksjiyhjs8l5zx0pjb3b";
- name = "kde-l10n-lt-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-lt-16.12.0.tar.xz";
+ sha256 = "1rf1rwq4gzpcifpki1dx8iw7yv9fdyqrkbg96pnp47lynbdkp63s";
+ name = "kde-l10n-lt-16.12.0.tar.xz";
};
};
kde-l10n-lv = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-lv-16.08.2.tar.xz";
- sha256 = "0g173n4nqiw7mk6phys4dlis6dfd9iw0kpv4hhvz4b54i67wamvw";
- name = "kde-l10n-lv-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-lv-16.12.0.tar.xz";
+ sha256 = "0hn4c453fj3r7bscl5zr4n42cpxxxs738fc24cz34yjcxq19fgc3";
+ name = "kde-l10n-lv-16.12.0.tar.xz";
};
};
kde-l10n-mr = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-mr-16.08.2.tar.xz";
- sha256 = "1696gqib17f250p5y0vfjxcx8w4wx1lhi8nqy9bbjj6acmahishj";
- name = "kde-l10n-mr-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-mr-16.12.0.tar.xz";
+ sha256 = "04jljwj8kk2h5bqxfcpwnmig457w8141q1ckk91nfv4927gq3im3";
+ name = "kde-l10n-mr-16.12.0.tar.xz";
};
};
kde-l10n-nb = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nb-16.08.2.tar.xz";
- sha256 = "0z2v14m329r8687qpvf0qxnbvpp48mvl1yri16203bya8q44764j";
- name = "kde-l10n-nb-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-nb-16.12.0.tar.xz";
+ sha256 = "16msjakcjlg6q9lk1bslayy1gsa2s3gf0b9gy1nkw3v09df93hv6";
+ name = "kde-l10n-nb-16.12.0.tar.xz";
};
};
kde-l10n-nds = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nds-16.08.2.tar.xz";
- sha256 = "0d7nzwll2hqlb3ca3zdwr9x4rnhvv3fgxammzac07gib1aq27lap";
- name = "kde-l10n-nds-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-nds-16.12.0.tar.xz";
+ sha256 = "1jfswrb3z3q39pfgv7m1jzb1nigchfdnjg26zc1wmw8n6b544yhs";
+ name = "kde-l10n-nds-16.12.0.tar.xz";
};
};
kde-l10n-nl = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nl-16.08.2.tar.xz";
- sha256 = "0hq7gqg6nqb06kg8pgjf36w6lx6kv0z4v0lz4wac47v10jipcix4";
- name = "kde-l10n-nl-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-nl-16.12.0.tar.xz";
+ sha256 = "1i9z5bp76gz8w58qzmgi5b90xbfar0ypjyhmnfksdzvpgd571lmq";
+ name = "kde-l10n-nl-16.12.0.tar.xz";
};
};
kde-l10n-nn = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nn-16.08.2.tar.xz";
- sha256 = "02935kj4gw93lyjik6vqk40rnpblib0pq1dl0im2mavfym2nacjj";
- name = "kde-l10n-nn-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-nn-16.12.0.tar.xz";
+ sha256 = "1fvva9p572fi05z2542pfyx3wjycld1ap1zqgzlmk6j28a3ifzcb";
+ name = "kde-l10n-nn-16.12.0.tar.xz";
};
};
kde-l10n-pa = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pa-16.08.2.tar.xz";
- sha256 = "08qq6lkr9jrsl12slqfhp83vkamr5nv9x7hr91g8xgg1s9i3aj3z";
- name = "kde-l10n-pa-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-pa-16.12.0.tar.xz";
+ sha256 = "0dqn7bijj6k8hp20nvh79jwzz1dnkx0py125b0isvjpakslqwf3p";
+ name = "kde-l10n-pa-16.12.0.tar.xz";
};
};
kde-l10n-pl = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pl-16.08.2.tar.xz";
- sha256 = "0ylsc89nsmbjm4c5gbnh5qczmr7bal7037bm5nsmrh7aqkwg1s1x";
- name = "kde-l10n-pl-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-pl-16.12.0.tar.xz";
+ sha256 = "1l3ja8j4pw75qzaswli8a7c0qd1ac272dblx597njcs8iqgs6y3l";
+ name = "kde-l10n-pl-16.12.0.tar.xz";
};
};
kde-l10n-pt = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pt-16.08.2.tar.xz";
- sha256 = "0cbaf2vnr56qa0qfhr4cgdmbq3hbck9wfcx5a7bvvaglck95f4gq";
- name = "kde-l10n-pt-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-pt-16.12.0.tar.xz";
+ sha256 = "0riyk5sz63sv8cfx8s25hw5l9g0052fbbq7m8srmc79hhw4w3p5h";
+ name = "kde-l10n-pt-16.12.0.tar.xz";
};
};
kde-l10n-pt_BR = {
- version = "pt_BR-16.08.2";
+ version = "pt_BR-16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pt_BR-16.08.2.tar.xz";
- sha256 = "048ssv4bhx8bn2q8nsh5n0m1nl64qadndwrh3hx3avd7jjnj7l4s";
- name = "kde-l10n-pt_BR-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-pt_BR-16.12.0.tar.xz";
+ sha256 = "0a3nhv7m5jkzsw158i5fbhlxz0p1pgn6rnzdja25v8hs3jqnzcq4";
+ name = "kde-l10n-pt_BR-16.12.0.tar.xz";
};
};
kde-l10n-ro = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ro-16.08.2.tar.xz";
- sha256 = "05pi6v5hp3yki0hiy19gggz1mpk7ykjz6f94k6cv63vinvai6gpw";
- name = "kde-l10n-ro-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ro-16.12.0.tar.xz";
+ sha256 = "0qs8dlcvh2366g0ifcwd7s5kg3q28bagpp8sm5zliyd79fh60mhh";
+ name = "kde-l10n-ro-16.12.0.tar.xz";
};
};
kde-l10n-ru = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ru-16.08.2.tar.xz";
- sha256 = "18kk3iyn1dyir43dxlrs0jcdin001h0qfzm9cszxlz52yx5vn4ba";
- name = "kde-l10n-ru-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ru-16.12.0.tar.xz";
+ sha256 = "0mk6h5fyna5qbq97mxwfihcjfg8lv7w5r1kis505ds6icym2pkzz";
+ name = "kde-l10n-ru-16.12.0.tar.xz";
};
};
kde-l10n-sk = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sk-16.08.2.tar.xz";
- sha256 = "0gxia3j689a315jww9cfw802vhz226zd3ci6i45ffrj5sdpm0bcs";
- name = "kde-l10n-sk-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-sk-16.12.0.tar.xz";
+ sha256 = "0qvgsjc9dbqfydg5zpygncpapw3df68yd1ham5d36v0c3k5161wi";
+ name = "kde-l10n-sk-16.12.0.tar.xz";
};
};
kde-l10n-sl = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sl-16.08.2.tar.xz";
- sha256 = "1d6gxc2jcnjzjrp6aw63l86wsqkdg4qw3zz5pc0j1qc5ihaak6pm";
- name = "kde-l10n-sl-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-sl-16.12.0.tar.xz";
+ sha256 = "15lia25c9nasp6w6y1xvnnhkxb3977rdbl4zcanla7da6ma7h8yd";
+ name = "kde-l10n-sl-16.12.0.tar.xz";
};
};
kde-l10n-sr = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sr-16.08.2.tar.xz";
- sha256 = "0mixdfpvryg1ch917nxc469m7fzgy5dkbxadc55kzgy9k18vry30";
- name = "kde-l10n-sr-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-sr-16.12.0.tar.xz";
+ sha256 = "1irjpki6pnnkxdp49vw61caixfhkjgahdgx14cayb4zi16qsmn7p";
+ name = "kde-l10n-sr-16.12.0.tar.xz";
};
};
kde-l10n-sv = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sv-16.08.2.tar.xz";
- sha256 = "10day8y3fqdf9rg24wmxa38snpkry08swcgzh2qxy2wlg7w1n2ld";
- name = "kde-l10n-sv-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-sv-16.12.0.tar.xz";
+ sha256 = "0a9jh60bz6xjq1ckyw2v67w9sdsjdlajlcbkb3jl021l8f5hywpx";
+ name = "kde-l10n-sv-16.12.0.tar.xz";
};
};
kde-l10n-tr = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-tr-16.08.2.tar.xz";
- sha256 = "19a5cribm12pi0y84vfwmigkyvn8d4ylvx07g9df4iapjf2kgs54";
- name = "kde-l10n-tr-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-tr-16.12.0.tar.xz";
+ sha256 = "0i3sigwhrj36dmv2li9qqdshd3zh4p8sa9zgngfvz1942x32yi8x";
+ name = "kde-l10n-tr-16.12.0.tar.xz";
};
};
kde-l10n-ug = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ug-16.08.2.tar.xz";
- sha256 = "0p2ijv13wk02sm065nk328pdl2qn22sashwdzw5viy6hr67z8igv";
- name = "kde-l10n-ug-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ug-16.12.0.tar.xz";
+ sha256 = "04mw7h9pyrbfvhx3mbp16czzawbqi9kn83nakysgkyy7dri1rl4g";
+ name = "kde-l10n-ug-16.12.0.tar.xz";
};
};
kde-l10n-uk = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-uk-16.08.2.tar.xz";
- sha256 = "0m03z8yac3mbsp78zskyiw316im7fr2197lmjl6prfz8hdvblyqm";
- name = "kde-l10n-uk-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-uk-16.12.0.tar.xz";
+ sha256 = "0iwzqvr677sqmgl4jdpawfnrf63k0x4xm3p29lbb2hpqnc0xmmpy";
+ name = "kde-l10n-uk-16.12.0.tar.xz";
};
};
kde-l10n-wa = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-wa-16.08.2.tar.xz";
- sha256 = "08zv0pl9gm7xpykzvb7cf4gx0r78jrfx33281iam3496bgl9iz63";
- name = "kde-l10n-wa-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-wa-16.12.0.tar.xz";
+ sha256 = "057kpzn50rs625ri737kjgn9zy8vxdaxmjlhk777piq5pq6id9s1";
+ name = "kde-l10n-wa-16.12.0.tar.xz";
};
};
kde-l10n-zh_CN = {
- version = "zh_CN-16.08.2";
+ version = "zh_CN-16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-zh_CN-16.08.2.tar.xz";
- sha256 = "1fzkykipaqlabzmddzk694h26cw15r8vwn3f6033pbgpd47rxmh7";
- name = "kde-l10n-zh_CN-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-zh_CN-16.12.0.tar.xz";
+ sha256 = "0313ph852wygmws225534nv2ldmd5kvky3vl5nmcwg5fryc0dq7i";
+ name = "kde-l10n-zh_CN-16.12.0.tar.xz";
};
};
kde-l10n-zh_TW = {
- version = "zh_TW-16.08.2";
+ version = "zh_TW-16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-zh_TW-16.08.2.tar.xz";
- sha256 = "0i02bbpkn802wzavyj3ilmp889v6frkbb1zp8q9wsrvdwv71zmrj";
- name = "kde-l10n-zh_TW-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-zh_TW-16.12.0.tar.xz";
+ sha256 = "0vfj5zdwrqzd34nxja8lwk93m9hiw3dzmbkaf9k5a7cpkqwnhf5s";
+ name = "kde-l10n-zh_TW-16.12.0.tar.xz";
};
};
kdelibs = {
- version = "4.14.25";
+ version = "4.14.27";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kdelibs-4.14.25.tar.xz";
- sha256 = "00idq3iqd72gjyqj79ci8992jlww877m3znjvvlnh8s97y4kwpds";
- name = "kdelibs-4.14.25.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kdelibs-4.14.27.tar.xz";
+ sha256 = "1cngdvkpwdwbl5b40q00h9ivnpqbnjbd7kkfvsma7rlgg7wfg7xp";
+ name = "kdelibs-4.14.27.tar.xz";
};
};
kdenetwork-filesharing = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kdenetwork-filesharing-16.08.2.tar.xz";
- sha256 = "0k9c1mjdr754qgzhfmx0qrh7lf1hlp698wq6mynw31b45ngx26n9";
- name = "kdenetwork-filesharing-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kdenetwork-filesharing-16.12.0.tar.xz";
+ sha256 = "1icsranvsyvxrnlg9lm034i6xf247sqxdgcvrfqjw35rf047yp0d";
+ name = "kdenetwork-filesharing-16.12.0.tar.xz";
};
};
kdenlive = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kdenlive-16.08.2.tar.xz";
- sha256 = "1lw0dayp2hryqpfw2090fzj7yqxi1y8bmpzadljqkl1glb6sd16l";
- name = "kdenlive-16.08.2.tar.xz";
- };
- };
- kdepim = {
- version = "16.08.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kdepim-16.08.2.tar.xz";
- sha256 = "15w9yyyld84hp0mzlw0iv9bl3f4dk560l6mynrq5ccya90lfrnc2";
- name = "kdepim-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kdenlive-16.12.0.tar.xz";
+ sha256 = "1qsnjya1sppn5dfx8lanxqpgakd5jgi7677wq7vvyz3v9i47zvmc";
+ name = "kdenlive-16.12.0.tar.xz";
};
};
kdepim-addons = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kdepim-addons-16.08.2.tar.xz";
- sha256 = "06plflqj1p3jhn8c2jm2vm55yhiwa7wsvndh86q39ajw5qw60mhx";
- name = "kdepim-addons-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kdepim-addons-16.12.0.tar.xz";
+ sha256 = "1a063qxmal8n5rd2a6v05zml61l52sm33574vqxybh1bnx2dpq58";
+ name = "kdepim-addons-16.12.0.tar.xz";
};
};
kdepim-apps-libs = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kdepim-apps-libs-16.08.2.tar.xz";
- sha256 = "1vygdkh43b0aajxywy6sa01khx8zvsv1n3aainqcbn8jndxlkb82";
- name = "kdepim-apps-libs-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kdepim-apps-libs-16.12.0.tar.xz";
+ sha256 = "1zm2mnwsxk4c58dbx3ln26mz89f1d20vywiljczfzpn99rg4cvvi";
+ name = "kdepim-apps-libs-16.12.0.tar.xz";
};
};
kdepim-runtime = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kdepim-runtime-16.08.2.tar.xz";
- sha256 = "0dg3ww5l6mq7xi4z1j7b4w2d7i425wbz1gwml0a9ajy3v0k14vqb";
- name = "kdepim-runtime-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kdepim-runtime-16.12.0.tar.xz";
+ sha256 = "0vkmjh0l5yzpd9rmnyc2cchwpk9ccyk79g2ii5qg6xxr46r1vmfs";
+ name = "kdepim-runtime-16.12.0.tar.xz";
};
};
kde-runtime = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kde-runtime-16.08.2.tar.xz";
- sha256 = "1q0m4nywap0qmg9fj9z2d8b7j9bvykniqq9jga3jmys5g2cjn205";
- name = "kde-runtime-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kde-runtime-16.12.0.tar.xz";
+ sha256 = "1vs5q063li8jj56vwyy3wh6hfabf0xhmp6ag9mc2ns8kwcia1m6x";
+ name = "kde-runtime-16.12.0.tar.xz";
};
};
kdesdk-kioslaves = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kdesdk-kioslaves-16.08.2.tar.xz";
- sha256 = "11png8q0ci86if2g49nrmx63l8pxcmp789k9kkamnzsx79y6arq2";
- name = "kdesdk-kioslaves-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kdesdk-kioslaves-16.12.0.tar.xz";
+ sha256 = "19jbw3w8mg20m3f96s9bnw0wg28zxq2kgq0fs9c5rbjr8alxlyz2";
+ name = "kdesdk-kioslaves-16.12.0.tar.xz";
};
};
kdesdk-thumbnailers = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kdesdk-thumbnailers-16.08.2.tar.xz";
- sha256 = "1dmmm6l5yy64l6hqqjx4d5cycgx1wzjv81ll9jizgg8c5cknhi8l";
- name = "kdesdk-thumbnailers-16.08.2.tar.xz";
- };
- };
- kdewebdev = {
- version = "16.08.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kdewebdev-16.08.2.tar.xz";
- sha256 = "0dm013da1i2z0n6svmm0yqzgn3j608ldc2w80dvgkvykh85z5ccy";
- name = "kdewebdev-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kdesdk-thumbnailers-16.12.0.tar.xz";
+ sha256 = "1syzfdffggs3hidykmg9y6l4nzh7wbqs4ah9vih8cgs0qr2hml9s";
+ name = "kdesdk-thumbnailers-16.12.0.tar.xz";
};
};
kdf = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kdf-16.08.2.tar.xz";
- sha256 = "0lvzyxn434rqknqmzwi6ih60gvkd24i2ms0ziypkh5ihs9scbmg7";
- name = "kdf-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kdf-16.12.0.tar.xz";
+ sha256 = "0shwr55nrjgzm6cb2cdglvkkmknppd4yl0arn38w5a56sacsczcc";
+ name = "kdf-16.12.0.tar.xz";
};
};
- kdgantt2 = {
- version = "16.08.2";
+ kdialog = {
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kdgantt2-16.08.2.tar.xz";
- sha256 = "1hhfrcjv6yx69ahnhc641h6sh9fp9m69jkb85aav2pydnps1p4bp";
- name = "kdgantt2-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kdialog-16.12.0.tar.xz";
+ sha256 = "0p6bf557k5ycmfaz7jrc65fp4j104c2cbv0ibamkyfrlpp1d0i1c";
+ name = "kdialog-16.12.0.tar.xz";
};
};
kdiamond = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kdiamond-16.08.2.tar.xz";
- sha256 = "0kaqxxm30kxvkbzgzj69zzsql903qbkczlkmxfb9x2zp2484f7jq";
- name = "kdiamond-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kdiamond-16.12.0.tar.xz";
+ sha256 = "1v0k23m74hiwr3a679h4wpc1w3m6y5mnjqc66pd9m94rshz8i8k6";
+ name = "kdiamond-16.12.0.tar.xz";
+ };
+ };
+ keditbookmarks = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/keditbookmarks-16.12.0.tar.xz";
+ sha256 = "1pw2snbdrndx42vxw51vss7mf52v6ys9jmkg7j6bkwp90dnlly1v";
+ name = "keditbookmarks-16.12.0.tar.xz";
+ };
+ };
+ kfilereplace = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/kfilereplace-16.12.0.tar.xz";
+ sha256 = "0bcn07p1iq44pry0q771vadpi9gm9p2icbn8q5fympxf2y9smmqx";
+ name = "kfilereplace-16.12.0.tar.xz";
+ };
+ };
+ kfind = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/kfind-16.12.0.tar.xz";
+ sha256 = "0i2sjcw3ah35x3w7cvhrpzrv5khwax6nazbqbwzgvfa0gwc9y8ki";
+ name = "kfind-16.12.0.tar.xz";
};
};
kfloppy = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kfloppy-16.08.2.tar.xz";
- sha256 = "0jkbamqbdggf72k1xszaan890nhqz4qwhd8d0mbgm2nhzbs9q1cb";
- name = "kfloppy-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kfloppy-16.12.0.tar.xz";
+ sha256 = "0awcayd1hffdv7dybbrv2m38q33yl26g4bs9z1yib7h4iilky3lz";
+ name = "kfloppy-16.12.0.tar.xz";
};
};
kfourinline = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kfourinline-16.08.2.tar.xz";
- sha256 = "0cb2kap8bp35ijnhghp9df4kai7vizayzcax0p3wamv0zy4zfx4b";
- name = "kfourinline-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kfourinline-16.12.0.tar.xz";
+ sha256 = "18l218fww9y3msmx28j42xyvgyvngj2bhdx05ji8q9x40phq8dby";
+ name = "kfourinline-16.12.0.tar.xz";
};
};
kgeography = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kgeography-16.08.2.tar.xz";
- sha256 = "0s88gzyy0ldz10vlklnvwi7aip0vn5gnawikqn80xfw3vwb5zyki";
- name = "kgeography-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kgeography-16.12.0.tar.xz";
+ sha256 = "1zcw344y2xrz2h9f37kvk0fl4c9rm5xcahqc3hranm922ki0c8v4";
+ name = "kgeography-16.12.0.tar.xz";
};
};
kget = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kget-16.08.2.tar.xz";
- sha256 = "1pna3rw76n1lg9l805ccisxirrmxw23n2az5nd95wsck77lgxnr6";
- name = "kget-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kget-16.12.0.tar.xz";
+ sha256 = "125b4knvng34cj99g45590d9ci5s0f1y3m223rxvzmn5sds2vp1k";
+ name = "kget-16.12.0.tar.xz";
};
};
kgoldrunner = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kgoldrunner-16.08.2.tar.xz";
- sha256 = "0r14mspzyigj4md7zzjq06sswb1y4m4232kfkwg4p7yp8xpsr56c";
- name = "kgoldrunner-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kgoldrunner-16.12.0.tar.xz";
+ sha256 = "155smz222s38ib0rrfcsfg0vi4l0iksawagwmxvnr1h51s80l5pz";
+ name = "kgoldrunner-16.12.0.tar.xz";
};
};
kgpg = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kgpg-16.08.2.tar.xz";
- sha256 = "0bx4d4i4n8v58yyqcb7pz70cpikymmjz9nd69mly9g8hj8jwqnll";
- name = "kgpg-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kgpg-16.12.0.tar.xz";
+ sha256 = "1jn51r4f2ixwp4qfx635jy017gls0aaz0638kfz8404zj4l523qs";
+ name = "kgpg-16.12.0.tar.xz";
};
};
khangman = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/khangman-16.08.2.tar.xz";
- sha256 = "172ciifrcydyhmawzxx3k1aq564ywjlj5wqfbjgxaf7pj3pbxndk";
- name = "khangman-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/khangman-16.12.0.tar.xz";
+ sha256 = "0827754548bxbhqgfykb7n97hxjszf8azrz2vi6l0vsd080q0kvf";
+ name = "khangman-16.12.0.tar.xz";
};
};
khelpcenter = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/khelpcenter-16.08.2.tar.xz";
- sha256 = "1iiz4w4zzf28g336hypmhf50lndwl6rj3y46wbj1mzpc99wrrxhr";
- name = "khelpcenter-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/khelpcenter-16.12.0.tar.xz";
+ sha256 = "015s3yj0ppba8b90h0fwwra3xqz2b21n701zd4q40rqfjhkh9p0j";
+ name = "khelpcenter-16.12.0.tar.xz";
};
};
kholidays = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kholidays-16.08.2.tar.xz";
- sha256 = "12fawyvy5nyiyr4zfbkwi5p0m5kgbcs4ly4f7bdq7qy7qbw6k8b6";
- name = "kholidays-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kholidays-16.12.0.tar.xz";
+ sha256 = "0rimmd74ls77zzmk00dxs17b9h4vj3382hiz2cl5pgf834s0ljgn";
+ name = "kholidays-16.12.0.tar.xz";
};
};
kidentitymanagement = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kidentitymanagement-16.08.2.tar.xz";
- sha256 = "00q21hfyfyhkh7ip14q0a8rgngigm17hs5gp8r6gymvcysp3glny";
- name = "kidentitymanagement-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kidentitymanagement-16.12.0.tar.xz";
+ sha256 = "0z559af17qjcr7s2nsr0v4yvqn69svkzcqis99x329kbhza1208k";
+ name = "kidentitymanagement-16.12.0.tar.xz";
};
};
kig = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kig-16.08.2.tar.xz";
- sha256 = "14p9cl7mbb04lz5l2ajbfxlqli065v09bc22nyjcsin45rxvdvmn";
- name = "kig-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kig-16.12.0.tar.xz";
+ sha256 = "10svcqid4rzhq8vb4bbxhnp1dlyl4fd8w18blxvqan0qiv43332x";
+ name = "kig-16.12.0.tar.xz";
};
};
kigo = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kigo-16.08.2.tar.xz";
- sha256 = "13lkzhb00bmynkwrshvwl8r270zsxp6bj5ca75xy3g4vmp04gy0i";
- name = "kigo-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kigo-16.12.0.tar.xz";
+ sha256 = "033jbyck21qzm9r9j7q012rbkr0bk0n2prjb70lk38wsb2ghvziw";
+ name = "kigo-16.12.0.tar.xz";
};
};
killbots = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/killbots-16.08.2.tar.xz";
- sha256 = "1vrzj91ff78g6w34vb68ljp2dpckc80545n9bhk8x1pr1s3jl3ks";
- name = "killbots-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/killbots-16.12.0.tar.xz";
+ sha256 = "0079fsh5yld69a3lq4ibbyhlr6kk7j2x0wylnk00jq0m886jqi4j";
+ name = "killbots-16.12.0.tar.xz";
+ };
+ };
+ kimagemapeditor = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/kimagemapeditor-16.12.0.tar.xz";
+ sha256 = "1p7r9k7xrvnab83sljlgjlncdpv3z1fxskyzsihdzb3qw1da5sg9";
+ name = "kimagemapeditor-16.12.0.tar.xz";
};
};
kimap = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kimap-16.08.2.tar.xz";
- sha256 = "1j0bsbzp669mxizr3vaxfg3wjavg7zx3xfrjrmwabl0h04hmkn0g";
- name = "kimap-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kimap-16.12.0.tar.xz";
+ sha256 = "1sm3ifnl80wmzbxz9ybsj4xl224mg5sn43ja29sf7m0syyypfc9n";
+ name = "kimap-16.12.0.tar.xz";
};
};
kio-extras = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kio-extras-16.08.2.tar.xz";
- sha256 = "1j5bmnq77yg5wpha0xl2cm4n2m0frw5dvr24i4ypvvqnpb1gim7q";
- name = "kio-extras-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kio-extras-16.12.0.tar.xz";
+ sha256 = "0g4xxzqbv5bi1msqp1vhkq04815dz4zflnlsgyimihi74mdawd3x";
+ name = "kio-extras-16.12.0.tar.xz";
};
};
kiriki = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kiriki-16.08.2.tar.xz";
- sha256 = "03vanq33hd7hlspckfydbbiavzv7g7maswca4zzd9sinybx45r7a";
- name = "kiriki-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kiriki-16.12.0.tar.xz";
+ sha256 = "034fgl0qvslzyk04gnr68gcvlvynfim8bn0plgz5vd0k5w9n67kc";
+ name = "kiriki-16.12.0.tar.xz";
};
};
kiten = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kiten-16.08.2.tar.xz";
- sha256 = "0kj1abs4f1ff0spkzwn5xxabcfb0xny7dlsa7lb0fbyvyczq3jgd";
- name = "kiten-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kiten-16.12.0.tar.xz";
+ sha256 = "1s6qpzficpfm0zxs8g80xyly7wflxfxwjpr0avsn6ydzz0yj4vc7";
+ name = "kiten-16.12.0.tar.xz";
};
};
kjumpingcube = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kjumpingcube-16.08.2.tar.xz";
- sha256 = "1rnmwz729jain4pv0wpb8x95k6cx0bvb2wk46sjm2p80202clb0r";
- name = "kjumpingcube-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kjumpingcube-16.12.0.tar.xz";
+ sha256 = "0japldhq8a7rfmzhlyk057iab9xnzwy1ahsp8fbdqh5xgp7yc0sq";
+ name = "kjumpingcube-16.12.0.tar.xz";
};
};
kldap = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kldap-16.08.2.tar.xz";
- sha256 = "18myysm48c8b6lpgl76x70na0k6qw47zrmmax2yfhbi4fsi13sg4";
- name = "kldap-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kldap-16.12.0.tar.xz";
+ sha256 = "1xz46h39clz5pqlhqfmvdiw67i7dknng5jk9907vjzp84rck8qmr";
+ name = "kldap-16.12.0.tar.xz";
};
};
kleopatra = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kleopatra-16.08.2.tar.xz";
- sha256 = "0pi2j6yrdw5nhm7kb3k5gg1qgs2dyijqv6r07xx3r260v98jz9jb";
- name = "kleopatra-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kleopatra-16.12.0.tar.xz";
+ sha256 = "0g5crp2vwvl0bfb95ym3wj3z39vy1bzcdcqw77pw4l1k9jd334sk";
+ name = "kleopatra-16.12.0.tar.xz";
};
};
klettres = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/klettres-16.08.2.tar.xz";
- sha256 = "07jqr3n67g0rgcdnxh4bmak6335w86irdla791bpkdl1swxwmvqi";
- name = "klettres-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/klettres-16.12.0.tar.xz";
+ sha256 = "1gggmllh4j5178gasc9qzbk7l453nsgmnp3gq18iymcrvjbm5r1k";
+ name = "klettres-16.12.0.tar.xz";
};
};
klickety = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/klickety-16.08.2.tar.xz";
- sha256 = "08nk4ihr8np36kzs4g94psh9xd5d8rpbhjd047pmw5226yv0lcr5";
- name = "klickety-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/klickety-16.12.0.tar.xz";
+ sha256 = "0xznghprfy7fl2b84dhf7yrcqwj7aa6dxyzani7q0vms6680vjrd";
+ name = "klickety-16.12.0.tar.xz";
};
};
klines = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/klines-16.08.2.tar.xz";
- sha256 = "18w4mc781ysjhr9krvvwac2c0hz7hqzks957i35d0jvs5675l1ds";
- name = "klines-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/klines-16.12.0.tar.xz";
+ sha256 = "086d9cak6vx7paygl2b2vim22gnpcq290agx62z98gy4a4r0aq3x";
+ name = "klines-16.12.0.tar.xz";
+ };
+ };
+ klinkstatus = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/klinkstatus-16.12.0.tar.xz";
+ sha256 = "1xr5mzhrs3jsp13587n0r3mr9z5j2fc7qr4z7c9c4za2v0qp83h7";
+ name = "klinkstatus-16.12.0.tar.xz";
};
};
kmag = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kmag-16.08.2.tar.xz";
- sha256 = "0x5x2gs5cs3vhr0ss14iy4pd5rxx1ry67ic52nnj7baa3b4kqssq";
- name = "kmag-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kmag-16.12.0.tar.xz";
+ sha256 = "1aihng2ippkavrlsrf9l3klpwkyql3lyy44x81ibmaw6xaa9zgjs";
+ name = "kmag-16.12.0.tar.xz";
};
};
kmahjongg = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kmahjongg-16.08.2.tar.xz";
- sha256 = "03yj71cz4ca847niw26vrssd56pjjgc04fmzv7vxlx25jb73cn13";
- name = "kmahjongg-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kmahjongg-16.12.0.tar.xz";
+ sha256 = "1lv95cjsc0ahnxij1y7b2pdihvkcnmbq6385rlxwqmqjp2mprga7";
+ name = "kmahjongg-16.12.0.tar.xz";
+ };
+ };
+ kmail = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/kmail-16.12.0.tar.xz";
+ sha256 = "0nydggfk2jndj6f7vn9far29z9n5zrmdfcfmfh7pbq5qhgdaxrzf";
+ name = "kmail-16.12.0.tar.xz";
+ };
+ };
+ kmail-account-wizard = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/kmail-account-wizard-16.12.0.tar.xz";
+ sha256 = "151ixamq9910pw8q8phn3crhc250khagrimfhsg721kcl0k0ajzs";
+ name = "kmail-account-wizard-16.12.0.tar.xz";
};
};
kmailtransport = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kmailtransport-16.08.2.tar.xz";
- sha256 = "0dggvmhp0w085pq0fwf83zzv3rhckmcnzzjznsn7fzw2lxj6ns90";
- name = "kmailtransport-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kmailtransport-16.12.0.tar.xz";
+ sha256 = "0hm797zk8lcq3icyddh46snx0f1n35j9vx7qg7zy77lfs9xrhh6n";
+ name = "kmailtransport-16.12.0.tar.xz";
};
};
kmbox = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kmbox-16.08.2.tar.xz";
- sha256 = "1jny5qcadw1ssfcfwbhfwwn0v5n6rd1v0rj92n7vj814ni41yk62";
- name = "kmbox-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kmbox-16.12.0.tar.xz";
+ sha256 = "0xmib0fpardw9f5f61mhmj04qlhh0nkq9cdp0z374r6mar29q2dj";
+ name = "kmbox-16.12.0.tar.xz";
};
};
kmime = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kmime-16.08.2.tar.xz";
- sha256 = "06rg1w5k53dvrhr2pcclhdlpf9784c4s7d3zyklwlc7r93bk0mch";
- name = "kmime-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kmime-16.12.0.tar.xz";
+ sha256 = "0rk6ggpa1iqc6vvkx1w7v68pngxfa0xailgd0rfkb7rxvbv9zvhs";
+ name = "kmime-16.12.0.tar.xz";
};
};
kmines = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kmines-16.08.2.tar.xz";
- sha256 = "02dbsrspg5x2avgdc0hrl522qzkki3hzr9k8zrbcjdh3j2rli965";
- name = "kmines-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kmines-16.12.0.tar.xz";
+ sha256 = "0j15c9valn6zi0siig132ck0jl3ccq8mwi87jmv01lk3wk8wf70n";
+ name = "kmines-16.12.0.tar.xz";
};
};
kmix = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kmix-16.08.2.tar.xz";
- sha256 = "0fgvzcvxvic72mckxj8hwwh0fs851c61p560rvp13lzwwjl1l290";
- name = "kmix-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kmix-16.12.0.tar.xz";
+ sha256 = "0q0x0azd6qaa9fqcf4bl9q05fggb1amqdn3y4fj6y4fmybzwy2lk";
+ name = "kmix-16.12.0.tar.xz";
};
};
kmousetool = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kmousetool-16.08.2.tar.xz";
- sha256 = "13fa5r3gzngbcma8xmgr5im5kwxqcpnb260z0jmx7la67rrd4igh";
- name = "kmousetool-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kmousetool-16.12.0.tar.xz";
+ sha256 = "08h0jpwf16xxrxijlg1lhlsixmfm8k6kby6z8m47ixd1pfj0dkxa";
+ name = "kmousetool-16.12.0.tar.xz";
};
};
kmouth = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kmouth-16.08.2.tar.xz";
- sha256 = "11xhzxh7rg0lzwq1wkr9a0dlsy70fy2d7nrmhi787xlgmcq1d1h8";
- name = "kmouth-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kmouth-16.12.0.tar.xz";
+ sha256 = "1nvxd3kykb0a1kr3pk8rs4imrnv2x2cqvyg4rdj2vzrxszckcirp";
+ name = "kmouth-16.12.0.tar.xz";
};
};
kmplot = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kmplot-16.08.2.tar.xz";
- sha256 = "1mflaypy1ncg22pchfm632ik3kj65c3g1h48zirb6a0njzma81bf";
- name = "kmplot-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kmplot-16.12.0.tar.xz";
+ sha256 = "1wdx63cv0qyccfgr7zbp1myfyfd2prk8jfq60n240rv0ji1r7ah8";
+ name = "kmplot-16.12.0.tar.xz";
};
};
knavalbattle = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/knavalbattle-16.08.2.tar.xz";
- sha256 = "1w85z4m5yfj51z4yn60w83yfm2fnx96b313j4ysqgwzn6qsvw269";
- name = "knavalbattle-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/knavalbattle-16.12.0.tar.xz";
+ sha256 = "0wyxxhgrmn7fyh3mmanpi7ki59zlrvhwyqpjya6dxysa8v7f6bda";
+ name = "knavalbattle-16.12.0.tar.xz";
};
};
knetwalk = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/knetwalk-16.08.2.tar.xz";
- sha256 = "1nd2ddcf1m7nbxsmqiv8b9kxsifxyczy0qkdm02fl27hjz45jsa3";
- name = "knetwalk-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/knetwalk-16.12.0.tar.xz";
+ sha256 = "1xbrzp8qhvnnx85zx5gkbkv5babkgm1zzlrrjbpbgghvqz71g36h";
+ name = "knetwalk-16.12.0.tar.xz";
+ };
+ };
+ knotes = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/knotes-16.12.0.tar.xz";
+ sha256 = "0rsl0d25i771r96lmp1bpq7g46jdk1jkfml0f10s3h940y73fyax";
+ name = "knotes-16.12.0.tar.xz";
};
};
kolf = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kolf-16.08.2.tar.xz";
- sha256 = "1afbdms3fzbl62g76c40d2k96djf5srl4xkpa20rm0by1ksfjcbg";
- name = "kolf-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kolf-16.12.0.tar.xz";
+ sha256 = "12dyfv9zsh3vacakh1yh037ma4n43lqhhqcqns4cimxwqzhdmwz5";
+ name = "kolf-16.12.0.tar.xz";
};
};
kollision = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kollision-16.08.2.tar.xz";
- sha256 = "18bi7diwzql96w41s7kmrvynrwg1h8ihifw2cb8ganjlp215r216";
- name = "kollision-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kollision-16.12.0.tar.xz";
+ sha256 = "0rb83c0ab6hf6y41ll5wp41gkv05jzk4gjjb9z0iy8vbl0zgfy8b";
+ name = "kollision-16.12.0.tar.xz";
};
};
kolourpaint = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kolourpaint-16.08.2.tar.xz";
- sha256 = "12rs8qgc30vma45ri7k3awigiqsk703lbl6k8dxbiir6nqdvz4n9";
- name = "kolourpaint-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kolourpaint-16.12.0.tar.xz";
+ sha256 = "0xapdx2h1ki3lmw6413d4zi6d23ag4cqbhnf8ndk49rk3nal8mlf";
+ name = "kolourpaint-16.12.0.tar.xz";
+ };
+ };
+ kommander = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/kommander-16.12.0.tar.xz";
+ sha256 = "03qx7s45dmbbz4yp3d5d0l70ihr5kw08xywirpgdn78gbrzgz5rm";
+ name = "kommander-16.12.0.tar.xz";
};
};
kompare = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kompare-16.08.2.tar.xz";
- sha256 = "130019r4623wkmw44s62wnn01l96bc0b0d3l0m6nzgilxq8xj7xw";
- name = "kompare-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kompare-16.12.0.tar.xz";
+ sha256 = "0yxnc7w7zzbra9n7hwv3mccxivivj9dzv8d2va110cm1h7gx5v06";
+ name = "kompare-16.12.0.tar.xz";
+ };
+ };
+ konqueror = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/konqueror-16.12.0.tar.xz";
+ sha256 = "18xc0d8hryi6c80ka93n83wlyb208mk8yxvxcx5b0b76yhz642d2";
+ name = "konqueror-16.12.0.tar.xz";
};
};
konquest = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/konquest-16.08.2.tar.xz";
- sha256 = "1m5pifwhzviz5hry0a26nvfh4j962mc7dnvl5n7yjwgnmk8m609m";
- name = "konquest-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/konquest-16.12.0.tar.xz";
+ sha256 = "0811a1649hqavgix8y7b3ngcngpxnz1gf6nf5ljydf5nlja612ai";
+ name = "konquest-16.12.0.tar.xz";
};
};
konsole = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/konsole-16.08.2.tar.xz";
- sha256 = "0kjf2yj5kz70pswrpkggz1zhwvm819r1qhg16i6xg43cpsfsim85";
- name = "konsole-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/konsole-16.12.0.tar.xz";
+ sha256 = "125arsfrzh9103gpw67pb4h63zjmn4653rnqm17hvcdpibs5x7lk";
+ name = "konsole-16.12.0.tar.xz";
+ };
+ };
+ kontact = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/kontact-16.12.0.tar.xz";
+ sha256 = "1ym07xfmyy60h2hf575gllhhprgx3n9q5mqqj3z444ipd5z73jhx";
+ name = "kontact-16.12.0.tar.xz";
};
};
kontactinterface = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kontactinterface-16.08.2.tar.xz";
- sha256 = "1c8q9jywr8c3yag2vxlmkl5ri7wm7miyhgqkxavs9lyxbqqkcgnw";
- name = "kontactinterface-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kontactinterface-16.12.0.tar.xz";
+ sha256 = "16gw9sq1s9szw9zh1dp025qqj2al6yqf5c1yqkvp94y6kgw901gi";
+ name = "kontactinterface-16.12.0.tar.xz";
};
};
kopete = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kopete-16.08.2.tar.xz";
- sha256 = "0jxrgb36snfgqbl4q1myala63pyrvaw1jvc9pf5bbkx8xpr5pk2c";
- name = "kopete-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kopete-16.12.0.tar.xz";
+ sha256 = "1297ixqq2g5kqvyap2md5y0nm11027sjffq47m99yrxvsb3z5v60";
+ name = "kopete-16.12.0.tar.xz";
+ };
+ };
+ korganizer = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/korganizer-16.12.0.tar.xz";
+ sha256 = "1xfgklw266zv83d57g1q9yqkzwlr06bf5gg76ac9qfn6fczc5qs7";
+ name = "korganizer-16.12.0.tar.xz";
};
};
kpat = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kpat-16.08.2.tar.xz";
- sha256 = "12mm57bpx92kbrk9f1xzvlg7knfhivgrqwa90lj6mgdsa39g27v2";
- name = "kpat-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kpat-16.12.0.tar.xz";
+ sha256 = "00kwpv1zhrj428qbi38fcd87bzkdvq79jcj2z2wlxf496kdr73z3";
+ name = "kpat-16.12.0.tar.xz";
};
};
kpimtextedit = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kpimtextedit-16.08.2.tar.xz";
- sha256 = "1ybwx73zzyknlrg7yw8yb8dkr0wwk9632s3w7g64nskm5ps51vvv";
- name = "kpimtextedit-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kpimtextedit-16.12.0.tar.xz";
+ sha256 = "1yj3ihl3r04av6bcw6g574ix5xq3vy7xn1bxf5lldxcs0d56485h";
+ name = "kpimtextedit-16.12.0.tar.xz";
};
};
kppp = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kppp-16.08.2.tar.xz";
- sha256 = "0xp6qcdnl3dcivkx0mavzjw2shah1wl8vd5b15chnf1qn1pa00qv";
- name = "kppp-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kppp-16.12.0.tar.xz";
+ sha256 = "1s760apss671855cc35r52vyrh1n65miibsr9x66fssy2dixbm8a";
+ name = "kppp-16.12.0.tar.xz";
};
};
kqtquickcharts = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kqtquickcharts-16.08.2.tar.xz";
- sha256 = "16qzqv3g7kckc5biphzzv7gmly2519mihd89118yksymp70cznh6";
- name = "kqtquickcharts-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kqtquickcharts-16.12.0.tar.xz";
+ sha256 = "170490rl9j73zw4679p5l08rxg4x9agc2xvig029maarkbymy46i";
+ name = "kqtquickcharts-16.12.0.tar.xz";
};
};
krdc = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/krdc-16.08.2.tar.xz";
- sha256 = "1jxkv7fsml1iq87y9jm04dhp7qxqyv5dnvp1yg5225xnvq2lhrzn";
- name = "krdc-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/krdc-16.12.0.tar.xz";
+ sha256 = "1n0wwb16kfhzsqxj0d1y5ms6k7i568aggrip27l8hgj3bnp1lfv9";
+ name = "krdc-16.12.0.tar.xz";
};
};
kremotecontrol = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kremotecontrol-16.08.2.tar.xz";
- sha256 = "1p5cvls132p585v5yxaw6b9fadmr1qzijh86z232amfb8iax23zg";
- name = "kremotecontrol-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kremotecontrol-16.12.0.tar.xz";
+ sha256 = "1h2znx0vqa9i4qg4b6mdlg4i5pzif266f81wa3kkh2zqw6qiyd77";
+ name = "kremotecontrol-16.12.0.tar.xz";
};
};
kreversi = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kreversi-16.08.2.tar.xz";
- sha256 = "10nn66422vr5sav7yf5z1vq84v7kl94f4zv2w4ywrgbaknwkhyf7";
- name = "kreversi-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kreversi-16.12.0.tar.xz";
+ sha256 = "01z4nwnpcbgd7y1xilwbjc803hqgzp3x89sif6zhkmcrvh17wzsd";
+ name = "kreversi-16.12.0.tar.xz";
};
};
krfb = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/krfb-16.08.2.tar.xz";
- sha256 = "0kz7x4mwby8v7d3wr9fpd362db9fmh0agym5rq4q8d68wvzgbyi9";
- name = "krfb-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/krfb-16.12.0.tar.xz";
+ sha256 = "0mdi6v4ijibr4cm0gsr5jid4qd1wi5i6bccqn1ii4v2v59pnrzyw";
+ name = "krfb-16.12.0.tar.xz";
};
};
kross-interpreters = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kross-interpreters-16.08.2.tar.xz";
- sha256 = "13jc263vj0jsqvhlcag8an5ixs3dn2q35q1p29wyy1fpd80snhcj";
- name = "kross-interpreters-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kross-interpreters-16.12.0.tar.xz";
+ sha256 = "1dsw0wzwnqz2hgw3s6gjs7bpvkxyqgc0nad7pj7gnhd4j68fr0h1";
+ name = "kross-interpreters-16.12.0.tar.xz";
};
};
kruler = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kruler-16.08.2.tar.xz";
- sha256 = "1cy7jx8nc9ajzpis13dvg7hpd1a76splc5yrqyhbmb7cga50098l";
- name = "kruler-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kruler-16.12.0.tar.xz";
+ sha256 = "0k30cw24ygcc1rbqx5hsy46w4laha733kkcvi0axzhgfkk19wbvq";
+ name = "kruler-16.12.0.tar.xz";
};
};
ksaneplugin = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ksaneplugin-16.08.2.tar.xz";
- sha256 = "1glvx52gzrprywmi8n3npjfm5ixx8ibx7126n6n284jwigcr580g";
- name = "ksaneplugin-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ksaneplugin-16.12.0.tar.xz";
+ sha256 = "17im3pjwchlqsgf8f6ml0i23s6y8x2p5pjfwrc4giwd1v83hh02s";
+ name = "ksaneplugin-16.12.0.tar.xz";
};
};
kscd = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kscd-16.08.2.tar.xz";
- sha256 = "0axjc68ag84pvdskbhwqyg40qmnil9n6m8x3z4k24cgajr83hmbq";
- name = "kscd-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kscd-16.12.0.tar.xz";
+ sha256 = "0g8307qby224zhravfm350mkknhj44rjxcs04pgws3y3ra0bqzcz";
+ name = "kscd-16.12.0.tar.xz";
};
};
kshisen = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kshisen-16.08.2.tar.xz";
- sha256 = "1605fmsrg2pyydg303kf49hncdjcdq8m2g2xam0c96bdn44kd7cp";
- name = "kshisen-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kshisen-16.12.0.tar.xz";
+ sha256 = "1i2mbh1nwwpvns9nkzr7bl5gxk5v58psbw2fad0gxddbcng2sbnh";
+ name = "kshisen-16.12.0.tar.xz";
};
};
ksirk = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ksirk-16.08.2.tar.xz";
- sha256 = "196fjfyrwspzcm2hlqr09a079sr8p4gp80c4xfj1dhmfavs3cmvx";
- name = "ksirk-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ksirk-16.12.0.tar.xz";
+ sha256 = "1rzp5b35x7yiz1cyfbw80b1wzf68bd3k5ax4pl12q15h1wpcr582";
+ name = "ksirk-16.12.0.tar.xz";
};
};
ksnakeduel = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ksnakeduel-16.08.2.tar.xz";
- sha256 = "0nw1fsd7q9ar0922v3gkpig8smvlw0va6jh9a4v8g4pfsk5avii5";
- name = "ksnakeduel-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ksnakeduel-16.12.0.tar.xz";
+ sha256 = "12ybsl1awsz1pygpgfbzfyyql24znafmll6qcydcg07rjxld9ywq";
+ name = "ksnakeduel-16.12.0.tar.xz";
};
};
kspaceduel = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kspaceduel-16.08.2.tar.xz";
- sha256 = "1ww7cz89jkn28qpk0a3xpcv9ngh39wwzpiam64pjlnniycxw3zk8";
- name = "kspaceduel-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kspaceduel-16.12.0.tar.xz";
+ sha256 = "1rpacxbzg8rdl1hmm6nvksjj8z4cwqyh0v8javazf8ngas29bijj";
+ name = "kspaceduel-16.12.0.tar.xz";
};
};
ksquares = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ksquares-16.08.2.tar.xz";
- sha256 = "04j30ld2ly6gm1va0yw2vsfrvab5kla6dlxir31375b1w85gfhil";
- name = "ksquares-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ksquares-16.12.0.tar.xz";
+ sha256 = "16gd9l9bm96dv6srl11blxh15n3invh7znzxikxspjzckm3jqc5q";
+ name = "ksquares-16.12.0.tar.xz";
};
};
kstars = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kstars-16.08.2.tar.xz";
- sha256 = "117hk0wj649f2b158sad0jcqsrb1a8cw0blx3yz83fxw8z160j2x";
- name = "kstars-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kstars-16.12.0.tar.xz";
+ sha256 = "0j6g58xlasxa23vqc12kzl4ijaw34wncdvrsfgdzi3b9bvqy3njm";
+ name = "kstars-16.12.0.tar.xz";
};
};
ksudoku = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ksudoku-16.08.2.tar.xz";
- sha256 = "0y3w626g3ah8r3yipxsqg71gh886higlmr8ai0sc8179gcmy84zd";
- name = "ksudoku-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ksudoku-16.12.0.tar.xz";
+ sha256 = "05jak7hg3yn9dwbinhny0av5rhj1r9zzp7l79nrg8nbm52jnyy4m";
+ name = "ksudoku-16.12.0.tar.xz";
};
};
ksystemlog = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ksystemlog-16.08.2.tar.xz";
- sha256 = "02l7bchc767jcdpyras24k57qddq7pk4h7jaa22ns134977rw8yb";
- name = "ksystemlog-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ksystemlog-16.12.0.tar.xz";
+ sha256 = "0q3ca4c98a0j8d0370gaczqqs32446hyyf70kf7rxmr6f35d7y4q";
+ name = "ksystemlog-16.12.0.tar.xz";
};
};
kteatime = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kteatime-16.08.2.tar.xz";
- sha256 = "02knfjpb0p3bgdfwqjp3fqnqz4i6cqshhy14w71wviprybb40cxd";
- name = "kteatime-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kteatime-16.12.0.tar.xz";
+ sha256 = "1b05ahhdmjlp3fknmbp5c050sgx8iih3j3xxp0bj998xbh975s88";
+ name = "kteatime-16.12.0.tar.xz";
};
};
ktimer = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ktimer-16.08.2.tar.xz";
- sha256 = "197m6ywq2bs7kclwxsdv7w4mqfhs9ad3wgcbw6m3yvkyz03xl3p8";
- name = "ktimer-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ktimer-16.12.0.tar.xz";
+ sha256 = "11lb7isyr2qc2fh0ypqrs0xzfiwby94hgr4ilv0sd052kvzxwmry";
+ name = "ktimer-16.12.0.tar.xz";
};
};
ktnef = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ktnef-16.08.2.tar.xz";
- sha256 = "0mpavsp6p2ipxf90ararnvz7qvb51fy3w7rh5giv3j9wc37awi39";
- name = "ktnef-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ktnef-16.12.0.tar.xz";
+ sha256 = "0f4nkmy3rdy6kk3l83r7j404vpdgmxy3hls18j8bm5jkhv6n08rh";
+ name = "ktnef-16.12.0.tar.xz";
};
};
ktouch = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ktouch-16.08.2.tar.xz";
- sha256 = "08zzibxcv8gh527j0qwnhjs4rsk01hrx5iqa9d4r2b508h6xcwm2";
- name = "ktouch-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ktouch-16.12.0.tar.xz";
+ sha256 = "05yhrjb536v98sh8l979psd824ilj4cj3wcbbfbqkpnv0i4agxf2";
+ name = "ktouch-16.12.0.tar.xz";
};
};
ktp-accounts-kcm = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ktp-accounts-kcm-16.08.2.tar.xz";
- sha256 = "1ql13gkc16a0xjs159pjkw810dph0f3c8lvjxlgzg5dnavjpkmsm";
- name = "ktp-accounts-kcm-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ktp-accounts-kcm-16.12.0.tar.xz";
+ sha256 = "1lwkajaj9zjk1hksx7b5x73a09kri69bq6bxsr1fwi9m47608bhm";
+ name = "ktp-accounts-kcm-16.12.0.tar.xz";
};
};
ktp-approver = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ktp-approver-16.08.2.tar.xz";
- sha256 = "1n885817as1j9s8c6ppj02hcih4v7k778q88lbxwnps32la7m6n9";
- name = "ktp-approver-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ktp-approver-16.12.0.tar.xz";
+ sha256 = "124448c05cr1y6032fkqdb46n3ynyh2njxmn52zn814i797pwz6b";
+ name = "ktp-approver-16.12.0.tar.xz";
};
};
ktp-auth-handler = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ktp-auth-handler-16.08.2.tar.xz";
- sha256 = "1vfnj1id8jisxsalghr13blx8x19r376dc2v4w46jqxj1xaiwglx";
- name = "ktp-auth-handler-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ktp-auth-handler-16.12.0.tar.xz";
+ sha256 = "0ya8q9qvq72vfp5yhb3jd2am83i42cap2yl1xykfwib0r8lmfakb";
+ name = "ktp-auth-handler-16.12.0.tar.xz";
};
};
ktp-call-ui = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ktp-call-ui-16.08.2.tar.xz";
- sha256 = "0jk09x53cimcs24cj3ay9al0r91xjwqf5cjnj16ibbnqhxd8rym1";
- name = "ktp-call-ui-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ktp-call-ui-16.12.0.tar.xz";
+ sha256 = "1qyiipyffhav5wxi7cjbshi9x9fam0snbdl4sqca3nly1cn1k21k";
+ name = "ktp-call-ui-16.12.0.tar.xz";
};
};
ktp-common-internals = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ktp-common-internals-16.08.2.tar.xz";
- sha256 = "1mw4cmrpk705dcka1v3fhvfz3q1r142yrik98jma8v4pjlm84n70";
- name = "ktp-common-internals-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ktp-common-internals-16.12.0.tar.xz";
+ sha256 = "1xlfgs2gc15443vb3pyly0zbrmaliq3nvs7w25ldks8z72m6gqf6";
+ name = "ktp-common-internals-16.12.0.tar.xz";
};
};
ktp-contact-list = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ktp-contact-list-16.08.2.tar.xz";
- sha256 = "0rsljaimdqvrxfp8sq1bckzkx23xr5pq2q9mrgh0zy39abmdak25";
- name = "ktp-contact-list-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ktp-contact-list-16.12.0.tar.xz";
+ sha256 = "1dkndda4xhb7x76m43gbz67jc4bd50bj8mzyyvblijq6rn2a4wsr";
+ name = "ktp-contact-list-16.12.0.tar.xz";
};
};
ktp-contact-runner = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ktp-contact-runner-16.08.2.tar.xz";
- sha256 = "0b3rhrvgmkwcsk9jdr6j8kg80zrwdsza8297hrzfv76bpxn60dbn";
- name = "ktp-contact-runner-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ktp-contact-runner-16.12.0.tar.xz";
+ sha256 = "0754q5mxghba6imh20qk1qaxbq2c9z6qls5pybjzm71bzbwaf2wg";
+ name = "ktp-contact-runner-16.12.0.tar.xz";
};
};
ktp-desktop-applets = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ktp-desktop-applets-16.08.2.tar.xz";
- sha256 = "0d8ypp531zhb6i8w703hr02cb863z0g8sbaadrrp3x4h2dff2kcv";
- name = "ktp-desktop-applets-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ktp-desktop-applets-16.12.0.tar.xz";
+ sha256 = "0jq0j9i2r9nq3i7g7qg6vnca2vyb5fhx8jcd45yml4clxg6xggjy";
+ name = "ktp-desktop-applets-16.12.0.tar.xz";
};
};
ktp-filetransfer-handler = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ktp-filetransfer-handler-16.08.2.tar.xz";
- sha256 = "0vh6h9cbamscjm22rib1dx8crr6r4a1bq5p2rrq6bq56zp78gkfb";
- name = "ktp-filetransfer-handler-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ktp-filetransfer-handler-16.12.0.tar.xz";
+ sha256 = "1mfmx4jxzpz81df53b2gy8l2rrfqszqjcmjp5s30k0cyrrqiq1v1";
+ name = "ktp-filetransfer-handler-16.12.0.tar.xz";
};
};
ktp-kded-module = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ktp-kded-module-16.08.2.tar.xz";
- sha256 = "1lh1pi7xi60dsyz5g608lsfhpr5p8vqsfdc2cmyaalkcixb7s4wg";
- name = "ktp-kded-module-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ktp-kded-module-16.12.0.tar.xz";
+ sha256 = "192aynmagrmxyil9sc19r37kj28fgcyyivija8q22jwfhh7ds5w6";
+ name = "ktp-kded-module-16.12.0.tar.xz";
};
};
ktp-send-file = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ktp-send-file-16.08.2.tar.xz";
- sha256 = "0q6mnirx6k8xs6pkfwrrhgg1i75xrd9bsg2liyjrjgbgm1lwm0jz";
- name = "ktp-send-file-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ktp-send-file-16.12.0.tar.xz";
+ sha256 = "0g808dndrr2cb0xcjl643r23zxnaqnycvkinbd9783nkw9i5ak87";
+ name = "ktp-send-file-16.12.0.tar.xz";
};
};
ktp-text-ui = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ktp-text-ui-16.08.2.tar.xz";
- sha256 = "1wrxa65rx0vjd57qk4c7ak43vb9h8yv7r7618hnfycjr0mgr6gf5";
- name = "ktp-text-ui-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ktp-text-ui-16.12.0.tar.xz";
+ sha256 = "1fhlgfs6ynkmqyjypr0922y2p32jqk3j7v08x6wxacp5aifx5i22";
+ name = "ktp-text-ui-16.12.0.tar.xz";
};
};
ktuberling = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/ktuberling-16.08.2.tar.xz";
- sha256 = "0337fvw21h62y8zlib93fyk5wbwrgkakpyd78q5mcn5sazq7nb67";
- name = "ktuberling-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/ktuberling-16.12.0.tar.xz";
+ sha256 = "1z0hhidjandl2bd9d9pihk16yqqyn75z6hn5sxdx5z1icpxdkara";
+ name = "ktuberling-16.12.0.tar.xz";
};
};
kturtle = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kturtle-16.08.2.tar.xz";
- sha256 = "1fljwnxr8vvy78mlwf58p48wv45g6k4w9xs6kzb0j3xayg389x36";
- name = "kturtle-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kturtle-16.12.0.tar.xz";
+ sha256 = "1nxijmai4b2ddg6km2krxzrz46djazcqn4xqi6sdr2yv4rsw4467";
+ name = "kturtle-16.12.0.tar.xz";
};
};
kubrick = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kubrick-16.08.2.tar.xz";
- sha256 = "19avy6001n7kbxnbqbxxv62qwn015z8jjslys6s81if8bh9b81bl";
- name = "kubrick-16.08.2.tar.xz";
- };
- };
- kuser = {
- version = "16.08.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kuser-16.08.2.tar.xz";
- sha256 = "0vlckiy3n0ghfzjkl22pk29qrl8y7hh6a9q4bfj7a8mwmkskr8qc";
- name = "kuser-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kubrick-16.12.0.tar.xz";
+ sha256 = "0xrfdmxr7p7m11rgpa0ag247pkr88k1l4br59k6gr92vpxghd1l0";
+ name = "kubrick-16.12.0.tar.xz";
};
};
kwalletmanager = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kwalletmanager-16.08.2.tar.xz";
- sha256 = "0nmriayyhxhf43kladp6bpzrrmdfgf6lbyr1ibpqp33mqrxqgiqf";
- name = "kwalletmanager-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kwalletmanager-16.12.0.tar.xz";
+ sha256 = "01w97cax7smayp536d4javjksg0l2yz1c9i39rh195gaz8wnglxy";
+ name = "kwalletmanager-16.12.0.tar.xz";
+ };
+ };
+ kwave = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/kwave-16.12.0.tar.xz";
+ sha256 = "07wx614nq5dhym5dlpfvyxbh9asadxbpx6niyl5g7z4xvq2kms8f";
+ name = "kwave-16.12.0.tar.xz";
};
};
kwordquiz = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/kwordquiz-16.08.2.tar.xz";
- sha256 = "0xlhl3n1dl1y6d1kbbcw4p60hkyjlvavrslq1h7wwjp99pmqr333";
- name = "kwordquiz-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/kwordquiz-16.12.0.tar.xz";
+ sha256 = "0md3a3q16xghv94hqik0jzvg1nwihagdapdn3pz0k4p8nypykz8k";
+ name = "kwordquiz-16.12.0.tar.xz";
};
};
libgravatar = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/libgravatar-16.08.2.tar.xz";
- sha256 = "0nssi286sra4rggvljwvqwx5r2h0h26wmafq764vj97qqw2r3ikw";
- name = "libgravatar-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/libgravatar-16.12.0.tar.xz";
+ sha256 = "0nwz8a2kv66b57f3032xl05mxxasvg4k7ap30smlfxlzfm1p48sc";
+ name = "libgravatar-16.12.0.tar.xz";
};
};
libkcddb = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/libkcddb-16.08.2.tar.xz";
- sha256 = "0hvhl4266h1a05bvid1x7kfaxqa5fcnr4f243k5ksjp7sxcba1j2";
- name = "libkcddb-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/libkcddb-16.12.0.tar.xz";
+ sha256 = "0f9b2gddjia47mi8rm6vb2h3nycwyiyj6fz3w7kwwv32mnbwmqsg";
+ name = "libkcddb-16.12.0.tar.xz";
};
};
libkcompactdisc = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/libkcompactdisc-16.08.2.tar.xz";
- sha256 = "1vvhbqg7rzcfqadglvjrifnla6gi6aawh0ki36zshi48jhpg978w";
- name = "libkcompactdisc-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/libkcompactdisc-16.12.0.tar.xz";
+ sha256 = "0lh6gna28kxja9v5cmz4qnzdlzz3bnxs1x24v2nzvq4lds73rwrp";
+ name = "libkcompactdisc-16.12.0.tar.xz";
};
};
libkdcraw = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/libkdcraw-16.08.2.tar.xz";
- sha256 = "179dv05qkn2h0szzqm6l09ln491q2jz6j0fwczakh7lvlrdb2zxa";
- name = "libkdcraw-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/libkdcraw-16.12.0.tar.xz";
+ sha256 = "0pz1jll1amc42gjzdf7ic43ncd73mrp4cjhwgwmqh7aik2sjmr5m";
+ name = "libkdcraw-16.12.0.tar.xz";
};
};
libkdegames = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/libkdegames-16.08.2.tar.xz";
- sha256 = "1zzpdlyrhhzqis9f9q3b1b50ljcsmpccxq0bdqkjm3ahzw8rvdig";
- name = "libkdegames-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/libkdegames-16.12.0.tar.xz";
+ sha256 = "0ql18w1gliz2k9g460fgh7pwy9r0p0narzc7bzdzv2pc4r2v7w0f";
+ name = "libkdegames-16.12.0.tar.xz";
};
};
libkdepim = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/libkdepim-16.08.2.tar.xz";
- sha256 = "1w7bkkcpyw4b14qz7jh9kw5z2q7qdk78lac3fh448xdhf1ci6svg";
- name = "libkdepim-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/libkdepim-16.12.0.tar.xz";
+ sha256 = "09q2z688kkbwiysqzxq2id77fv7sxq3vbs1q88saw8qvhhb4vs5q";
+ name = "libkdepim-16.12.0.tar.xz";
};
};
libkeduvocdocument = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/libkeduvocdocument-16.08.2.tar.xz";
- sha256 = "1f0vyblxyha6c09nkya7q4v0j24463qpxxkkghm2z1xb0fwc852x";
- name = "libkeduvocdocument-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/libkeduvocdocument-16.12.0.tar.xz";
+ sha256 = "1kd795z0lkh1b3hgdca36l0wgac1m4g38q5igs40fjz6nakwqczk";
+ name = "libkeduvocdocument-16.12.0.tar.xz";
};
};
libkexiv2 = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/libkexiv2-16.08.2.tar.xz";
- sha256 = "00phw7qax09k2aapyx1rp5w7ifn73i7w83jpz3sr24njxbg49261";
- name = "libkexiv2-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/libkexiv2-16.12.0.tar.xz";
+ sha256 = "019lnz2d5m47xx6h48ykhd1ln9bq0wch676ddpywp4kfnlyqs2vc";
+ name = "libkexiv2-16.12.0.tar.xz";
};
};
libkface = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/libkface-16.08.2.tar.xz";
- sha256 = "10arzszgjx8zs0d2b0i74bf00bs0csikny4d9j5w5hiim4qhxza6";
- name = "libkface-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/libkface-16.12.0.tar.xz";
+ sha256 = "02i0qk5q0sbb2m34qg9zrm6whxm9qasi4h5k3fr110k8dwc393v7";
+ name = "libkface-16.12.0.tar.xz";
};
};
libkgeomap = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/libkgeomap-16.08.2.tar.xz";
- sha256 = "1h91bdld51snajrws9g4pr7n3nlwmpnpg95xhh91fykiqlw919ig";
- name = "libkgeomap-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/libkgeomap-16.12.0.tar.xz";
+ sha256 = "0n17db1jb1xbjfdmrgi57ndhp4bgwwsk26026zxh1ipqavdrpjg8";
+ name = "libkgeomap-16.12.0.tar.xz";
};
};
libkipi = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/libkipi-16.08.2.tar.xz";
- sha256 = "13gkcjx3x6j5150pkbb5ijzasl4418rhlfxq70966zrsn9a7v6ad";
- name = "libkipi-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/libkipi-16.12.0.tar.xz";
+ sha256 = "1pj3cpz7q1jiz2yhvk2g6fz2pwblblxj6qzlsyqs156j98ayjk6g";
+ name = "libkipi-16.12.0.tar.xz";
};
};
libkleo = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/libkleo-16.08.2.tar.xz";
- sha256 = "16k8qqhrchxc8hk4l6hi94nhn8pavqm0snh357bx293f5rxvk51g";
- name = "libkleo-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/libkleo-16.12.0.tar.xz";
+ sha256 = "0g394bykb9f93f3i4r9y666n72wsbk2njc4b86n5hkw94pcgavlq";
+ name = "libkleo-16.12.0.tar.xz";
};
};
libkmahjongg = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/libkmahjongg-16.08.2.tar.xz";
- sha256 = "12lnqpdpzcpljsdhj7y624g4iigam2cym7yv1czir26nfflk61ij";
- name = "libkmahjongg-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/libkmahjongg-16.12.0.tar.xz";
+ sha256 = "1jh3qh3833faa66jvxy28j24zr9wg1chg0rx95zpjpqg9xllqzir";
+ name = "libkmahjongg-16.12.0.tar.xz";
};
};
libkomparediff2 = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/libkomparediff2-16.08.2.tar.xz";
- sha256 = "0d08mgswjck9lfagf0wh556vy1k2k8414ps6jhikmsbff6s44i35";
- name = "libkomparediff2-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/libkomparediff2-16.12.0.tar.xz";
+ sha256 = "1yxgy4hpd8am6501aqz3018d4v36ipp4g393xc0mq7ygbsmb9sj3";
+ name = "libkomparediff2-16.12.0.tar.xz";
};
};
libksane = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/libksane-16.08.2.tar.xz";
- sha256 = "1clk8yh3sb61xll0wpni2ccixsvxp4d0k5k8ygyb3m1glf802z5a";
- name = "libksane-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/libksane-16.12.0.tar.xz";
+ sha256 = "05m9fl22hfcd41jn2hxj9yms027rjs2gfrhsksvl80m18j6ix51b";
+ name = "libksane-16.12.0.tar.xz";
};
};
libksieve = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/libksieve-16.08.2.tar.xz";
- sha256 = "0a0gym7y4qp83fs94y0xvm5i1qbh1vxy1wz2rw74k82cbj1yzviw";
- name = "libksieve-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/libksieve-16.12.0.tar.xz";
+ sha256 = "1fcxs8bwb32pbprb8x4ld3s1m2mv44awlb9014nqb9gw8xikrci1";
+ name = "libksieve-16.12.0.tar.xz";
};
};
lokalize = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/lokalize-16.08.2.tar.xz";
- sha256 = "13misqakj232y7ib89clgcc7r6byw7n2894x0ylkahj8synm1y3c";
- name = "lokalize-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/lokalize-16.12.0.tar.xz";
+ sha256 = "06k5wkx8wmhrl0ff0rix9fr2hhbxh0cm0mskajwavg9hcd3aga36";
+ name = "lokalize-16.12.0.tar.xz";
};
};
lskat = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/lskat-16.08.2.tar.xz";
- sha256 = "1i2s10csw9k6zjw9yk03l9p5xmg2gpw86xbsxp094xcncg7yml3v";
- name = "lskat-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/lskat-16.12.0.tar.xz";
+ sha256 = "1mlvg3iwz0klsnd258dgqs1zz7sz25l3bbwyvfz5r8j3k1gllw5q";
+ name = "lskat-16.12.0.tar.xz";
};
};
mailcommon = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/mailcommon-16.08.2.tar.xz";
- sha256 = "1s3n834i9c33ldrrsq8vqsllnnicaginrqj7cm6lm317q0mgiiiw";
- name = "mailcommon-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/mailcommon-16.12.0.tar.xz";
+ sha256 = "1a25b8akcf1k957jbbcr21ksw3kl0vbs2xn28hzqzlbg5hsnw9yy";
+ name = "mailcommon-16.12.0.tar.xz";
};
};
mailimporter = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/mailimporter-16.08.2.tar.xz";
- sha256 = "08a0b7yk02df2fhr7cazm4x3v1qg67rzk0z2f14ssp7sz835bpia";
- name = "mailimporter-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/mailimporter-16.12.0.tar.xz";
+ sha256 = "1z1lml4hlzzk7kj6ln3p0gz5pganwrjl57zvn0mpbwxsbpdkf8gk";
+ name = "mailimporter-16.12.0.tar.xz";
};
};
marble = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/marble-16.08.2.tar.xz";
- sha256 = "1y8mqafji4lr8q1caipdgbrqcbivirzi8r6vw1iz3fjfbhi71c77";
- name = "marble-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/marble-16.12.0.tar.xz";
+ sha256 = "06hpwwqa62z63fsiw5qa50pbkjkyy93h14l9xphnwmcr8cjnfh8x";
+ name = "marble-16.12.0.tar.xz";
+ };
+ };
+ mbox-importer = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/mbox-importer-16.12.0.tar.xz";
+ sha256 = "0pk751sjniz8kalydg2gl48w2v9jqcsp6qclgccxrm7rj7nsmyr2";
+ name = "mbox-importer-16.12.0.tar.xz";
};
};
messagelib = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/messagelib-16.08.2.tar.xz";
- sha256 = "1kmiww8051bfldxb1yx1b45k78ihvsm3z7pbmdnw06nlz8a8xycb";
- name = "messagelib-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/messagelib-16.12.0.tar.xz";
+ sha256 = "0n65xk2prhwjn172b47qjvml20hmff9qspk6dczx3b8knamzsyj4";
+ name = "messagelib-16.12.0.tar.xz";
};
};
minuet = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/minuet-16.08.2.tar.xz";
- sha256 = "1cshjbzdjfs0g8lqxq6n7hnh032scrymapfc8il58rb3hir2fa0s";
- name = "minuet-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/minuet-16.12.0.tar.xz";
+ sha256 = "17yjs7hwr71f78zx89g83md5mad5g3rgxfxhnmc1hvwclcri12nv";
+ name = "minuet-16.12.0.tar.xz";
};
};
okteta = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/okteta-16.08.2.tar.xz";
- sha256 = "0gzriksvd8f409j63hyiqrj4j739f6apf99r4ic6271y50np9fk0";
- name = "okteta-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/okteta-16.12.0.tar.xz";
+ sha256 = "0n334ksh2c7s5bavhgks1a11mr1w6pf6lvfb51735r379xxh6yqh";
+ name = "okteta-16.12.0.tar.xz";
};
};
okular = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/okular-16.08.2.tar.xz";
- sha256 = "1hih12hk0jckprfphb0l67qpsrc2vgxvvvjb9wnvxqyvy29sk37k";
- name = "okular-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/okular-16.12.0.tar.xz";
+ sha256 = "0a8g2845c0f6z2k6d4f8fccfa9zhqls2yaj1pkasrg8xmanmpmbd";
+ name = "okular-16.12.0.tar.xz";
};
};
palapeli = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/palapeli-16.08.2.tar.xz";
- sha256 = "1skx37v3vx45xdn8m3g69qw1rnkhzzmnfxv5z0yiqvc9jdxl1zrh";
- name = "palapeli-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/palapeli-16.12.0.tar.xz";
+ sha256 = "1ix8xhsif0pa1zsgwn33sqf1kclkpz8mhbviqjzh5ds80dyychdn";
+ name = "palapeli-16.12.0.tar.xz";
};
};
parley = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/parley-16.08.2.tar.xz";
- sha256 = "19m8czgzvr7rg5hcgig4sf28rngqdsx27c3p7qrmwg9xw2b3pgbr";
- name = "parley-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/parley-16.12.0.tar.xz";
+ sha256 = "1lvimp0fjy12973rjqa9y0680x19hqln2dmywqmg7fxyhk3ilwv3";
+ name = "parley-16.12.0.tar.xz";
};
};
picmi = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/picmi-16.08.2.tar.xz";
- sha256 = "1z90b98rf7b089kl4gcll86xlq4d49lh4nl6lngbb6vv7xgcz740";
- name = "picmi-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/picmi-16.12.0.tar.xz";
+ sha256 = "03i8g7c84cyg1bn1d70cf34pw2bgfsnhvvjfavzzmmb0kmkj5nhw";
+ name = "picmi-16.12.0.tar.xz";
};
};
pimcommon = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/pimcommon-16.08.2.tar.xz";
- sha256 = "1gkx3qqnmckf9hy9kysgil2m6kg1h920ywj8kq0fafxhg57w6pc1";
- name = "pimcommon-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/pimcommon-16.12.0.tar.xz";
+ sha256 = "1crz2g2wcgq22vxxywvislw0n7rc21z08rsgcyq6m0dqcv96063l";
+ name = "pimcommon-16.12.0.tar.xz";
+ };
+ };
+ pim-data-exporter = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/pim-data-exporter-16.12.0.tar.xz";
+ sha256 = "0x2nrspv4bc91ir361y6sp80a9c4nm8fwjzy76q3j23kvyk838m9";
+ name = "pim-data-exporter-16.12.0.tar.xz";
+ };
+ };
+ pim-sieve-editor = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/pim-sieve-editor-16.12.0.tar.xz";
+ sha256 = "0da0fav852yazrlpinnsr97jm1vc5335wc3wb1rbcamcrvkkpz5r";
+ name = "pim-sieve-editor-16.12.0.tar.xz";
+ };
+ };
+ pim-storage-service-manager = {
+ version = "16.12.0";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/16.12.0/src/pim-storage-service-manager-16.12.0.tar.xz";
+ sha256 = "1b3z8z921nfmqs2gn653jdsqma4xn3lf1imz942xbgc1w3000p64";
+ name = "pim-storage-service-manager-16.12.0.tar.xz";
};
};
poxml = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/poxml-16.08.2.tar.xz";
- sha256 = "0kpimgj0mrdbpma0pm2la1686y2nac4y5zd61qlmsczk0sc0g1d5";
- name = "poxml-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/poxml-16.12.0.tar.xz";
+ sha256 = "18q5lmwx5vdmj2kdi45rhi6cqnk9wrd1v7xc0xn842gjd7y42zh0";
+ name = "poxml-16.12.0.tar.xz";
};
};
print-manager = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/print-manager-16.08.2.tar.xz";
- sha256 = "06560241d1r4ca17n62r26yxdccnkx58k4w127z1xsi12bjihf1v";
- name = "print-manager-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/print-manager-16.12.0.tar.xz";
+ sha256 = "1na2kw6cdq2qkbjyaxi21cy4lkyalfyw50d6cvgpl4jgrmvdqc8h";
+ name = "print-manager-16.12.0.tar.xz";
};
};
rocs = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/rocs-16.08.2.tar.xz";
- sha256 = "0404sp8hf73r0mxn94j4371m2ks6gkwkm13mn8ycig2ys0w6dc6w";
- name = "rocs-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/rocs-16.12.0.tar.xz";
+ sha256 = "0lw5mrxjhxwwh7ms5jn576y303jzk54h79vf2qmf6hkmhmwwggam";
+ name = "rocs-16.12.0.tar.xz";
};
};
signon-kwallet-extension = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/signon-kwallet-extension-16.08.2.tar.xz";
- sha256 = "12vsk3fydpjwai3l4gm1irhc0157qn8hb81d96kr07zg8k3jqjhf";
- name = "signon-kwallet-extension-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/signon-kwallet-extension-16.12.0.tar.xz";
+ sha256 = "0shgg850cgnr3iihdhf4v04fmp1lc3hblgfwsrcyys23zh2xfqr5";
+ name = "signon-kwallet-extension-16.12.0.tar.xz";
};
};
spectacle = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/spectacle-16.08.2.tar.xz";
- sha256 = "1aylgyfsmg2jmgg090glns2qmy5bqsf43fwglvwmmfbly0h5i03h";
- name = "spectacle-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/spectacle-16.12.0.tar.xz";
+ sha256 = "1cri1yklzkdfhynfvlqrz21bmr58rcrlcg4g5n5wd71wl46v1m1i";
+ name = "spectacle-16.12.0.tar.xz";
};
};
step = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/step-16.08.2.tar.xz";
- sha256 = "1kiyc009cf0pw6qfn3ravfbch8cvsv5iv6cas8mcszh1wil3y14h";
- name = "step-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/step-16.12.0.tar.xz";
+ sha256 = "0ilnbk8ax18vk0sbziydm2mzlhp3kl3jymg7cllpb8kknsmjiky4";
+ name = "step-16.12.0.tar.xz";
};
};
svgpart = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/svgpart-16.08.2.tar.xz";
- sha256 = "1idfmmmg65cqga1klmd2vwp8abpafda4z1fsd4p383wfjkmwgp09";
- name = "svgpart-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/svgpart-16.12.0.tar.xz";
+ sha256 = "0cqlzxcnqsxyq60dlglpzz3081slr0fwf9bq1pv4d80fs84yj1nw";
+ name = "svgpart-16.12.0.tar.xz";
};
};
sweeper = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/sweeper-16.08.2.tar.xz";
- sha256 = "0y777yz51rs9m9lrx41mrj0wmp83vz6xc353acdk8ilm8lfqc9qh";
- name = "sweeper-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/sweeper-16.12.0.tar.xz";
+ sha256 = "0lha6m8aa8jwlkcyzwc11l48197m90apwv5fbbiy67h2gj105izr";
+ name = "sweeper-16.12.0.tar.xz";
};
};
syndication = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/syndication-16.08.2.tar.xz";
- sha256 = "171swz7dqxp8c198hlprpj3lzdryvbz3603iawxh6663fa1da2lx";
- name = "syndication-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/syndication-16.12.0.tar.xz";
+ sha256 = "1z0mfklr3f7081smxihvcck5arzvzqy3bnyf2wdj92wlj4k974km";
+ name = "syndication-16.12.0.tar.xz";
};
};
umbrello = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/umbrello-16.08.2.tar.xz";
- sha256 = "0m32lxzilzyycw9jb72zxzprcwk19sj5h45hvz6w9nvrk9k80a6h";
- name = "umbrello-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/umbrello-16.12.0.tar.xz";
+ sha256 = "01zkrlg1iz0qampzxp77kralz4s9kw02lz5x2114mfjh8l3h65f6";
+ name = "umbrello-16.12.0.tar.xz";
};
};
zeroconf-ioslave = {
- version = "16.08.2";
+ version = "16.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/16.08.2/src/zeroconf-ioslave-16.08.2.tar.xz";
- sha256 = "0yl1cnpn86gkbdg0h8y1kdyjj4b3n3wmp9ifmczfd6jw7hsvwrm6";
- name = "zeroconf-ioslave-16.08.2.tar.xz";
+ url = "${mirror}/stable/applications/16.12.0/src/zeroconf-ioslave-16.12.0.tar.xz";
+ sha256 = "0alfyp22w72yf7gaxgiqini6nv0qkjjnkgicph9z2yiysywq57a2";
+ name = "zeroconf-ioslave-16.12.0.tar.xz";
};
};
}
diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix
index bb123fcdab4..36850824d63 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 0809f2d6693..60928c3900d 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 44a7575526f..f880f2e3ab2 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 7e8823e2db9..8d4098ca31f 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 08daf740183..75f44f47bec 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 256f9949e83..63c62f12321 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 < gtk2 != null;
+assert withTeensyduino -> withGui;
+# TODO: Teensyduino is disabled for i686-linux due to an indefinite hang in the
+# xdotool script; the cause of this hang is not yet known.
+# TODO: There is a fair chance that Teensyduino works with arm-linux, but it
+# has not yet been tested.
+if withTeensyduino && (stdenv.system != "x86_64-linux") then throw
+ "Teensyduino is only supported on x86_64-linux at this time (patches welcome)."
+else
let
externalDownloads = import ./downloads.nix {inherit fetchurl; inherit (lib) optionalAttrs; inherit (stdenv) system;};
# Some .so-files are later copied from .jar-s to $HOME, so patch them beforehand
@@ -14,10 +25,37 @@ let
;
# abiVersion 6 is default, but we need 5 for `avrdude_bin` executable
ncurses5 = ncurses.override { abiVersion = "5"; };
+
+ teensy_libpath = stdenv.lib.makeLibraryPath [
+ atk
+ expat
+ fontconfig
+ freetype
+ gcc.cc.lib
+ gdk_pixbuf
+ glib
+ gtk2
+ libpng12
+ libusb
+ pango
+ xorg.libSM
+ xorg.libX11
+ xorg.libXext
+ xorg.libXft
+ xorg.libXinerama
+ zlib
+ ];
+ teensy_architecture =
+ lib.optionalString (stdenv.system == "x86_64-linux") "linux64"
+ + lib.optionalString (stdenv.system == "i686-linux") "linux32"
+ + lib.optionalString (stdenv.system == "arm-linux") "linuxarm";
+
+ flavor = (if withTeensyduino then "teensyduino" else "arduino")
+ + stdenv.lib.optionalString (!withGui) "-core";
in
stdenv.mkDerivation rec {
version = "1.6.12";
- name = "arduino${stdenv.lib.optionalString (withGui == false) "-core"}-${version}";
+ name = "${flavor}-${version}";
src = fetchFromGitHub {
owner = "arduino";
@@ -26,7 +64,19 @@ stdenv.mkDerivation rec {
sha256 = "0rz8dv1mncwx2wkafakxqdi2y0rq3f72fr57cg0z5hgdgdm89lkh";
};
- buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline ];
+ teensyduino_src = fetchurl {
+ url = "http://www.pjrc.com/teensy/td_131/TeensyduinoInstall.${teensy_architecture}";
+ sha256 =
+ lib.optionalString ("${teensy_architecture}" == "linux64")
+ "1q4wv6s0900hyv9z1mjq33fr2isscps4q3bsy0h12wi3l7ir94g9"
+ + lib.optionalString ("${teensy_architecture}" == "linux32")
+ "06fl951f44avqyqim5qmy73siylbqcnsmz55zmj2dzhgf4sflkvc"
+ + lib.optionalString ("${teensy_architecture}" == "linuxarm")
+ "0ldf33w8wkqwklcj8fn4p22f23ibpwpf7873dc6i2jfmmbx0yvxn";
+ };
+
+ buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline
+ ] ++ stdenv.lib.optionals withTeensyduino [ upx xvfb_run xdotool ];
downloadSrcList = builtins.attrValues externalDownloads;
downloadDstList = builtins.attrNames externalDownloads;
@@ -75,6 +125,50 @@ stdenv.mkDerivation rec {
--replace '' "$out/bin/arduino" \
--replace '' "$out/share/arduino/icons/128x128/apps/arduino.png"
''}
+
+ ${stdenv.lib.optionalString withTeensyduino ''
+ # Extract and patch the Teensyduino installer
+ cp ${teensyduino_src} ./TeensyduinoInstall.${teensy_architecture}
+ chmod +w ./TeensyduinoInstall.${teensy_architecture}
+ upx -d ./TeensyduinoInstall.${teensy_architecture}
+ patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+ --set-rpath "${teensy_libpath}" \
+ ./TeensyduinoInstall.${teensy_architecture}
+ chmod +x ./TeensyduinoInstall.${teensy_architecture}
+
+ # Run the GUI-only installer in a virtual X server
+ # Script thanks to AUR package. See:
+ #
+ echo "Running Teensyduino installer..."
+ # Trick the GUI into using HOME as the install directory.
+ export HOME=$out/share/arduino
+ # Run the installer in a virtual X server in memory.
+ xvfb-run -n 99 ./TeensyduinoInstall.${teensy_architecture} &
+ sleep 4
+ echo "Waiting for Teensyduino to install (about 1 minute)..."
+ # Control the installer GUI with xdotool.
+ DISPLAY=:99 xdotool search --class "teensyduino" \
+ windowfocus \
+ key space sleep 1 \
+ key Tab sleep 0.4 \
+ key Tab sleep 0.4 \
+ key Tab sleep 0.4 \
+ key Tab sleep 0.4 \
+ key space sleep 1 \
+ key Tab sleep 0.4 \
+ key Tab sleep 0.4 \
+ key Tab sleep 0.4 \
+ key Tab sleep 0.4 \
+ key space sleep 1 \
+ key Tab sleep 0.4 \
+ key space sleep 35 \
+ key space sleep 2 &
+ # Wait for xdotool to terminate and swallow the inevitable XIO error
+ wait $! || true
+
+ # Check for successful installation
+ [ -d $out/share/arduino/hardware/teensy ] || exit 1
+ ''}
'';
# So we don't accidentally mess with firmware files
@@ -101,6 +195,14 @@ stdenv.mkDerivation rec {
# avrdude_bin is linked against libtinfo.so.5
mkdir $out/lib/
ln -s ${lib.makeLibraryPath [ncurses5]}/libncursesw.so.5 $out/lib/libtinfo.so.5
+
+ ${stdenv.lib.optionalString withTeensyduino ''
+ # Patch the Teensy loader binary
+ patchelf --debug \
+ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+ --set-rpath "${teensy_libpath}" \
+ $out/share/arduino/hardware/tools/teensy
+ ''}
'';
meta = with stdenv.lib; {
@@ -108,6 +210,6 @@ stdenv.mkDerivation rec {
homepage = http://arduino.cc/;
license = stdenv.lib.licenses.gpl2;
platforms = platforms.linux;
- maintainers = with maintainers; [ antono robberer bjornfor ];
+ maintainers = with maintainers; [ antono auntie robberer bjornfor ];
};
}
diff --git a/pkgs/development/beam-modules/hex-registry-snapshot.nix b/pkgs/development/beam-modules/hex-registry-snapshot.nix
index 9f5cc3a63e6..f283b429b96 100644
--- a/pkgs/development/beam-modules/hex-registry-snapshot.nix
+++ b/pkgs/development/beam-modules/hex-registry-snapshot.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "hex-registry";
- rev = "d58a937";
+ rev = "e5e494a";
version = "0.0.0+build.${rev}";
src = fetchFromGitHub {
owner = "erlang-nix";
repo = "hex-pm-registry-snapshots";
inherit rev;
- sha256 = "11ymmn75qjlhzf7aaza708gq0hqg55dzd3q13npgq43wg90rgpxy";
+ sha256 = "0877dragfxs22a05d8mv42z5535kfx9rs4y7fwwbd1ybphczf8za";
};
installPhase = ''
diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix
index 2cb06b07e59..69559a26c8f 100644
--- a/pkgs/development/beam-modules/hex/default.nix
+++ b/pkgs/development/beam-modules/hex/default.nix
@@ -8,13 +8,13 @@ let
pkg = self: stdenv.mkDerivation rec {
name = "hex";
- version = "v0.11.3";
+ version = "v0.14.0";
src = fetchFromGitHub {
owner = "hexpm";
repo = "hex";
- rev = "f5e200ad95f030f0a7ab88a86545dd0dde1ee521";
- sha256 = "0n4cgmnbmglarydls9pmxznbzp49pv85ncbd4f2lp1fm7qr08xfw";
+ rev = "${version}";
+ sha256 = "042rcwznb6cf9khn4l969axf7vhk53gy3rp23y6c8fhfp1472pai";
};
setupHook = writeText "setupHook.sh" ''
diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix
new file mode 100644
index 00000000000..c296f690fa5
--- /dev/null
+++ b/pkgs/development/compilers/abcl/default.nix
@@ -0,0 +1,40 @@
+{stdenv, fetchurl, ant, jre, jdk}:
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "abcl";
+ version = "1.4.0";
+ # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
+ src = fetchurl {
+ url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz";
+ sha256 = "1y4nixm1459ch6226ikdilcsf91c2rg1d82cqqmcn24kfjl1m62i";
+ };
+ configurePhase = ''
+ mkdir nix-tools
+ export PATH="$PWD/nix-tools:$PATH"
+ echo "echo nix-builder.localdomain" > nix-tools/hostname
+ chmod a+x nix-tools/*
+
+ hostname
+ '';
+ buildPhase = ''
+ ant
+ '';
+ installPhase = ''
+ mkdir -p "$out"/{bin,share/doc/abcl,lib/abcl}
+ cp -r README COPYING CHANGES examples/ "$out/share/doc/abcl/"
+ cp -r dist/*.jar contrib/ "$out/lib/abcl/"
+
+ echo "#! ${stdenv.shell}" >> "$out/bin/abcl"
+ echo "${jre}/bin/java -cp \"$out/lib/abcl/abcl.jar:$out/lib/abcl/abcl-contrib.jar:\$CLASSPATH\" org.armedbear.lisp.Main \"\$@\"" >> "$out/bin/abcl"
+ chmod a+x "$out"/bin/*
+ '';
+ buildInputs = [jre ant jdk jre];
+ meta = {
+ inherit version;
+ description = ''A JVM-based Common Lisp implementation'';
+ license = stdenv.lib.licenses.gpl3 ;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ homepage = "https://common-lisp.net/project/armedbear/";
+ };
+}
diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix
new file mode 100644
index 00000000000..d3c4bf19a65
--- /dev/null
+++ b/pkgs/development/compilers/asn1c/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation rec {
+ name = "asn1c-${version}";
+ version = "0.9.27";
+
+ src = fetchurl {
+ url = "http://lionet.info/soft/asn1c-${version}.tar.gz";
+ sha256 = "17nvn2kzvlryasr9dzqg6gs27b9lvqpval0k31pb64bjqbhn8pq2";
+ };
+
+ outputs = [ "out" "doc" "man" ];
+
+ buildInputs = [ perl ];
+
+ preConfigure = ''
+ patchShebangs examples/crfc2asn1.pl
+ '';
+
+ postInstall = ''
+ cp -r skeletons/standard-modules $out/share/asn1c
+ '';
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ homepage = http://lionet.info/asn1c/compiler.html;
+ description = "Open Source ASN.1 Compiler";
+ license = licenses.bsd2;
+ platforms = platforms.all;
+ maintainers = [ maintainers.montag451 ];
+ };
+}
diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index d8dabaac779..97e95b29814 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -3,11 +3,11 @@
, withContrib ? true }:
let
- versionPkg = "0.2.11" ;
+ versionPkg = "0.2.12" ;
contrib = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ;
- sha256 = "0kc4nx1904745c1rkj9yfbayidw7rks1mwq0lxmvsgghn98dxwjn" ;
+ sha256 = "16jzabmwq5yz72dzlkc2hmvf2lan83gayn21gbl65jgpwdsbh170" ;
};
postInstallContrib = stdenv.lib.optionalString withContrib
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
- sha256 = "140xy129fr11bdf4bj6qya9mf0fhnv2x7ksb9j46pf2yzrsrks8g";
+ sha256 = "0m8gmm1pnklixxw76yjjqqqixm2cyp91rnq4sj1k29qp4k9zxpl4";
};
buildInputs = [ gmp ];
diff --git a/pkgs/development/compilers/ats2/installed-lib-directory-version.patch b/pkgs/development/compilers/ats2/installed-lib-directory-version.patch
index d9e5ad2d21e..686df69299f 100644
--- a/pkgs/development/compilers/ats2/installed-lib-directory-version.patch
+++ b/pkgs/development/compilers/ats2/installed-lib-directory-version.patch
@@ -1,13 +1,13 @@
Change the name of the library directory to match the version of the package.
-diff -Naur ATS2-Postiats-0.2.11/configure postiats-new/configure
---- ATS2-Postiats-0.2.11/configure 2016-10-13 12:03:20.000000000 -0400
+diff -Naur ATS2-Postiats-0.2.12/configure postiats-new/configure
+--- ATS2-Postiats-0.2.12/configure 2016-10-13 12:03:20.000000000 -0400
+++ postiats-new/configure 2016-10-23 20:17:29.912579618 -0400
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ATS2/Postiats 0.2.10.
-+# Generated by GNU Autoconf 2.69 for ATS2/Postiats 0.2.11.
++# Generated by GNU Autoconf 2.69 for ATS2/Postiats 0.2.12.
#
# Report bugs to .
#
@@ -17,8 +17,8 @@ diff -Naur ATS2-Postiats-0.2.11/configure postiats-new/configure
PACKAGE_TARNAME='ats2-postiats'
-PACKAGE_VERSION='0.2.10'
-PACKAGE_STRING='ATS2/Postiats 0.2.10'
-+PACKAGE_VERSION='0.2.11'
-+PACKAGE_STRING='ATS2/Postiats 0.2.11'
++PACKAGE_VERSION='0.2.12'
++PACKAGE_STRING='ATS2/Postiats 0.2.12'
PACKAGE_BUGREPORT='gmpostiats@gmail.com'
PACKAGE_URL=''
@@ -27,7 +27,7 @@ diff -Naur ATS2-Postiats-0.2.11/configure postiats-new/configure
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ATS2/Postiats 0.2.10 to adapt to many kinds of systems.
-+\`configure' configures ATS2/Postiats 0.2.11 to adapt to many kinds of systems.
++\`configure' configures ATS2/Postiats 0.2.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -36,7 +36,7 @@ diff -Naur ATS2-Postiats-0.2.11/configure postiats-new/configure
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ATS2/Postiats 0.2.10:";;
-+ short | recursive ) echo "Configuration of ATS2/Postiats 0.2.11:";;
++ short | recursive ) echo "Configuration of ATS2/Postiats 0.2.12:";;
esac
cat <<\_ACEOF
@@ -45,7 +45,7 @@ diff -Naur ATS2-Postiats-0.2.11/configure postiats-new/configure
if $ac_init_version; then
cat <<\_ACEOF
-ATS2/Postiats configure 0.2.10
-+ATS2/Postiats configure 0.2.11
++ATS2/Postiats configure 0.2.12
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -54,7 +54,7 @@ diff -Naur ATS2-Postiats-0.2.11/configure postiats-new/configure
running configure, to aid debugging if configure makes a mistake.
-It was created by ATS2/Postiats $as_me 0.2.10, which was
-+It was created by ATS2/Postiats $as_me 0.2.11, which was
++It was created by ATS2/Postiats $as_me 0.2.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -63,7 +63,7 @@ diff -Naur ATS2-Postiats-0.2.11/configure postiats-new/configure
# values after options handling.
ac_log="
-This file was extended by ATS2/Postiats $as_me 0.2.10, which was
-+This file was extended by ATS2/Postiats $as_me 0.2.11, which was
++This file was extended by ATS2/Postiats $as_me 0.2.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -72,19 +72,19 @@ diff -Naur ATS2-Postiats-0.2.11/configure postiats-new/configure
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ATS2/Postiats config.status 0.2.10
-+ATS2/Postiats config.status 0.2.11
++ATS2/Postiats config.status 0.2.12
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-diff -Naur ATS2-Postiats-0.2.11/src/CBOOT/config.h postiats-new/src/CBOOT/config.h
---- ATS2-Postiats-0.2.11/src/CBOOT/config.h 2016-10-13 12:03:20.000000000 -0400
+diff -Naur ATS2-Postiats-0.2.12/src/CBOOT/config.h postiats-new/src/CBOOT/config.h
+--- ATS2-Postiats-0.2.12/src/CBOOT/config.h 2016-10-13 12:03:20.000000000 -0400
+++ postiats-new/src/CBOOT/config.h 2016-10-23 20:16:34.613836556 -0400
@@ -44,7 +44,7 @@
#define PACKAGE_NAME "ATS2/Postiats"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "ATS2/Postiats 0.2.10"
-+#define PACKAGE_STRING "ATS2/Postiats 0.2.11"
++#define PACKAGE_STRING "ATS2/Postiats 0.2.12"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "ats2-postiats"
@@ -93,7 +93,7 @@ diff -Naur ATS2-Postiats-0.2.11/src/CBOOT/config.h postiats-new/src/CBOOT/config
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.2.10"
-+#define PACKAGE_VERSION "0.2.11"
++#define PACKAGE_VERSION "0.2.12"
/* The size of `void*', as computed by sizeof. */
#define SIZEOF_VOIDP 8
diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix
index b7773a91d98..8cf8a04f4eb 100644
--- a/pkgs/development/compilers/colm/default.nix
+++ b/pkgs/development/compilers/colm/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "colm-${version}";
- version = "0.13.0.3";
+ version = "0.13.0.4";
src = fetchurl {
url = "http://www.colm.net/files/colm/${name}.tar.gz";
- sha256 = "0dadfsnkbxcrf5kihvncbprb6w64jz2myylfmj952gdmcsim4zj2";
+ sha256 = "04xcb7w82x9i4ygxqla9n39y646n3jw626khdp5297z1dkxx1czx";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index cfaf8184c69..60293fa2ec1 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -3,6 +3,7 @@
, gmp, mpfr, libffi, makeWrapper
, noUnicode ? false
, gcc
+, threadSupport ? true
}:
let
s = # Generated upstream information
@@ -30,7 +31,7 @@ stdenv.mkDerivation {
};
configureFlags = [
- "--enable-threads"
+ (if threadSupport then "--enable-threads" else "--disable-threads")
"--with-gmp-prefix=${gmp.dev}"
"--with-libffi-prefix=${libffi.dev}"
]
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 950caeedf53..e125a050b24 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -80,9 +80,9 @@ let
};
};
in hsPkgs.elmPkgs // {
- elm = buildEnv {
+ elm = lib.hiPrio (buildEnv {
name = "elm-${hsPkgs.elmVersion}";
paths = lib.mapAttrsToList (name: pkg: pkg) hsPkgs.elmPkgs;
pathsToLink = [ "/bin" ];
- };
+ });
}
diff --git a/pkgs/development/compilers/elm/packages/elm-compiler.nix b/pkgs/development/compilers/elm/packages/elm-compiler.nix
index f6a92b64f6d..b0943f1ece3 100644
--- a/pkgs/development/compilers/elm/packages/elm-compiler.nix
+++ b/pkgs/development/compilers/elm/packages/elm-compiler.nix
@@ -7,11 +7,11 @@
}:
mkDerivation {
pname = "elm-compiler";
- version = "0.17.1";
+ version = "0.18";
src = fetchgit {
url = "https://github.com/elm-lang/elm-compiler";
- sha256 = "17y0jlii81mnjywknblcv1nfja51slmwrhz9x8w144b0sblcj0if";
- rev = "e44deafaf9cbf3749484070f267f03a368711adb";
+ sha256 = "09fmrbfpc1kzc3p9h79w57b9qjhajdswc4jfm9gyjw95vsiwasgh";
+ rev = "eb97f2a5dd5421c708a91b71442e69d02453cc80";
};
isLibrary = true;
isExecutable = true;
@@ -35,4 +35,7 @@ mkDerivation {
homepage = "http://elm-lang.org";
description = "Values to help with elm-package, elm-make, and elm-lang.org.";
license = stdenv.lib.licenses.bsd3;
+ # added manually since tests are not passing
+ # https://travis-ci.org/elm-lang/elm-compiler/builds/176845852
+ doCheck = false;
}
diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix
index 4d30c697abd..48eafff6f72 100644
--- a/pkgs/development/compilers/elm/packages/elm-format.nix
+++ b/pkgs/development/compilers/elm/packages/elm-format.nix
@@ -7,11 +7,11 @@
}:
mkDerivation {
pname = "elm-format";
- version = "0.4.0";
+ version = "0.5.2";
src = fetchgit {
url = "http://github.com/avh4/elm-format";
- sha256 = "199xh2w5cwcf79a8fv6j8dpk9h8a4cygrf8cfr9p7bvp2wvczibm";
- rev = "d9cbe65c5f01d21b5a02c2f963aa4c9d3f0539d0";
+ sha256 = "0lman7h6wr75y90javcc4y1scvwgv125gqqaqvfrd5xrfmm43gg8";
+ rev = "e452ed9342620e7bb0bc822983b96411d57143ef";
};
isLibrary = false;
isExecutable = true;
@@ -32,14 +32,4 @@ mkDerivation {
homepage = "http://elm-lang.org";
description = "A source code formatter for Elm";
license = stdenv.lib.licenses.bsd3;
-
- # XXX: I've manually disabled tests, only the following test is failing
- # ...
- # ElmFormat.Cli
- # format a single file in place: OK
- # usage instructions: FAIL
- # ...
- # 1 out of 266 tests failed (0.50s)
- # Test suite elm-format-tests: FAIL
- doCheck = false;
}
diff --git a/pkgs/development/compilers/elm/packages/elm-make.nix b/pkgs/development/compilers/elm/packages/elm-make.nix
index bed7698cfe4..dc1760e2958 100644
--- a/pkgs/development/compilers/elm/packages/elm-make.nix
+++ b/pkgs/development/compilers/elm/packages/elm-make.nix
@@ -5,11 +5,11 @@
}:
mkDerivation {
pname = "elm-make";
- version = "0.17.1";
+ version = "0.18";
src = fetchgit {
url = "https://github.com/elm-lang/elm-make";
- sha256 = "0k9w5gl48lhhr3n2iflf0vkb3w6al0xcbglgiw4fq1ssz3aa7ijw";
- rev = "0a0a1f52ab04e2d68d60a5798722e1de30b47335";
+ sha256 = "1yq4w4yqignlc2si5ns53pmz0a99gix5d2qgi6x7finf7i6sxyw2";
+ rev = "1a554833a70694ab142b9179bfac996143f68d9e";
};
isLibrary = false;
isExecutable = true;
diff --git a/pkgs/development/compilers/elm/packages/elm-package.nix b/pkgs/development/compilers/elm/packages/elm-package.nix
index faf46e859c9..f93432dc0a3 100644
--- a/pkgs/development/compilers/elm/packages/elm-package.nix
+++ b/pkgs/development/compilers/elm/packages/elm-package.nix
@@ -7,11 +7,11 @@
}:
mkDerivation {
pname = "elm-package";
- version = "0.17.1";
+ version = "0.18";
src = fetchgit {
url = "https://github.com/elm-lang/elm-package";
- sha256 = "0dnn871py0pvzxsjjggy5ww2zj9g71c2dcnp38rcr4nbj8yxik85";
- rev = "9011ccdbced1d06aa60de0e3096e609ef44d26dd";
+ sha256 = "19krnkjvfk02gmmic5h5i1i0lw7s30927bnd5g57cj8nqbigysv7";
+ rev = "8bd150314bacab5b6fc451927aa01deec2276fbf";
};
isLibrary = true;
isExecutable = true;
diff --git a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix b/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
index 79043012590..90c8956323b 100644
--- a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
+++ b/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
@@ -1,22 +1,22 @@
{
"elm-lang/virtual-dom" = {
- version = "1.1.0";
- sha256 = "16g66cvvh85ddciq0ymaqfyq2bcz11pxn0g0dc1wx7bmlqx7q1jz";
+ version = "2.0.1";
+ sha256 = "19nfjx072m7a7bx8flc50vbmiww172jmscyq9x91cr2kby5hvbw3";
};
"evancz/elm-markdown" = {
- version = "3.0.0";
- sha256 = "0r3hcim4mpn46ahv1q6sjp6i2viyp7jik6i71xgwmvfb9drns2p6";
+ version = "3.0.1";
+ sha256 = "144lzpcapf2mhqiz90mkllmm4skrcs0iha1daps42qn3xps7hvmj";
};
"elm-lang/html" = {
- version = "1.1.0";
- sha256 = "1v7pwxxd81qrfywb4rr199p2i9z77vjkbwjwm5gy1nxdpi8mb50y";
+ version = "2.0.0";
+ sha256 = "05sqjd5n8jnq4lv5v0ipcg98b8im1isnnl4wns1zzn4w5nbrjjzi";
};
"elm-lang/svg" = {
- version = "1.1.1";
- sha256 = "0xzc0fq2kg797km0nq2f52w6xdffrl9l0y5zbkpa72w163zpxkkn";
+ version = "2.0.0";
+ sha256 = "1c7p967n1yhynravqwgh80vprwz7r2r1n0x3icn5wzk9iaqs069l";
};
"elm-lang/core" = {
- version = "4.0.2";
- sha256 = "1qjhfr3gd1qmfvna7iddspmk26v2nmgmgw9m6yyz10ygy3i9mla6";
+ version = "5.0.0";
+ sha256 = "0gqyc09bh43pi7r2cizyjm5y0zpgarv3is17dl325qvxb9s1y2gn";
};
}
diff --git a/pkgs/development/compilers/elm/packages/elm-reactor.nix b/pkgs/development/compilers/elm/packages/elm-reactor.nix
index cf6d33a5acb..08bf5779b74 100644
--- a/pkgs/development/compilers/elm/packages/elm-reactor.nix
+++ b/pkgs/development/compilers/elm/packages/elm-reactor.nix
@@ -6,11 +6,11 @@
}:
mkDerivation {
pname = "elm-reactor";
- version = "0.17.1";
+ version = "0.18";
src = fetchgit {
url = "https://github.com/elm-lang/elm-reactor";
- sha256 = "14kkqskvhkfznpl8cmjlvv3rp6ciqmdbxrmq6f20p3aznvkrdvf8";
- rev = "7522d7ef379c5a4ffbba11b1be09ed04add08a63";
+ sha256 = "0lpidsckyfcr8d6bln735d98dx7ga7j1vyssw0qsv8ijj18gxx65";
+ rev = "c519d4ec0aaf2f043a416fe858346b0181eca516";
};
isLibrary = false;
isExecutable = true;
diff --git a/pkgs/development/compilers/elm/packages/elm-repl.nix b/pkgs/development/compilers/elm/packages/elm-repl.nix
index e08c295f294..64e29596099 100644
--- a/pkgs/development/compilers/elm/packages/elm-repl.nix
+++ b/pkgs/development/compilers/elm/packages/elm-repl.nix
@@ -6,11 +6,11 @@
}:
mkDerivation {
pname = "elm-repl";
- version = "0.17.1";
+ version = "0.18";
src = fetchgit {
url = "https://github.com/elm-lang/elm-repl";
- sha256 = "0nh2yfr0bi4rg1kak1gjaczpq56y1nii05b5y7hn6n4w651jkm28";
- rev = "413ac0d4ee43c8542afd3041bbb7b8c903cd3d30";
+ sha256 = "112fzykils4lqz4pc44q4mwvxg0px0zfwx511bfvblrxkwwqlfb5";
+ rev = "85f0bcfc28ea6c8a99a360d55c21ff25a556f9fe";
};
isLibrary = false;
isExecutable = true;
diff --git a/pkgs/development/compilers/elm/packages/release.nix b/pkgs/development/compilers/elm/packages/release.nix
index 6817d8e297f..fd4e08fff09 100644
--- a/pkgs/development/compilers/elm/packages/release.nix
+++ b/pkgs/development/compilers/elm/packages/release.nix
@@ -2,7 +2,7 @@
# Please, do not modify it by hand!
{ callPackage }:
{
- version = "0.17.1";
+ version = "0.18.0";
packages = {
elm-compiler = callPackage ./elm-compiler.nix { };
elm-package = callPackage ./elm-package.nix { };
diff --git a/pkgs/development/compilers/elm/update-elm.rb b/pkgs/development/compilers/elm/update-elm.rb
index a1f76945cd2..5169ff3fd29 100755
--- a/pkgs/development/compilers/elm/update-elm.rb
+++ b/pkgs/development/compilers/elm/update-elm.rb
@@ -1,12 +1,12 @@
#!/usr/bin/env ruby
# Take those from https://github.com/elm-lang/elm-platform/blob/master/installers/BuildFromSource.hs
-$elm_version = "0.17.1"
-$elm_packages = { "elm-compiler" => "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/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index acddc9081be..3edfb177b11 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -59,7 +59,7 @@ assert langGo -> langCC;
with stdenv.lib;
with builtins;
-let version = "6.2.0";
+let version = "6.3.0";
# Whether building a cross-compiler for GNU/Hurd.
crossGNU = cross != null && cross.config == "i586-pc-gnu";
@@ -216,7 +216,7 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
- sha256 = "1idpf43988v1a6i8lw9ak1r7igcfg1bm5kn011iydlr2qygmhi4r";
+ sha256 = "17xjz30jb65hcf714vn9gcxvrrji8j20xm7n33qg1ywhyzryfsph";
};
inherit patches;
diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index 31cf0b3c8bd..020e4fd30cf 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
patches = [
docFixes
./relocation.patch
- ./ghc-7.x-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752
];
buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ];
diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix
index 25eabc769aa..100bb87768b 100644
--- a/pkgs/development/compilers/ghc/7.4.2-binary.nix
+++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix
@@ -65,6 +65,9 @@ stdenv.mkDerivation rec {
find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${stdenv.lib.makeLibraryPath [ "$out" gmp ]}" {} \;
+
+ paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
+
sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
for prog in ld ar gcc strip ranlib; do
diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
index 5e903822d4b..db9e0682096 100644
--- a/pkgs/development/compilers/ghc/8.0.1.nix
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -22,7 +22,6 @@ stdenv.mkDerivation rec {
};
patches = [
- ./ghc-8.x-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752
./relocation.patch
# Fix https://ghc.haskell.org/trac/ghc/ticket/12130
@@ -58,6 +57,8 @@ stdenv.mkDerivation rec {
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
postInstall = ''
+ paxmark m $out/lib/${name}/bin/{ghc,haddock}
+
# Install the bash completion file.
install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
new file mode 100644
index 00000000000..9b8645fc1db
--- /dev/null
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -0,0 +1,84 @@
+{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
+, hscolour, patchutils
+}:
+
+let
+ inherit (bootPkgs) ghc;
+
+ fetchFilteredPatch = args: fetchurl (args // {
+ downloadToTemp = true;
+ postFetch = ''
+ ${patchutils}/bin/filterdiff --clean --strip-match=1 -x 'testsuite/*' "$downloadedFile" > "$out"
+ ''; # fix syntax highlighting: */
+ });
+in
+stdenv.mkDerivation rec {
+ version = "8.0.1.20161117";
+ name = "ghc-${version}";
+
+ src = fetchurl {
+ url = "https://downloads.haskell.org/~ghc/8.0.2-rc1/${name}-src.tar.xz";
+ sha256 = "08hpzvg059ha0knmlngd0winfkplkkb7dk88zfz3s177z38kd874";
+ };
+
+ patches = [
+ # Already applied?
+ # ./relocation.patch
+ # Fix https://ghc.haskell.org/trac/ghc/ticket/12130
+ # (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/4d71cc89b4e9648f3fbb29c8fcd25d725616e265; sha256 = "0syaxb4y4s2dc440qmrggb4vagvqqhb55m6mx12rip4i9qhxl8k0"; })
+ (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; })
+ ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;
+
+ buildInputs = [ ghc perl hscolour ];
+
+ enableParallelBuilding = true;
+
+ outputs = [ "out" "doc" ];
+
+ preConfigure = ''
+ sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+ '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+ export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ export NIX_LDFLAGS+=" -no_dtrace_dof"
+ '';
+
+ configureFlags = [
+ "--with-gcc=${stdenv.cc}/bin/cc"
+ "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
+ "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
+ "--datadir=$doc/share/doc/ghc"
+ ] ++ stdenv.lib.optional stdenv.isDarwin [
+ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
+ ];
+
+ # required, because otherwise all symbols from HSffi.o are stripped, and
+ # that in turn causes GHCi to abort
+ stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
+
+ postInstall = ''
+ paxmark m $out/lib/${name}/bin/{ghc,haddock}
+
+ # Install the bash completion file.
+ install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc
+
+ # Patch scripts to include "readelf" and "cat" in $PATH.
+ for i in "$out/bin/"*; do
+ test ! -h $i || continue
+ egrep --quiet '^#!' <(head -n 1 $i) || continue
+ sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i
+ done
+ '';
+
+ passthru = {
+ inherit bootPkgs;
+ };
+
+ meta = {
+ homepage = "http://haskell.org/ghc";
+ description = "The Glasgow Haskell Compiler";
+ maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+ inherit (ghc.meta) license platforms;
+ };
+
+}
diff --git a/pkgs/development/compilers/ghc/D2710.patch b/pkgs/development/compilers/ghc/D2710.patch
new file mode 100644
index 00000000000..0ee1b06c734
--- /dev/null
+++ b/pkgs/development/compilers/ghc/D2710.patch
@@ -0,0 +1,19 @@
+diff --git a/rts/LinkerInternals.h b/rts/LinkerInternals.h
+--- a/rts/LinkerInternals.h
++++ b/rts/LinkerInternals.h
+@@ -303,4 +303,14 @@
+ # define OBJFORMAT_MACHO
+ #endif
+
++/* In order to simplify control flow a bit, some references to mmap-related
++ definitions are blocked off by a C-level if statement rather than a CPP-level
++ #if statement. Since those are dead branches when !RTS_LINKER_USE_MMAP, we
++ just stub out the relevant symbols here
++*/
++#if !RTS_LINKER_USE_MMAP
++#define munmap(x,y) /* nothing */
++#define MAP_ANONYMOUS 0
++#endif
++
+ #endif /* LINKERINTERNALS_H */
+
diff --git a/pkgs/development/compilers/ghc/D2711.patch b/pkgs/development/compilers/ghc/D2711.patch
new file mode 100644
index 00000000000..8d229f27399
--- /dev/null
+++ b/pkgs/development/compilers/ghc/D2711.patch
@@ -0,0 +1,22 @@
+diff --git a/rts/sm/Storage.c b/rts/sm/Storage.c
+--- a/rts/sm/Storage.c
++++ b/rts/sm/Storage.c
+@@ -1314,7 +1314,7 @@
+ ------------------------------------------------------------------------- */
+
+ #if (defined(arm_HOST_ARCH) || defined(aarch64_HOST_ARCH)) && defined(ios_HOST_OS)
+-void sys_icache_invalidate(void *start, size_t len);
++#include
+ #endif
+
+ /* On ARM and other platforms, we need to flush the cache after
+@@ -1327,7 +1327,7 @@
+ (void)exec_addr;
+ #elif (defined(arm_HOST_ARCH) || defined(aarch64_HOST_ARCH)) && defined(ios_HOST_OS)
+ /* On iOS we need to use the special 'sys_icache_invalidate' call. */
+- sys_icache_invalidate(exec_addr, ((unsigned char*)exec_addr)+len);
++ sys_icache_invalidate(exec_addr, len);
+ #elif defined(__GNUC__)
+ /* For all other platforms, fall back to a libgcc builtin. */
+ unsigned char* begin = (unsigned char*)exec_addr;
+
diff --git a/pkgs/development/compilers/ghc/D2712.patch b/pkgs/development/compilers/ghc/D2712.patch
new file mode 100644
index 00000000000..d938d70bbcf
--- /dev/null
+++ b/pkgs/development/compilers/ghc/D2712.patch
@@ -0,0 +1,158 @@
+diff --git a/includes/rts/OSThreads.h b/includes/rts/OSThreads.h
+--- a/includes/rts/OSThreads.h
++++ b/includes/rts/OSThreads.h
+@@ -15,7 +15,12 @@
+ #ifndef RTS_OSTHREADS_H
+ #define RTS_OSTHREADS_H
+
+-#if defined(THREADED_RTS) /* to near the end */
++#if defined(HAVE_PTHREAD_H) && !defined(mingw32_HOST_OS)
++#define BUILD_OSTHREAD_POSIX
++#endif
++
++
++#if defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) /* to near end */
+
+ #if defined(HAVE_PTHREAD_H) && !defined(mingw32_HOST_OS)
+
+@@ -205,13 +210,25 @@
+ void releaseThreadNode (void);
+ #endif // !CMINUSMINUS
+
+-#else
++#endif /* defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) */
++
++#ifndef THREADED_RTS
++
++#ifdef ACQUIRE_LOCK
++// If we have pthreads, we pull in the threading primitives even when the RTS
++// isn't threaded, but we expect these macros to be noops on non-threaded RTS.
++
++#undef ACQUIRE_LOCK
++#undef RELEASE_LOCK
++#undef ASSERT_LOCK_HELD
++
++#endif
+
+ #define ACQUIRE_LOCK(l)
+ #define RELEASE_LOCK(l)
+ #define ASSERT_LOCK_HELD(l)
+
+-#endif /* defined(THREADED_RTS) */
++#endif
+
+ #ifndef CMINUSMINUS
+ //
+diff --git a/rts/posix/OSThreads.c b/rts/posix/OSThreads.c
+--- a/rts/posix/OSThreads.c
++++ b/rts/posix/OSThreads.c
+@@ -35,7 +35,7 @@
+ #endif
+ #endif
+
+-#if defined(THREADED_RTS)
++#if defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX)
+ #include "RtsUtils.h"
+ #include "Task.h"
+
+@@ -225,47 +225,6 @@
+ return NULL;
+ }
+
+-int
+-forkOS_createThread ( HsStablePtr entry )
+-{
+- pthread_t tid;
+- int result = pthread_create(&tid, NULL,
+- forkOS_createThreadWrapper, (void*)entry);
+- if(!result)
+- pthread_detach(tid);
+- return result;
+-}
+-
+-void freeThreadingResources (void) { /* nothing */ }
+-
+-uint32_t
+-getNumberOfProcessors (void)
+-{
+- static uint32_t nproc = 0;
+-
+- if (nproc == 0) {
+-#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)
+- nproc = sysconf(_SC_NPROCESSORS_ONLN);
+-#elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_CONF)
+- nproc = sysconf(_SC_NPROCESSORS_CONF);
+-#elif defined(darwin_HOST_OS)
+- size_t size = sizeof(uint32_t);
+- if(sysctlbyname("hw.logicalcpu",&nproc,&size,NULL,0) != 0) {
+- if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0)
+- nproc = 1;
+- }
+-#elif defined(freebsd_HOST_OS)
+- size_t size = sizeof(uint32_t);
+- if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0)
+- nproc = 1;
+-#else
+- nproc = 1;
+-#endif
+- }
+-
+- return nproc;
+-}
+-
+ #if defined(HAVE_SCHED_H) && defined(HAVE_SCHED_SETAFFINITY)
+ // Schedules the thread to run on CPU n of m. m may be less than the
+ // number of physical CPUs, in which case, the thread will be allowed
+@@ -353,6 +312,51 @@
+ pthread_kill(id, SIGPIPE);
+ }
+
++#endif /* defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) */
++
++#if defined(THREADED_RTS)
++
++int
++forkOS_createThread ( HsStablePtr entry )
++{
++ pthread_t tid;
++ int result = pthread_create(&tid, NULL,
++ forkOS_createThreadWrapper, (void*)entry);
++ if(!result)
++ pthread_detach(tid);
++ return result;
++}
++
++void freeThreadingResources (void) { /* nothing */ }
++
++uint32_t
++getNumberOfProcessors (void)
++{
++ static uint32_t nproc = 0;
++
++ if (nproc == 0) {
++#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)
++ nproc = sysconf(_SC_NPROCESSORS_ONLN);
++#elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_CONF)
++ nproc = sysconf(_SC_NPROCESSORS_CONF);
++#elif defined(darwin_HOST_OS)
++ size_t size = sizeof(uint32_t);
++ if(sysctlbyname("hw.logicalcpu",&nproc,&size,NULL,0) != 0) {
++ if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0)
++ nproc = 1;
++ }
++#elif defined(freebsd_HOST_OS)
++ size_t size = sizeof(uint32_t);
++ if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0)
++ nproc = 1;
++#else
++ nproc = 1;
++#endif
++ }
++
++ return nproc;
++}
++
+ #else /* !defined(THREADED_RTS) */
+
+ int
+
diff --git a/pkgs/development/compilers/ghc/D2713.patch b/pkgs/development/compilers/ghc/D2713.patch
new file mode 100644
index 00000000000..80cf35a5297
--- /dev/null
+++ b/pkgs/development/compilers/ghc/D2713.patch
@@ -0,0 +1,17 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -437,7 +437,11 @@
+ else
+ CrossCompilePrefix=""
+ fi
+-TargetPlatformFull="${TargetPlatform}"
++# Despite its similarity in name to TargetPlatform, TargetPlatformFull is used
++# in calls to subproject configure scripts and thus must be set to the autoconf
++# triple, not the normalized GHC triple that TargetPlatform is set to.
++# It may be better to just do away with the GHC triples all together.
++TargetPlatformFull="${target}"
+ AC_SUBST(CrossCompiling)
+ AC_SUBST(CrossCompilePrefix)
+ AC_SUBST(TargetPlatformFull)
+
diff --git a/pkgs/development/compilers/ghc/ghc-7.x-dont-pass-linker-flags-via-response-files.patch b/pkgs/development/compilers/ghc/ghc-7.x-dont-pass-linker-flags-via-response-files.patch
deleted file mode 100644
index 129a34ecd86..00000000000
--- a/pkgs/development/compilers/ghc/ghc-7.x-dont-pass-linker-flags-via-response-files.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs
-index 8c3ab1a..47a2da7 100644
---- a/compiler/main/SysTools.hs
-+++ b/compiler/main/SysTools.hs
-@@ -414,7 +414,7 @@ runCc dflags args = do
- args1 = map Option (getOpts dflags opt_c)
- args2 = args0 ++ args1 ++ args
- mb_env <- getGccEnv args2
-- runSomethingResponseFile dflags cc_filter "C Compiler" p args2 mb_env
-+ runSomethingFiltered dflags cc_filter "C Compiler" p args2 mb_env
- where
- -- discard some harmless warnings from gcc that we can't turn off
- cc_filter = unlines . doFilter . lines
-@@ -928,7 +928,7 @@ runLink dflags args = do
- args1 = map Option (getOpts dflags opt_l)
- args2 = args0 ++ linkargs ++ args1 ++ args
- mb_env <- getGccEnv args2
-- runSomethingResponseFile dflags ld_filter "Linker" p args2 mb_env
-+ runSomethingFiltered dflags ld_filter "Linker" p args2 mb_env
- where
- ld_filter = case (platformOS (targetPlatform dflags)) of
- OSSolaris2 -> sunos_ld_filter
diff --git a/pkgs/development/compilers/ghc/ghc-8.x-dont-pass-linker-flags-via-response-files.patch b/pkgs/development/compilers/ghc/ghc-8.x-dont-pass-linker-flags-via-response-files.patch
deleted file mode 100644
index 34e098c8f1e..00000000000
--- a/pkgs/development/compilers/ghc/ghc-8.x-dont-pass-linker-flags-via-response-files.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ubr ghc-8.0.0.20160411-orig/compiler/main/SysTools.hs ghc-8.0.0.20160411-patched/compiler/main/SysTools.hs
---- ghc-8.0.0.20160411-orig/compiler/main/SysTools.hs 2016-04-12 10:50:46.533389045 +0200
-+++ ghc-8.0.0.20160411-patched/compiler/main/SysTools.hs 2016-04-12 10:53:29.973933760 +0200
-@@ -414,7 +414,7 @@
- args1 = map Option (getOpts dflags opt_c)
- args2 = args0 ++ args1 ++ args
- mb_env <- getGccEnv args2
-- runSomethingResponseFile dflags cc_filter "C Compiler" p args2 mb_env
-+ runSomethingFiltered dflags cc_filter "C Compiler" p args2 mb_env
- where
- -- discard some harmless warnings from gcc that we can't turn off
- cc_filter = unlines . doFilter . lines
-@@ -936,7 +936,7 @@
- args2 = args0 ++ linkargs ++ args1 ++ args
- args3 = argFixup args2 []
- mb_env <- getGccEnv args3
-- runSomethingResponseFile dflags ld_filter "Linker" p args3 mb_env
-+ runSomethingFiltered dflags ld_filter "Linker" p args3 mb_env
- where
- testLib lib = "-l" `isPrefixOf` lib || ".a" `isSuffixOf` lib
- {- GHC is just blindly appending linker arguments from libraries and
-Only in ghc-8.0.0.20160411-patched/compiler/main: SysTools.hs.orig
-Only in ghc-8.0.0.20160411-patched/compiler/main: SysTools.hs.rej
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 31c66f17584..7573451695c 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,48 +1,47 @@
{ stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
-, autoconf, automake, happy, alex
+, autoconf, automake, happy, alex, crossSystem, selfPkgs, cross ? null
}:
let
inherit (bootPkgs) ghc;
-in stdenv.mkDerivation rec {
- version = "8.1.20161108";
- name = "ghc-${version}";
- rev = "2e8463b232054b788b73e6551947a9434aa76009";
+ commonBuildInputs = [ ghc perl autoconf automake happy alex ];
- src = fetchgit {
- url = "git://git.haskell.org/ghc.git";
- inherit rev;
- sha256 = "1x1vnb2zr2qrak72bdqh65d00q351yhn8xvv5i4i359cf2xjmgfd";
- };
+ version = "8.1.20161115";
- patches = [
- ./ghc-8.x-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752
- ];
-
- postUnpack = ''
- pushd ghc-${builtins.substring 0 7 rev}
- echo ${version} >VERSION
- echo ${rev} >GIT_COMMIT_ID
- patchShebangs .
- ./boot
- popd
- '';
-
- buildInputs = [ ghc perl autoconf automake happy alex ];
-
- enableParallelBuilding = true;
-
- preConfigure = ''
+ commonPreConfigure = ''
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
export NIX_LDFLAGS+=" -no_dtrace_dof"
'';
+in stdenv.mkDerivation (rec {
+ inherit version;
+ name = "ghc-${version}";
+ rev = "017d11e0a36866b05ace32ece1af11adf652a619";
+
+ src = fetchgit {
+ url = "git://git.haskell.org/ghc.git";
+ inherit rev;
+ sha256 = "1ryggmz961qd0fl50rkjjvi6g9azwla2vx9310a9nzjaj5x6ib4y";
+ };
+
+ postPatch = ''
+ echo ${version} >VERSION
+ echo ${rev} >GIT_COMMIT_ID
+ patchShebangs .
+ ./boot
+ '';
+
+ buildInputs = commonBuildInputs;
+
+ enableParallelBuilding = true;
+
+ preConfigure = commonPreConfigure;
configureFlags = [
- "--with-cc=${stdenv.cc}/bin/cc"
+ "CC=${stdenv.cc}/bin/cc"
"--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
"--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
] ++ stdenv.lib.optional stdenv.isDarwin [
@@ -54,6 +53,8 @@ in stdenv.mkDerivation rec {
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
postInstall = ''
+ paxmark m $out/lib/${name}/bin/{ghc,haddock}
+
# Install the bash completion file.
install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc
@@ -67,6 +68,11 @@ in stdenv.mkDerivation rec {
passthru = {
inherit bootPkgs;
+ } // stdenv.lib.optionalAttrs (crossSystem != null) {
+ crossCompiler = selfPkgs.ghc.override {
+ cross = crossSystem;
+ bootPkgs = selfPkgs;
+ };
};
meta = {
@@ -76,4 +82,35 @@ in stdenv.mkDerivation rec {
inherit (ghc.meta) license platforms;
};
-}
+} // stdenv.lib.optionalAttrs (cross != null) {
+ name = "${cross.config}-ghc-${version}";
+
+ # Some fixes for cross-compilation to iOS. See https://phabricator.haskell.org/D2710 (D2711,D2712,D2713)
+ patches = [ ./D2710.patch ./D2711.patch ./D2712.patch ./D2713.patch ];
+
+ preConfigure = commonPreConfigure + ''
+ sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk
+ '';
+
+ configureFlags = [
+ "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 00000000000..f8b861311d6
--- /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 565215f474e..7400057b128 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 2bf13cb895f..b191f9655d2 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 e321978f0bd..68b03d05739 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 00000000000..765a384bf63
--- /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/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix
index 38b114d8d07..db6573417bf 100644
--- a/pkgs/development/compilers/go/1.6.nix
+++ b/pkgs/development/compilers/go/1.6.nix
@@ -15,11 +15,11 @@ in
stdenv.mkDerivation rec {
name = "go-${version}";
- version = "1.6.3";
+ version = "1.6.4";
src = fetchurl {
url = "https://github.com/golang/go/archive/go${version}.tar.gz";
- sha256 = "1plakydixx0xrp0z3n8ahnwg66psn31791dh56yl4ry41phq0axm";
+ sha256 = "1212pijypippg3sq9c9645kskq4ib73y1f8cv0ka6n279smk0mq9";
};
# perl is used for testing go vet
diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix
index 3def735ec8d..16de9b0edbf 100644
--- a/pkgs/development/compilers/go/1.7.nix
+++ b/pkgs/development/compilers/go/1.7.nix
@@ -24,13 +24,13 @@ in
stdenv.mkDerivation rec {
name = "go-${version}";
- version = "1.7.1";
+ version = "1.7.4";
src = fetchFromGitHub {
owner = "golang";
repo = "go";
rev = "go${version}";
- sha256 = "121cvpjpbyl3lyd6j5lnnq6pr8vl7ar5zvap1132c522lxgxw356";
+ sha256 = "1ks3xph20afrfp3vqs1sjnkpjb0lgxblv8706wa3iiyg7rka4axv";
};
# perl is used for testing go vet
diff --git a/pkgs/development/compilers/go/cacert-1.7.patch b/pkgs/development/compilers/go/cacert-1.7.patch
index 0fe9ff8cc23..57f09c975d9 100644
--- a/pkgs/development/compilers/go/cacert-1.7.patch
+++ b/pkgs/development/compilers/go/cacert-1.7.patch
@@ -24,26 +24,18 @@ index a4b33c7..9700b75 100644
var data C.CFDataRef = nil
err := C.FetchPEMRoots(&data)
diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
-index 78de56c..05eada4 100644
+index 59b303d..d4a34ac 100644
--- a/src/crypto/x509/root_darwin.go
+++ b/src/crypto/x509/root_darwin.go
-@@ -6,20 +6,31 @@
-
- package x509
-
--import "os/exec"
-+import (
-+ "io/ioutil"
-+ "os"
-+ "os/exec"
-+)
-
- func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) {
- return nil, nil
- }
+@@ -28,16 +28,25 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
+ // The linker will not include these unused functions in binaries built with cgo enabled.
func execSecurityRoots() (*CertPool, error) {
-+ roots := NewCertPool()
++ var (
++ mu sync.Mutex
++ roots = NewCertPool()
++ )
++
+ if file := os.Getenv("SSL_CERT_FILE"); file != "" {
+ data, err := ioutil.ReadFile(file)
+ if err == nil {
@@ -51,16 +43,20 @@ index 78de56c..05eada4 100644
+ return roots, nil
+ }
+ }
++
cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain")
data, err := cmd.Output()
if err != nil {
return nil, err
}
-- roots := NewCertPool()
- roots.AppendCertsFromPEM(data)
- return roots, nil
- }
+- var (
+- mu sync.Mutex
+- roots = NewCertPool()
+- )
+ add := func(cert *Certificate) {
+ mu.Lock()
+ defer mu.Unlock()
diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
index 7bcb3d6..3986e1a 100644
--- a/src/crypto/x509/root_unix.go
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index f70fbcf583c..a2afcc77380 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -37,6 +37,6 @@ stdenv.mkDerivation {
homepage = http://haxe.org;
license = with licenses; [ gpl2 bsd2 /*?*/ ]; # -> docs/license.txt
maintainers = [ maintainers.marcweber ];
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix
new file mode 100644
index 00000000000..7f1830430c4
--- /dev/null
+++ b/pkgs/development/compilers/inform7/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, writeText, fetchzip, coreutils, perl, gnutar, gzip }:
+let
+ version = "6M62";
+in stdenv.mkDerivation {
+ name = "inform7-${version}";
+ buildInputs = [ perl coreutils gnutar gzip ];
+ src = fetchzip {
+ url = "http://inform7.com/download/content/6M62/I7_6M62_Linux_all.tar.gz";
+ sha256 = "0bk0pfymvsn1g8ci0pfdw7dgrlzb232a8pc67y2xk6zgpf3m41vj";
+ };
+ preConfigure = "touch Makefile.PL";
+ buildPhase = "";
+ installPhase = ''
+ mkdir -p $out
+ pushd $src
+ ./install-inform7.sh --prefix $out
+ popd
+
+ substituteInPlace "$out/bin/i7" \
+ --replace "/usr/bin/perl" "${perl}/bin/perl"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A design system for interactive fiction.";
+ homepage = http://inform7.com/;
+ license = licenses.artistic2;
+ maintainers = with maintainers; [ mbbx6spp ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix
new file mode 100644
index 00000000000..04ef7b86c48
--- /dev/null
+++ b/pkgs/development/compilers/julia/0.5.nix
@@ -0,0 +1,185 @@
+{ stdenv, fetchgit, fetchurl
+# build tools
+, gfortran, m4, makeWrapper, patchelf, perl, which, python2
+, runCommand
+# libjulia dependencies
+, libunwind, readline, utf8proc, zlib
+, llvm, libffi, ncurses
+# standard library dependencies
+, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
+# linear algebra
+, openblas, arpack, suitesparse
+# Darwin frameworks
+, CoreServices, ApplicationServices
+}:
+
+with stdenv.lib;
+
+# All dependencies must use the same OpenBLAS.
+let
+ arpack_ = arpack;
+ suitesparse_ = suitesparse;
+in
+let
+ arpack = arpack_.override { inherit openblas; };
+ suitesparse = suitesparse_.override { inherit openblas; };
+in
+
+let
+ dsfmtVersion = "2.2.3";
+ dsfmt = fetchurl {
+ url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz";
+ sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42";
+ };
+
+ libuvVersion = "8d5131b6c1595920dd30644cd1435b4f344b46c8";
+ libuv = fetchurl {
+ url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
+ sha256 = "1886r04igcs0k24sbb61wn10f8ki35c39jsnc5djv3rg4hvn9l49";
+ };
+
+ rmathVersion = "0.1";
+ rmath-julia = fetchurl {
+ url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
+ sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4";
+ };
+
+ virtualenvVersion = "15.0.0";
+ virtualenv = fetchurl {
+ url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz";
+ sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh";
+ };
+in
+
+stdenv.mkDerivation rec {
+ pname = "julia";
+ version = "0.5.0";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz";
+ sha256 = "0bhickil88lalp9jdj1kmf4is70zinhx8ha9rng0g3z50r4a2qmv";
+ };
+ prePatch = ''
+ mkdir deps/srccache
+ cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz"
+ cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz"
+ cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz"
+ cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz"
+ '';
+
+ patches = [
+ ./0001.1-use-system-utf8proc.patch
+ ./0002-use-system-suitesparse.patch
+ ];
+
+ postPatch = ''
+ patchShebangs . contrib
+ for i in backtrace replutil cmdlineargs compile; do
+ mv test/$i.jl{,.off}
+ touch test/$i.jl
+ done
+ '';
+
+ buildInputs = [
+ arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
+ pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc
+ zlib llvm
+ ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
+ ;
+
+ nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ];
+
+ makeFlags =
+ let
+ arch = head (splitString "-" stdenv.system);
+ march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
+ or (throw "unsupported architecture: ${arch}");
+ # Julia requires Pentium 4 (SSE2) or better
+ cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
+ or (throw "unsupported architecture: ${arch}");
+ in [
+ "ARCH=${arch}"
+ "MARCH=${march}"
+ "JULIA_CPU_TARGET=${cpuTarget}"
+ "PREFIX=$(out)"
+ "prefix=$(out)"
+ "SHELL=${stdenv.shell}"
+
+ "USE_SYSTEM_BLAS=1"
+ "USE_BLAS64=${if openblas.blas64 then "1" else "0"}"
+ "LIBBLAS=-lopenblas"
+ "LIBBLASNAME=libopenblas"
+
+ "USE_SYSTEM_LAPACK=1"
+ "LIBLAPACK=-lopenblas"
+ "LIBLAPACKNAME=libopenblas"
+
+ "USE_SYSTEM_SUITESPARSE=1"
+ "SUITESPARSE_LIB=-lsuitesparse"
+ "SUITESPARSE_INC=-I${suitesparse}/include"
+
+ "USE_SYSTEM_ARPACK=1"
+ "USE_SYSTEM_FFTW=1"
+ "USE_SYSTEM_GMP=1"
+ "USE_SYSTEM_LIBGIT2=1"
+ "USE_SYSTEM_LIBUNWIND=1"
+
+ "USE_SYSTEM_LLVM=1"
+ "LLVM_VER=3.8.1"
+
+ "USE_SYSTEM_MPFR=1"
+ "USE_SYSTEM_OPENLIBM=1"
+ "USE_SYSTEM_OPENSPECFUN=1"
+ "USE_SYSTEM_PATCHELF=1"
+ "USE_SYSTEM_PCRE=1"
+ "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config"
+ "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h"
+ "USE_SYSTEM_READLINE=1"
+ "USE_SYSTEM_UTF8PROC=1"
+ "USE_SYSTEM_ZLIB=1"
+ ];
+
+ NIX_CFLAGS_COMPILE = [ "-fPIC" ];
+
+ LD_LIBRARY_PATH = makeLibraryPath [
+ arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm
+ openspecfun pcre2 suitesparse llvm
+ ];
+
+ dontStrip = true;
+ dontPatchELF = true;
+
+ enableParallelBuilding = true;
+
+ doCheck = true;
+ checkTarget = "testall";
+ # Julia's tests require read/write access to $HOME
+ preCheck = ''
+ export HOME="$NIX_BUILD_TOP"
+ set
+ '';
+
+ preBuild = ''
+ sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile
+ sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile
+ '';
+
+ postInstall = ''
+ for prog in "$out/bin/julia" "$out/bin/julia-debug"; do
+ wrapProgram "$prog" \
+ --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:$out/lib/julia" \
+ --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}"
+ done
+ '';
+
+ meta = {
+ description = "High-level performance-oriented dynamical language for technical computing";
+ homepage = "http://julialang.org/";
+ license = stdenv.lib.licenses.mit;
+ maintainers = with stdenv.lib.maintainers; [ raskin ];
+ platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
+ broken = stdenv.isi686;
+ };
+}
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 335de9b50cd..214b3153481 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -48,12 +48,12 @@ in
stdenv.mkDerivation rec {
pname = "julia";
- version = "0.4.6";
+ version = "0.4.7";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz";
- sha256 = "17wsppmsf782icyzri34zha61wfx4brfq4h68qg17w6zimd2plg5";
+ sha256 = "09f531jhs8pyd1xng5c26x994w7q0sxxr28mr3qfw9wpkbmsc2pf";
};
prePatch = ''
diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix
index ed23bcb73cc..73f0e67baa5 100644
--- a/pkgs/development/compilers/julia/git.nix
+++ b/pkgs/development/compilers/julia/git.nix
@@ -3,10 +3,13 @@
, gfortran, m4, makeWrapper, patchelf, perl, which, python2
# libjulia dependencies
, libunwind, readline, utf8proc, zlib
+, llvm
# standard library dependencies
, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
# linear algebra
, openblas, arpack, suitesparse
+# Darwin frameworks
+, CoreServices, ApplicationServices
}:
with stdenv.lib;
@@ -22,22 +25,16 @@ let
in
let
- llvmVersion = "3.7.1";
- llvm = fetchurl {
- url = "http://llvm.org/releases/${llvmVersion}/llvm-${llvmVersion}.src.tar.xz";
- sha256 = "1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy";
- };
-
dsfmtVersion = "2.2.3";
dsfmt = fetchurl {
url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz";
sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42";
};
- libuvVersion = "a1d9166a440e4a0664c0e6de6ebe25350de56a42";
+ libuvVersion = "8d5131b6c1595920dd30644cd1435b4f344b46c8";
libuv = fetchurl {
url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
- sha256 = "1sjvly4ylfyj8kxnx0gsjj2f70cg17h302h1i08gfndrqam68za5";
+ sha256 = "1886r04igcs0k24sbb61wn10f8ki35c39jsnc5djv3rg4hvn9l49";
};
rmathVersion = "0.1";
@@ -55,18 +52,17 @@ in
stdenv.mkDerivation rec {
pname = "julia";
- version = "0.5.0-dev-2016-06-10";
+ version = "0.6.0-dev-2016-11-25";
name = "${pname}-${version}";
src = fetchgit {
url = "https://github.com/JuliaLang/${pname}";
- rev = "56d7d6672c7db717dacb5e34f485180c2eba83b2";
- sha256 = "1wbrzdrxp94i7yxdgf3qgrjshmqxi0c4bqz7wy0c0c0kjlg6flmx";
+ rev = "03c24644815ba5320d038bb60c08565375fea1d9";
+ sha256 = "103mg9dz8yda2zxbd85jv8zhdzs29jj0dxrm2ppxpfhbbf6fxqav";
};
prePatch = ''
mkdir deps/srccache
- cp "${llvm}" "./deps/srccache/llvm-${llvmVersion}.src.tar.xz"
cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz"
cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz"
cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz"
@@ -85,8 +81,10 @@ stdenv.mkDerivation rec {
buildInputs = [
arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc
- zlib
- ];
+ zlib llvm
+ ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
+ ;
nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ];
@@ -125,7 +123,7 @@ stdenv.mkDerivation rec {
"USE_SYSTEM_LIBGIT2=1"
"USE_SYSTEM_LIBUNWIND=1"
# 'replutil' test failure with LLVM 3.8.0, invalid libraries with 3.7.1
- "USE_SYSTEM_LLVM=0"
+ "USE_SYSTEM_LLVM=1"
"USE_SYSTEM_MPFR=1"
"USE_SYSTEM_OPENLIBM=1"
"USE_SYSTEM_OPENSPECFUN=1"
@@ -142,7 +140,7 @@ stdenv.mkDerivation rec {
LD_LIBRARY_PATH = makeLibraryPath [
arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm
- openspecfun pcre2 suitesparse
+ openspecfun pcre2 suitesparse llvm
];
dontStrip = true;
@@ -165,7 +163,7 @@ stdenv.mkDerivation rec {
postInstall = ''
for prog in "$out/bin/julia" "$out/bin/julia-debug"; do
wrapProgram "$prog" \
- --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
+ --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:$out/lib/julia" \
--prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}"
done
'';
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index f0f8fa3b7ff..52a47c50420 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre, unzip }:
stdenv.mkDerivation rec {
- version = "1.0.4";
+ version = "1.0.5-2";
name = "kotlin-${version}";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
- sha512 = "39mcyw3rdgrhfkxl0xygh74idl2pvw3dy0n9d3z4aj6hq4pxkn1dclmpfbrfa333vjpzfhlqwl578vmly9vah7m6z6g4j12gkdijiyf";
+ sha512 = "0z8phc51y8dfjnm95fs2dnmvhp7xm2am5xm71byh598flkpjmagnwah4j8z9fpg4qy94dwmqxf5zs3q8nfra89kmwskzpvp7bbibi0h";
};
propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/compilers/llvm/3.4/lld.nix b/pkgs/development/compilers/llvm/3.4/lld.nix
index c502b0e215e..c1841610f31 100644
--- a/pkgs/development/compilers/llvm/3.4/lld.nix
+++ b/pkgs/development/compilers/llvm/3.4/lld.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, llvm, ncurses, zlib, python, version }:
+{ stdenv, fetch, cmake, llvm, ncurses, zlib, python2, version }:
stdenv.mkDerivation {
name = "lld-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
export cmakeFlags="$cmakeFlags -DLLD_PATH_TO_LLVM_SOURCE="`ls -d $PWD/llvm-*`
'';
- buildInputs = [ cmake ncurses zlib python ];
+ buildInputs = [ cmake ncurses zlib python2 ];
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11"
diff --git a/pkgs/development/compilers/llvm/3.4/lldb.nix b/pkgs/development/compilers/llvm/3.4/lldb.nix
index cd498b5cf51..a50f9536542 100644
--- a/pkgs/development/compilers/llvm/3.4/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.4/lldb.nix
@@ -8,7 +8,7 @@
, libedit
, llvm
, clang
-, python
+, python2
, version
}:
@@ -23,12 +23,13 @@ stdenv.mkDerivation {
scripts/Python/build-swig-Python.sh
'';
- buildInputs = [ cmake python which swig ncurses zlib libedit ];
+ buildInputs = [ cmake python2 which swig ncurses zlib libedit ];
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11"
"-DLLDB_PATH_TO_LLVM_BUILD=${llvm}"
"-DLLDB_PATH_TO_CLANG_BUILD=${clang}"
+ "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898
];
enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index 7471974d00a..54346baba0d 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -3,7 +3,7 @@
, perl
, groff
, cmake
-, python
+, python2
, libffi
, binutils
, libxml2
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
buildInputs =
[ perl groff cmake libxml2 libffi ]
- ++ stdenv.lib.optional (!stdenv.isDarwin) python /*
+ ++ stdenv.lib.optional (!stdenv.isDarwin) python2 /*
++ stdenv.lib.optional stdenv.isLinux valgrind */;
propagatedBuildInputs = [ ncurses zlib ];
diff --git a/pkgs/development/compilers/llvm/3.4/polly.nix b/pkgs/development/compilers/llvm/3.4/polly.nix
index 2fed0fc8abe..3d3483afafa 100644
--- a/pkgs/development/compilers/llvm/3.4/polly.nix
+++ b/pkgs/development/compilers/llvm/3.4/polly.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, isl, python, gmp, llvm, version }:
+{ stdenv, fetch, cmake, isl, python2, gmp, llvm, version }:
stdenv.mkDerivation {
name = "polly-${version}";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
patches = [ ./polly-separate-build.patch ];
- buildInputs = [ cmake isl python gmp ];
+ buildInputs = [ cmake isl python2 gmp ];
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11"
diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix
index 8e7c8151df1..bbffa1a9a93 100644
--- a/pkgs/development/compilers/llvm/3.5/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.5/lldb.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation {
"-DCMAKE_CXX_FLAGS=-std=c++11"
"-DLLDB_PATH_TO_LLVM_BUILD=${llvm}"
"-DLLDB_PATH_TO_CLANG_BUILD=${clang}"
+ "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898
];
enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/llvm/3.6/lldb.nix b/pkgs/development/compilers/llvm/3.6/lldb.nix
index 207971b8172..17f7f5793b9 100644
--- a/pkgs/development/compilers/llvm/3.6/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.6/lldb.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation {
"-DCMAKE_CXX_FLAGS=-std=c++11"
"-DLLDB_PATH_TO_LLVM_BUILD=${llvm}"
"-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}"
+ "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898
];
enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/llvm/3.7/lldb.nix b/pkgs/development/compilers/llvm/3.7/lldb.nix
index 434fdc7650f..36f9cb1f139 100644
--- a/pkgs/development/compilers/llvm/3.7/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.7/lldb.nix
@@ -35,6 +35,7 @@ stdenv.mkDerivation {
"-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}"
"-DPYTHON_VERSION_MAJOR=2"
"-DPYTHON_VERSION_MINOR=7"
+ "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898
];
enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/llvm/3.8/D17533-1.patch b/pkgs/development/compilers/llvm/3.8/D17533-1.patch
new file mode 100644
index 00000000000..79ca953d6e5
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.8/D17533-1.patch
@@ -0,0 +1,60 @@
+commit eb92f5a745014532b83abfba04602fce87ca8393
+Author: Chuang-Yu Cheng
+Date: Fri Apr 8 12:04:32 2016 +0000
+
+ CXX_FAST_TLS calling convention: performance improvement for PPC64
+
+ This is the same change on PPC64 as r255821 on AArch64. I have even borrowed
+ his commit message.
+
+ The access function has a short entry and a short exit, the initialization
+ block is only run the first time. To improve the performance, we want to
+ have a short frame at the entry and exit.
+
+ We explicitly handle most of the CSRs via copies. Only the CSRs that are not
+ handled via copies will be in CSR_SaveList.
+
+ Frame lowering and prologue/epilogue insertion will generate a short frame
+ in the entry and exit according to CSR_SaveList. The majority of the CSRs will
+ be handled by register allcoator. Register allocator will try to spill and
+ reload them in the initialization block.
+
+ We add CSRsViaCopy, it will be explicitly handled during lowering.
+
+ 1> we first set FunctionLoweringInfo->SplitCSR if conditions are met (the target
+ supports it for the given machine function and the function has only return
+ exits). We also call TLI->initializeSplitCSR to perform initialization.
+ 2> we call TLI->insertCopiesSplitCSR to insert copies from CSRsViaCopy to
+ virtual registers at beginning of the entry block and copies from virtual
+ registers to CSRsViaCopy at beginning of the exit blocks.
+ 3> we also need to make sure the explicit copies will not be eliminated.
+
+ Author: Tom Jablin (tjablin)
+ Reviewers: hfinkel kbarton cycheng
+
+ http://reviews.llvm.org/D17533
+
+ git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@265781 91177308-0d34-0410-b5e6-96231b3b80d8
+
+diff --git a/lib/CodeGen/TargetFrameLoweringImpl.cpp b/lib/CodeGen/TargetFrameLoweringImpl.cpp
+index 679ade1..0a0e079 100644
+--- a/lib/CodeGen/TargetFrameLoweringImpl.cpp
++++ b/lib/CodeGen/TargetFrameLoweringImpl.cpp
+@@ -63,12 +63,15 @@ void TargetFrameLowering::determineCalleeSaves(MachineFunction &MF,
+ const TargetRegisterInfo &TRI = *MF.getSubtarget().getRegisterInfo();
+ const MCPhysReg *CSRegs = TRI.getCalleeSavedRegs(&MF);
+
++ // Resize before the early returns. Some backends expect that
++ // SavedRegs.size() == TRI.getNumRegs() after this call even if there are no
++ // saved registers.
++ SavedRegs.resize(TRI.getNumRegs());
++
+ // Early exit if there are no callee saved registers.
+ if (!CSRegs || CSRegs[0] == 0)
+ return;
+
+- SavedRegs.resize(TRI.getNumRegs());
+-
+ // In Naked functions we aren't going to save any registers.
+ if (MF.getFunction()->hasFnAttribute(Attribute::Naked))
+ return;
diff --git a/pkgs/development/compilers/llvm/3.8/lldb.nix b/pkgs/development/compilers/llvm/3.8/lldb.nix
index 568476e44ac..fe0dcfc8306 100644
--- a/pkgs/development/compilers/llvm/3.8/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.8/lldb.nix
@@ -36,6 +36,7 @@ stdenv.mkDerivation {
"-DCLANG_MAIN_INCLUDE_DIR=${clang-unwrapped}/include"
"-DPYTHON_VERSION_MAJOR=2"
"-DPYTHON_VERSION_MINOR=7"
+ "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898
];
enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix
index 6112228bf4f..fa647e62ff1 100644
--- a/pkgs/development/compilers/llvm/3.8/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.8/llvm.nix
@@ -35,10 +35,14 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ ncurses zlib ];
+ # Fix a segfault in llc
+ # See http://lists.llvm.org/pipermail/llvm-dev/2016-October/106500.html
+ patches = [ ./D17533-1.patch ];
+
# hacky fix: New LLVM releases require a newer OS X SDK than
# 10.9. This is a temporary measure until nixpkgs darwin support is
# updated.
- patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+ postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
'';
diff --git a/pkgs/development/compilers/llvm/3.9/lldb.nix b/pkgs/development/compilers/llvm/3.9/lldb.nix
index 0acef48f57b..55c00eb07fc 100644
--- a/pkgs/development/compilers/llvm/3.9/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.9/lldb.nix
@@ -42,6 +42,7 @@ stdenv.mkDerivation {
cmakeFlags = [
"-DLLVM_MAIN_INCLUDE_DIR=${llvm}/include"
+ "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898
];
enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index a036e7e6939..493748d369b 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -1,50 +1,54 @@
-{ stdenv, fetchurl, fetchpatch, boehmgc, zlib, sqlite, pcre }:
+{ stdenv, fetchurl, fetchpatch, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig
+, git, apacheHttpd, apr, aprutil, mariadb, mbedtls, openssl, pkgs, gtk2
+}:
stdenv.mkDerivation rec {
name = "neko-${version}";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchurl {
- url = "http://nekovm.org/_media/neko-${version}.tar.gz";
- sha256 = "1lcm1ahbklfpd5lnqjwmvyj2vr85jbq57hszk5jgq0x6yx6p3927";
+ url = "http://nekovm.org/media/neko-${version}-src.tar.gz";
+ sha256 = "15ng9ad0jspnhj38csli1pvsv3nxm75f0nlps7i10194jvzdb4qc";
};
- patches = stdenv.lib.singleton (fetchpatch {
- url = "https://github.com/HaxeFoundation/neko/commit/"
- + "ccc78c29deab7971e1369f4fe3dedd14cf9f3128.patch";
- sha256 = "1nya50rzai15hmpq2azganjxzgrfydf30glfwirgw6q8z7z3wpkq";
- });
+ # Patches backported with reference to https://github.com/HaxeFoundation/neko/issues/131
+ # They can probably be removed when bumping to next version
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/HaxeFoundation/neko/commit/"
+ + "a8c71ad97faaccff6c6e9e09eba2d5efd022f8dc.patch";
+ sha256 = "0mnx15cdjs8mnl01mhc9z2gpzh4d1q0ygqnjackrqxz6x235ydyp";
+ })
+ (fetchpatch {
+ url = "https://github.com/HaxeFoundation/neko/commit/"
+ + "fe87462d9c7a6ee27e28f5be5e4fc0ac87b34574.patch";
+ sha256 = "1jbmq6j32vg3qv20dbh82cp54886lgrh7gkcqins8a2y4l4dl3sc";
+ })
+ ];
- prePatch = with stdenv.lib; let
- libs = concatStringsSep "," (map (lib: "\"${lib.dev}/include\"") buildInputs);
- in ''
- sed -i -e '/^search_includes/,/^}/c \
- search_includes = function(_) { return $array(${libs}) }
- ' src/tools/install.neko
- sed -i -e '/allocated = strdup/s|"[^"]*"|"'"$out/lib/neko:$out/bin"'"|' \
- vm/load.c
- # temporarily, fixed in 1.8.3
- sed -i -e 's/^#if defined(_64BITS)/& || defined(__x86_64__)/' vm/neko.h
-
- for disabled_mod in mod_neko{,2} mod_tora{,2} mysql ui; do
- sed -i -e '/^libs/,/^}/{/^\s*'"$disabled_mod"'\s*=>/,/^\s*}/d}' \
- src/tools/install.neko
- done
+ buildInputs =
+ [ boehmgc zlib sqlite pcre cmake pkgconfig git apacheHttpd apr aprutil
+ mariadb.client mbedtls openssl ]
+ ++ stdenv.lib.optional stdenv.isLinux gtk2
+ ++ stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security
+ pkgs.darwin.apple_sdk.frameworks.Carbon];
+ cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ];
+ prePatch = ''
+ sed -i -e '/allocated = strdup/s|"[^"]*"|"'"$out/lib/neko:$out/bin"'"|' vm/load.c
+ '';
+
+ checkPhase = ''
+ bin/neko bin/test.n
'';
- makeFlags = "INSTALL_PREFIX=$(out)";
- buildInputs = [ boehmgc zlib sqlite pcre ];
dontStrip = true;
- preInstall = ''
- install -vd "$out/lib" "$out/bin"
- '';
-
- meta = {
+ meta = with stdenv.lib; {
description = "A high-level dynamically typed programming language";
homepage = http://nekovm.org;
- license = stdenv.lib.licenses.lgpl21;
- maintainers = [ stdenv.lib.maintainers.marcweber ];
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.lgpl21;
+ maintainers = [ maintainers.marcweber ];
+ platforms = platforms.linux ++ platforms.darwin;
};
}
+
diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix
index a6969477844..9501b5a3a06 100644
--- a/pkgs/development/compilers/opa/default.nix
+++ b/pkgs/development/compilers/opa/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchgit, which, perl, jdk
+{ stdenv, fetchFromGitHub, which, perl, jdk
, ocamlPackages, openssl
, coreutils, zlib, ncurses, makeWrapper
-, gcc, binutils, gnumake, nodejs} :
+, gcc, binutils, gnumake, nodejs
+}:
stdenv.mkDerivation rec {
pname = "opa";
- version = "4309";
+ version = "4310";
name = "${pname}-${version}";
- src = fetchgit {
- url = https://github.com/MLstate/opalang.git;
- rev = "047f58bfd4be35ee30176156b3718c707a6c0f76";
- sha256 = "1laynwf64713q2vhdkxw679dah6hl3bvmrj8cj836a9k9z7jcc1r";
+ src = fetchFromGitHub {
+ owner = "MLstate";
+ repo = "opalang";
+ rev = "a13d45af30bc955c40c4b320353fb21e4ecacbc5";
+ sha256 = "1qs91rq9xrafv2mf2v415k8lv91ab3ycz0xkpjh1mng5ca3pjlf3";
};
# Paths so the opa compiler code generation will use the same programs as were
@@ -27,6 +29,12 @@ stdenv.mkDerivation rec {
echo 'let opa_git_sha = "xxxx"'
cat ./compiler/buildinfos/buildInfos.ml.post
)> ./compiler/buildinfos/buildInfos.ml
+ for p in configure tools/platform_helper.sh
+ do
+ substituteInPlace $p --replace 'IS_MAC=1' 'IS_LINUX=1'
+ done
+ export CAMLP4O=${ocamlPackages.camlp4}/bin/camlp4o
+ export CAMLP4ORF=${ocamlPackages.camlp4}/bin/camlp4orf
'';
prefixKey = "-prefix ";
@@ -36,10 +44,10 @@ stdenv.mkDerivation rec {
buildInputs = [ which perl jdk openssl coreutils zlib ncurses
makeWrapper gcc binutils gnumake nodejs
] ++ (with ocamlPackages; [
- ocaml findlib ocaml_ssl cryptokit camlzip ulex ocamlgraph
+ ocaml findlib ocaml_ssl cryptokit camlzip ulex ocamlgraph camlp4
]);
- NIX_LDFLAGS = "-lgcc_s";
+ NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
postInstall = ''
# Have compiler use same tools for code generation as used to build it.
@@ -62,9 +70,6 @@ stdenv.mkDerivation rec {
homepage = http://opalang.org/;
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.kkallio ];
- platforms = with stdenv.lib.platforms; linux;
- # opa was built with nodejs 0.10 which reached end of LTS
- # in October 216, it doesn't built with nodejs 4.x
- broken = true;
+ platforms = with stdenv.lib.platforms; unix;
};
}
diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk-darwin/8.nix
index bcafca16022..1d12d59998a 100644
--- a/pkgs/development/compilers/openjdk-darwin/8.nix
+++ b/pkgs/development/compilers/openjdk-darwin/8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, setJavaClassPath }:
+{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
let
jdk = stdenv.mkDerivation {
name = "zulu1.8.0_66-8.11.0.1";
@@ -9,7 +9,7 @@ let
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
};
- buildInputs = [ unzip ];
+ buildInputs = [ unzip freetype ];
installPhase = ''
mkdir -p $out
@@ -26,6 +26,8 @@ let
mkdir -p $out/nix-support
echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
+ install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib
+
# Set JAVA_HOME automatically.
cat <> $out/nix-support/setup-hook
if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix
index e43563fd60d..10a9eb2b366 100644
--- a/pkgs/development/compilers/openjdk-darwin/default.nix
+++ b/pkgs/development/compilers/openjdk-darwin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, setJavaClassPath }:
+{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
let
jdk = stdenv.mkDerivation {
name = "openjdk-7u60b30";
@@ -9,7 +9,7 @@ let
sha256 = "af510a4d566712d82c17054bb39f91d98c69a85586e244c6123669a0bd4b7401";
};
- buildInputs = [ unzip ];
+ buildInputs = [ unzip freetype ];
installPhase = ''
mv */Contents/Home $out
@@ -25,6 +25,8 @@ let
mkdir -p $out/nix-support
echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
+ install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib
+
# Set JAVA_HOME automatically.
cat <> $out/nix-support/setup-hook
if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 122b9ff7ed1..2c785d2a721 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation ( rec {
name = "ponyc-${version}";
- version = "0.6.0";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "ponylang";
repo = "ponyc";
rev = version;
- sha256 = "10miwsyxl589b0n1h3dbbc2qckq8z8a58s0d53asq88w2gpc339q";
+ sha256 = "1v314abmhlqsj8iyab61cf8nb4kbddv1ycnw29z53mpbmivk4gn0";
};
buildInputs = [ llvm makeWrapper which ];
@@ -83,7 +83,7 @@ stdenv.mkDerivation ( rec {
description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language";
homepage = http://www.ponylang.org;
license = stdenv.lib.licenses.bsd2;
- maintainers = [ stdenv.lib.maintainers.doublec ];
+ maintainers = with stdenv.lib.maintainers; [ doublec kamilchm ];
platforms = stdenv.lib.platforms.unix;
};
})
diff --git a/pkgs/development/compilers/ponyc/disable-tests.patch b/pkgs/development/compilers/ponyc/disable-tests.patch
index 696dc005f0a..38740cf963e 100644
--- a/pkgs/development/compilers/ponyc/disable-tests.patch
+++ b/pkgs/development/compilers/ponyc/disable-tests.patch
@@ -1,15 +1,19 @@
-diff --git a/packages/net/_test.pony b/packages/net/_test.pony
-index ce26bd7..9a98cc7 100644
---- a/packages/net/_test.pony
-+++ b/packages/net/_test.pony
-@@ -5,9 +5,7 @@ actor Main is TestList
+diff -Naur a/packages/net/_test.pony b/packages/net/_test.pony
+--- a/packages/net/_test.pony 1970-01-01 01:00:01.000000000 +0100
++++ b/packages/net/_test.pony 2016-12-01 22:25:59.102433053 +0100
+@@ -5,14 +5,7 @@
new make() => None
-
+
fun tag tests(test: PonyTest) =>
- test(_TestBroadcast)
- test(_TestTCPWritev)
- test(_TestTCPExpect)
+- test(_TestTCPMute)
+- test(_TestTCPUnmute)
+- ifdef not windows then
+- test(_TestTCPThrottle)
+- end
+ None
-
+
class _TestPing is UDPNotify
let _h: TestHelper
diff --git a/pkgs/development/compilers/rust/beta.nix b/pkgs/development/compilers/rust/beta.nix
index db19391575f..a4e55f970eb 100644
--- a/pkgs/development/compilers/rust/beta.nix
+++ b/pkgs/development/compilers/rust/beta.nix
@@ -3,13 +3,13 @@
rec {
rustc = callPackage ./rustc.nix {
- shortVersion = "beta-2016-08-17";
+ shortVersion = "beta-2016-11-16";
forceBundledLLVM = false;
configureFlags = [ "--release-channel=beta" ];
- srcRev = "822166b842e4d0b32fafc8b077fb927ec281253d";
- srcSha = "1zkv7hyjvcj7kvbngf309skgllk6rd7727a6hkvhd3hg8jlz0d00";
+ srcRev = "e627a2e6edbc7b7fd205de8ca7c86cff76655f4d";
+ srcSha = "14sbhn6dp6rri1rpkspjlmy359zicwmyppdak52xj1kqhcjn71wa";
patches = [
- ./patches/disable-lockfile-check.patch
+ ./patches/disable-lockfile-check-beta.patch
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
inherit targets;
inherit targetPatches;
@@ -18,10 +18,10 @@ rec {
};
cargo = callPackage ./cargo.nix rec {
- version = "beta-2016-07-25";
- srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0";
- srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155";
- depsSha256 = "1p1ygabg9k9b0azm0mrx8asjzdi35c5zw53iysba198lli6bhdl4";
+ version = "0.14.0";
+ srcRev = "eca9e159b6b0d484788ac757cf23052eba75af55";
+ srcSha = "1zm5rzw1mvixnkzr4775pcxx6k235qqxbysyp179cbxsw3dm045s";
+ depsSha256 = "0gpn0cpwgpzwhc359qn6qplx371ag9pqbwayhqrsydk1zm5bm3zr";
inherit rustc; # the rustc that will be wrapped by cargo
inherit rustPlatform; # used to build cargo
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index 454b67b8151..b912a9d7933 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -14,16 +14,16 @@ let
then "x86_64-apple-darwin"
else abort "missing boostrap url for platform ${stdenv.system}";
- # fetch hashes by running `print-hashes.sh 1.9.0`
+ # fetch hashes by running `print-hashes.sh 1.12.1`
bootstrapHash =
if stdenv.system == "i686-linux"
- then "f5a3f5d53defe827a71447b1a0e7a656394b87ee23e009d7bf73a0277c1b5ac2"
+ then "ede9b9d14d1ddbc29975d1ead73fcf2758719b4b371363afe1c32eb8d6e96bb3"
else if stdenv.system == "x86_64-linux"
- then "f4ebbd6d9494cb8fa6c410cb58954e1913546c2bca8963faebc424591547d83f"
+ then "9e546aec13e389429ba2d86c8f4e67eba5af146c979e4faa16ffb40ddaf9984c"
else if stdenv.system == "i686-darwin"
- then "bf07182bc362985fcdd48af905cdb559e20c68518cd71dabec3c30b78ca8a94a"
+ then "2648645c4fe1ecf36beb7de63501dd99e9547a7a6d5683acf2693b919a550b69"
else if stdenv.system == "x86_64-darwin"
- then "2cdbc47438dc86ecaf35298317b77d735956eb160862e3f6d0fda0da656ecc35"
+ then "0ac5e58dba3d24bf09dcc90eaac02d2df053122b0def945ec4cfe36ac6d4d011"
else throw "missing boostrap hash for platform ${stdenv.system}";
needsPatchelf = stdenv.isLinux;
@@ -33,7 +33,7 @@ let
sha256 = bootstrapHash;
};
- version = "1.11.0";
+ version = "1.12.1";
in
rec {
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 7e29435b7d5..c090cc07d01 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -7,15 +7,15 @@ in
rec {
rustc = callPackage ./rustc.nix {
- shortVersion = "1.12.1";
+ shortVersion = "1.13";
isRelease = true;
forceBundledLLVM = false;
configureFlags = [ "--release-channel=stable" ];
- srcRev = "d4f39402a0c2c2b94ec0375cd7f7f6d7918113cd";
- srcSha = "1lpykjy96rwz4jy28rf7ijca0q9lvckgnbzvcdsrspd5rs2ywfwr";
+ srcRev = "2c6933acc05c61e041be764cb1331f6281993f3f";
+ srcSha = "1w0alyyc29cy2lczrqvg1kfycjxy0xg8fpzdac80m88fxpv23glp";
patches = [
- ./patches/disable-lockfile-check.patch
+ ./patches/disable-lockfile-check-stable.patch
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
inherit targets;
@@ -25,10 +25,10 @@ rec {
};
cargo = callPackage ./cargo.nix rec {
- version = "0.13.0";
- srcRev = "109cb7c33d426044d141457049bd0fffaca1327c";
- srcSha = "0p79m7hpzjh36l4fc6a59h6r8yz6qafjcdg5v1yb7bac9m2wi7vs";
- depsSha256 = "1cwp4p8b985fj8j2qmgsi2mpp51rdpwzm9qa60760nrry1fy624z";
+ version = "0.14.0";
+ srcRev = "eca9e159b6b0d484788ac757cf23052eba75af55";
+ srcSha = "1zm5rzw1mvixnkzr4775pcxx6k235qqxbysyp179cbxsw3dm045s";
+ depsSha256 = "0gpn0cpwgpzwhc359qn6qplx371ag9pqbwayhqrsydk1zm5bm3zr";
inherit rustc; # the rustc that will be wrapped by cargo
inherit rustPlatform; # used to build cargo
diff --git a/pkgs/development/compilers/rust/head.nix b/pkgs/development/compilers/rust/nightly.nix
similarity index 68%
rename from pkgs/development/compilers/rust/head.nix
rename to pkgs/development/compilers/rust/nightly.nix
index 2288a360a51..81741105e26 100644
--- a/pkgs/development/compilers/rust/head.nix
+++ b/pkgs/development/compilers/rust/nightly.nix
@@ -3,13 +3,13 @@
rec {
rustc = callPackage ./rustc.nix {
- shortVersion = "master-1.13.0";
+ shortVersion = "nightly-2016-11-23";
forceBundledLLVM = false;
configureFlags = [ "--release-channel=nightly" ];
- srcRev = "308824acecf902f2b6a9c1538bde0324804ba68e";
- srcSha = "17zv1a27a7w6n3a22brriqx5m6i4s3nsj7mlnpliwghlbz8q7384";
+ srcRev = "d5814b03e652043be607f96e24709e06c2b55429";
+ srcSha = "0x2vr1mda0mr8q28h96zfpv0f26dyrg8jwxznlh6gk0y0mprgcbr";
patches = [
- ./patches/disable-lockfile-check.patch
+ ./patches/disable-lockfile-check-nightly.patch
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
inherit targets;
inherit targetPatches;
@@ -18,10 +18,10 @@ rec {
};
cargo = callPackage ./cargo.nix rec {
- version = "master-2016-07-25";
+ version = "nightly-2016-07-25";
srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0";
srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155";
- depsSha256 = "1p1ygabg9k9b0azm0mrx8asjzdi35c5zw53iysba198lli6bhdl4";
+ depsSha256 = "055ky0lkrcsi976kmvc4lqyv0sjdpcj3jv36kz9hkqq0gip3crjc";
inherit rustc; # the rustc that will be wrapped by cargo
inherit rustPlatform; # used to build cargo
diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix
new file mode 100644
index 00000000000..a60d17fb7cb
--- /dev/null
+++ b/pkgs/development/compilers/rust/nightlyBin.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl, makeWrapper, cacert, zlib }:
+
+let
+ inherit (stdenv.lib) optionalString;
+
+ platform = if stdenv.system == "x86_64-linux"
+ then "x86_64-unknown-linux-gnu"
+ else abort "missing boostrap url for platform ${stdenv.system}";
+
+ bootstrapHash =
+ if stdenv.system == "x86_64-linux"
+ then "1afsqaavhwiaxm38zr08cbq0985c7lrb1jzdcmq0jh6y8rb8ikff"
+ else throw "missing boostrap hash for platform ${stdenv.system}";
+
+ needsPatchelf = stdenv.isLinux;
+
+ src = fetchurl {
+ url = "https://static.rust-lang.org/dist/${version}/rust-nightly-${platform}.tar.gz";
+ sha256 = bootstrapHash;
+ };
+
+ version = "2016-12-05";
+in
+
+rec {
+ rustc = stdenv.mkDerivation rec {
+ name = "rustc-nightly-${version}";
+
+ inherit version;
+ inherit src;
+
+ meta = with stdenv.lib; {
+ homepage = http://www.rust-lang.org/;
+ description = "A safe, concurrent, practical language";
+ maintainers = with maintainers; [ qknight ];
+ license = [ licenses.mit licenses.asl20 ];
+ };
+
+ buildInputs = [ makeWrapper ];
+ phases = ["unpackPhase" "installPhase"];
+
+ installPhase = ''
+ ./install.sh --prefix=$out \
+ --components=rustc,rust-std-x86_64-unknown-linux-gnu
+
+ ${optionalString needsPatchelf ''
+ patchelf \
+ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+ "$out/bin/rustc"
+ ''}
+ '';
+ };
+}
diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch
new file mode 100644
index 00000000000..a6fe3413fd2
--- /dev/null
+++ b/pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch
@@ -0,0 +1,25 @@
+From 5702d7cdb2bed7ac3af3c01087b181da35f6e108 Mon Sep 17 00:00:00 2001
+From: joachim schiele
+Date: Thu, 24 Nov 2016 22:25:48 +0100
+Subject: [PATCH 2/2] asdf
+
+---
+ src/tools/tidy/src/main.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs
+index cabaee5..685df94 100644
+--- a/src/tools/tidy/src/main.rs
++++ b/src/tools/tidy/src/main.rs
+@@ -48,7 +48,7 @@ fn main() {
+ errors::check(&path, &mut bad);
+ cargo::check(&path, &mut bad);
+ features::check(&path, &mut bad);
+- cargo_lock::check(&path, &mut bad);
++ //cargo_lock::check(&path, &mut bad);
+ pal::check(&path, &mut bad);
+
+ if bad {
+--
+2.10.0
+
diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch
new file mode 100644
index 00000000000..c89d22dcb1e
--- /dev/null
+++ b/pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch
@@ -0,0 +1,25 @@
+From ac204f8be95cdb2350a1dd893641e38528aaf01d Mon Sep 17 00:00:00 2001
+From: joachim schiele
+Date: Fri, 25 Nov 2016 02:17:02 +0100
+Subject: [PATCH] asdf
+
+---
+ src/tools/tidy/src/main.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs
+index cb11fe2..c9b7d2a 100644
+--- a/src/tools/tidy/src/main.rs
++++ b/src/tools/tidy/src/main.rs
+@@ -45,7 +45,7 @@ fn main() {
+ bins::check(&path, &mut bad);
+ style::check(&path, &mut bad);
+ errors::check(&path, &mut bad);
+- cargo::check(&path, &mut bad);
++ //cargo::check(&path, &mut bad);
+ features::check(&path, &mut bad);
+ pal::check(&path, &mut bad);
+
+--
+2.10.0
+
diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch
similarity index 100%
rename from pkgs/development/compilers/rust/patches/disable-lockfile-check.patch
rename to pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index e1bff12f398..04543f17ec9 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -46,6 +46,12 @@ stdenv.mkDerivation {
NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib";
+ # Enable nightly features in stable compiles (used for
+ # bootstrapping, see https://github.com/rust-lang/rust/pull/37265).
+ # This loosens the hard restrictions on bootstrapping-compiler
+ # versions.
+ RUSTC_BOOTSTRAP = "1";
+
src = fetchgit {
url = https://github.com/rust-lang/rust;
rev = srcRev;
@@ -88,10 +94,14 @@ stdenv.mkDerivation {
#[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+
# Disable fragile linker-output-non-utf8 test
- rm -vr src/test/run-make/linker-output-non-utf8/
+ rm -vr src/test/run-make/linker-output-non-utf8 || true
# Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835
- rm -vr src/test/run-pass/issue-36023.rs
+ rm -vr src/test/run-pass/issue-36023.rs || true
+
+ # Disable test getting stuck on hydra - possible fix:
+ # https://reviews.llvm.org/rL281650
+ rm -vr src/test/run-pass/issue-36474.rs || true
# Useful debugging parameter
# export VERBOSE=1
diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix
index f8352f0a362..8f442bd890b 100644
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -23,15 +23,20 @@ let
sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5";
};
armv6l-linux = armv7l-linux;
- x86_64-solaris = x86_64-linux;
x86_64-freebsd = rec {
version = "1.2.7";
system = "x86-64-freebsd";
sha256 = "14k42xiqd2rrim4pd5k5pjcrpkac09qnpynha8j1v4jngrvmw7y6";
};
+ x86_64-solaris = rec {
+ version = "1.2.7";
+ system = "x86-64-solaris";
+ sha256 = "05c12fmac4ha72k1ckl6i780rckd7jh4g5s5hiic7fjxnf1kx8d0";
+ };
};
cfg = options.${stdenv.system};
in
+assert builtins.hasAttr stdenv.system options;
stdenv.mkDerivation rec {
name = "sbcl-bootstrap-${version}";
version = cfg.version;
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 788160b5888..8fa4741a4a1 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
name = "sbcl-${version}";
- version = "1.3.10";
+ version = "1.3.12";
src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
- sha256 = "0xspp04y0l0yxfi1zyv0qsj9b6px5i88xpannwpc45mkj6nplmja";
+ sha256 = "1hjr2xqazy4j0m58y4na6fz8ii3xflqairxy7vpd7ajbs00yqfc0";
};
patchPhase = ''
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
(disable (x)
(setf features (remove x features))))
''
- + stdenv.lib.optionalString threadSupport "(enable :sb-thread)"
+ + (if threadSupport then "(enable :sb-thread)" else "(disable :sb-thread)")
+ stdenv.lib.optionalString stdenv.isArm "(enable :arm)"
+ ''
)) " > customize-target-features.lisp
diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index decbf678c34..bc7da3581de 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
- name = "scala-2.12.0";
+ name = "scala-2.12.1";
src = fetchurl {
url = "http://www.scala-lang.org/files/archive/${name}.tgz";
- sha256 = "085k7zl9v3vxaqwq0r0yyj53cb6syvq2safn4fgz3w00ks2fyxw2";
+ sha256 = "0nf37ix3rrm50s7dacwlyr8fl1hgrbxbw5yz21qf58rj8n46ic2d";
};
propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index 928de23f04b..0935891dcbd 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchFromGitHub, boost, cmake, jsoncpp }:
+{ stdenv, fetchgit, boost, cmake, jsoncpp }:
stdenv.mkDerivation rec {
- version = "0.4.4";
+ version = "0.4.6";
name = "solc-${version}";
- src = fetchFromGitHub {
- owner = "ethereum";
- repo = "solidity";
- rev = "v${version}";
- sha256 = "150prr7m0jnx3vhq0wy3avzsijxd3pn7c8jxdvf6jkcc408dgn6z";
+ # Cannot use `fetchFromGitHub' because of submodules
+ src = fetchgit {
+ url = "https://github.com/ethereum/solidity";
+ rev = "2dabbdf06f414750ef0425c664f861aeb3e470b8";
+ sha256 = "0q1dvizx60f7l97w8241wra7vpghimc9x7gzb18vn34sxv4bqy9g";
};
patchPhase = ''
- echo >commit_hash.txt 4633f3def897db0f91237f98cf46e5d84fb05e61
+ echo >commit_hash.txt 2dabbdf06f414750ef0425c664f861aeb3e470b8
'';
buildInputs = [ boost cmake jsoncpp ];
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index c424003fcbb..b91eddee3bf 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -2,21 +2,21 @@
stdenv.mkDerivation rec {
name = "yosys-${version}";
- version = "2016.08.18";
+ version = "2016.11.25";
srcs = [
(fetchFromGitHub {
owner = "cliffordwolf";
repo = "yosys";
- rev = "9b8e06bee177f53c34a9dd6dd907a822f21659be";
- sha256 = "0x5c1bcayahn7pbgycxkxr6lkv9m0jpwfdlmyp2m9yzm2lpyw7dg";
+ rev = "5c2c78e2dd12a860f830dafd73fbed8edf1a3823";
+ sha256 = "1cvfkg0hllp7k2g52mxczd8d0ad7inlpkg27rrbyani2kg0066bk";
name = "yosys";
})
(fetchFromBitbucket {
owner = "alanmi";
repo = "abc";
- rev = "a2e5bc66a68a";
- sha256 = "09yvhj53af91nc54gmy7cbp7yljfcyj68a87494r5xvdfnsj11gy";
+ rev = "238674cd44f2";
+ sha256 = "18xk7lqai05am11zymixilgam4jvz5f2jwy9cgillz035man2yzw";
name = "yosys-abc";
})
];
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index e076c6ca90e..c707592e4ae 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -69,7 +69,7 @@ in
go.stdenv.mkDerivation (
(builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // {
- name = "go${go.meta.branch}-${name}";
+ inherit name;
nativeBuildInputs = [ go parallel ]
++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs;
buildInputs = [ go ] ++ buildInputs;
@@ -211,7 +211,7 @@ go.stdenv.mkDerivation (
meta = {
# Add default meta information
- platforms = lib.platforms.all;
+ platforms = go.meta.platforms or lib.platforms.all;
} // meta // {
# add an extra maintainer to every package
maintainers = (meta.maintainers or []) ++
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4f93b2f857c..a9ad1a695ac 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -4,8 +4,13 @@ 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; });
+ cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_2_0; });
# Link statically to avoid runtime dependency on GHC.
jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = self.Cabal_1_20_0_4; };
@@ -13,6 +18,11 @@ self: super: {
# Apply NixOS-specific patches.
ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch;
+ # enable using a local hoogle with extra packagages in the database
+ # nix-shell -p "haskellPackages.hoogleLocal (with haskellPackages; [ mtl lens ])"
+ # $ hoogle server
+ hoogleLocal = { packages ? [] }: self.callPackage ./hoogle.nix { inherit packages; };
+
# Break infinite recursions.
clock = dontCheck super.clock;
Dust-crypto = dontCheck super.Dust-crypto;
@@ -43,10 +53,12 @@ self: super: {
src = pkgs.fetchFromGitHub {
owner = "joeyh";
repo = "git-annex";
- sha256 = "1np1v2x5n9dl39cbwlqbjap1j5120q4n8p18cm1884vdxidbkc01";
+ sha256 = "1a87kllzxmjwkz5arq4c3bp7qfkabn0arbli6s6i68fkgm19s4gr";
rev = drv.version;
};
})).overrideScope (self: super: {
+ # https://github.com/yesodweb/yesod/issues/1324
+ yesod-persistent = self.yesod-persistent_1_4_1_1;
# https://github.com/prowdsponsor/esqueleto/issues/137
persistent = self.persistent_2_2_4_1;
persistent-template = self.persistent-template_2_1_8_1;
@@ -71,6 +83,14 @@ self: super: {
'';
});
+ # jni needs help finding libjvm.so because it's in a weird location.
+ jni = overrideCabal super.jni (drv: {
+ preConfigure = ''
+ local libdir=( "${pkgs.jdk}/lib/openjdk/jre/lib/"*"/server" )
+ configureFlags+=" --extra-lib-dir=''${libdir[0]}"
+ '';
+ });
+
# The package doesn't know about the AL include hierarchy.
# https://github.com/phaazon/al/issues/1
al = appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL";
@@ -139,7 +159,6 @@ self: super: {
groupoids = dontHaddock super.groupoids;
hamlet = dontHaddock super.hamlet;
HaXml = dontHaddock super.HaXml;
- HDBC-odbc = dontHaddock super.HDBC-odbc;
hoodle-core = dontHaddock super.hoodle-core;
hsc3-db = dontHaddock super.hsc3-db;
http-client-conduit = dontHaddock super.http-client-conduit;
@@ -174,6 +193,11 @@ self: super: {
}))
else super.hakyll;
+ # Heist's test suite requires system pandoc
+ heist = overrideCabal super.heist (drv: {
+ testToolDepends = [pkgs.pandoc];
+ });
+
# cabal2nix likes to generate dependencies on hinotify when hfsevents is really required
# on darwin: https://github.com/NixOS/cabal2nix/issues/146.
hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;
@@ -490,13 +514,11 @@ self: super: {
# https://ghc.haskell.org/trac/ghc/ticket/9625
vty = dontCheck super.vty;
+ vty_5_14 = dontCheck super.vty_5_14;
# https://github.com/vincenthz/hs-crypto-pubkey/issues/20
crypto-pubkey = dontCheck super.crypto-pubkey;
- # https://github.com/Gabriel439/Haskell-Turtle-Library/issues/1
- turtle = dontCheck super.turtle;
-
# https://github.com/Philonous/xml-picklers/issues/5
xml-picklers = dontCheck super.xml-picklers;
@@ -799,11 +821,11 @@ self: super: {
ln -s $lispdir $out/share/emacs/site-lisp
'';
})).override {
- haskell-src-exts = self.haskell-src-exts_1_19_0;
+ haskell-src-exts = self.haskell-src-exts_1_19_1;
};
# # Make elisp files available at a location where people expect it.
- hindent = overrideCabal super.hindent (drv: {
+ hindent = (overrideCabal super.hindent (drv: {
# We cannot easily byte-compile these files, unfortunately, because they
# depend on a new version of haskell-mode that we don't have yet.
postInstall = ''
@@ -812,7 +834,9 @@ self: super: {
ln -s $lispdir $out/share/emacs/site-lisp
'';
doCheck = false; # https://github.com/chrisdone/hindent/issues/299
- });
+ })).override {
+ haskell-src-exts = self.haskell-src-exts_1_19_1;
+ };
# https://github.com/yesodweb/Shelly.hs/issues/106
# https://github.com/yesodweb/Shelly.hs/issues/108
@@ -972,17 +996,37 @@ self: super: {
'';
});
- # https://github.com/commercialhaskell/stack/issues/2263
+ # The most current version needs some packages to build that are not in LTS 7.x.
stack = super.stack.overrideScope (self: super: {
- http-client = self.http-client_0_5_3_4;
+ http-client = self.http-client_0_5_4;
http-client-tls = self.http-client-tls_0_3_3;
http-conduit = self.http-conduit_2_2_3;
optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0;
criterion = super.criterion.override { inherit (super) optparse-applicative; };
+ aeson = self.aeson_1_0_2_1;
});
# 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; };
+ hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_1; };
+
+ # 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_19_1; };
# Test suite fails a QuickCheck property.
optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0;
@@ -1016,16 +1060,19 @@ self: super: {
doCheck = false;
});
+ # https://github.com/bos/math-functions/issues/25
+ math-functions = dontCheck super.math-functions;
+
# http-api-data_0.3.x requires QuickCheck > 2.9, but overriding that version
# is hard because of transitive dependencies, so we just disable tests.
- http-api-data_0_3_2 = dontCheck super.http-api-data_0_3_2;
+ http-api-data_0_3_3 = dontCheck super.http-api-data_0_3_3;
# Fix build for latest versions of servant and servant-client.
servant_0_9_1_1 = super.servant_0_9_1_1.overrideScope (self: super: {
- http-api-data = self.http-api-data_0_3_2;
+ http-api-data = self.http-api-data_0_3_3;
});
servant-client_0_9_1_1 = super.servant-client_0_9_1_1.overrideScope (self: super: {
- http-api-data = self.http-api-data_0_3_2;
+ http-api-data = self.http-api-data_0_3_3;
servant-server = self.servant-server_0_9_1_1;
servant = self.servant_0_9_1_1;
});
@@ -1071,4 +1118,22 @@ self: super: {
# Test suite occasionally runs for 1+ days on Hydra.
distributed-process-tests = dontCheck super.distributed-process-tests;
+ # https://github.com/mulby/diff-parse/issues/9
+ diff-parse = doJailbreak super.diff-parse;
+
+ # 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; });
+
+ # Encountered missing dependencies: hspec >=1.3 && <2.1
+ # https://github.com/rampion/ReadArgs/issues/8
+ ReadArgs = doJailbreak super.ReadArgs;
+
+ # https://github.com/philopon/barrier/issues/3
+ barrier = doJailbreak super.barrier;
+
+ # requires vty 5.13
+ brick = super.brick.overrideScope (self: super: { vty = self.vty_5_14; });
+
}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 9710d139f8a..564ce3c04ec 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -37,10 +37,10 @@ self: super: {
xhtml = null;
# Enable latest version of cabal-install.
- cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_1_0; });
+ cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_2_0; });
# Build jailbreak-cabal with the latest version of Cabal.
- jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_1_0; };
+ jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; };
Extra = appendPatch super.Extra (pkgs.fetchpatch {
url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch";
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index c97296cd5ba..826869f828b 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,6 +53,90 @@ self: super:
terminfo = self.terminfo_0_4_0_1;
xhtml = self.xhtml_3000_2_1;
+
+## 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
+ '';
+ });
+
+ # 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
+ '';
+ });
+
+ # experimental
+ ghcjs-ffiqq = self.callPackage
+ ({ mkDerivation, base, template-haskell, ghcjs-base, split, containers, text, ghc-prim
+ }:
+ mkDerivation {
+ pname = "ghcjs-ffiqq";
+ version = "0.1.0.0";
+ src = pkgs.fetchFromGitHub {
+ owner = "ghcjs";
+ repo = "ghcjs-ffiqq";
+ rev = "b52338c2dcd3b0707bc8aff2e171411614d4aedb";
+ sha256 = "08zxfm1i6zb7n8vbz3dywdy67vkixfyw48580rwfp48rl1s2z1c7";
+ };
+ libraryHaskellDepends = [
+ base template-haskell ghcjs-base split containers text ghc-prim
+ ];
+ description = "FFI QuasiQuoter for GHCJS";
+ license = pkgs.stdenv.lib.licenses.mit;
+ }) {};
+ # experimental
+ ghcjs-vdom = self.callPackage
+ ({ mkDerivation, base, ghc-prim, ghcjs-ffiqq, ghcjs-base, ghcjs-prim
+ , containers, split, template-haskell
+ }:
+ mkDerivation rec {
+ pname = "ghcjs-vdom";
+ version = "0.2.0.0";
+ src = pkgs.fetchFromGitHub {
+ owner = "ghcjs";
+ repo = pname;
+ rev = "1c1175ba22eca6d7efa96f42a72290ade193c148";
+ sha256 = "0c6l1dk2anvz94yy5qblrfh2iv495rjq4qmhlycc24dvd02f7n9m";
+ };
+ libraryHaskellDepends = [
+ base ghc-prim ghcjs-ffiqq ghcjs-base ghcjs-prim containers split
+ template-haskell
+ ];
+ license = pkgs.stdenv.lib.licenses.mit;
+ description = "bindings for https://github.com/Matt-Esch/virtual-dom";
+ inherit (src) homepage;
+ }) {};
+
+ ghcjs-dom = overrideCabal super.ghcjs-dom (drv: {
+ 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
@@ -58,45 +148,13 @@ self: super:
'';
});
- transformers-compat = overrideCabal super.transformers-compat (drv: {
- configureFlags = [];
- });
-
profunctors = overrideCabal super.profunctors (drv: {
preConfigure = ''
sed -i 's/^{-# ANN .* #-}//' src/Data/Profunctor/Unsafe.hs
'';
});
- ghcjs-ffiqq = self.callPackage
- ({ mkDerivation, base, template-haskell, ghcjs-base, split, containers, text, ghc-prim
- }:
- mkDerivation {
- pname = "ghcjs-ffiqq";
- version = "0.1.0.0";
- src = pkgs.fetchFromGitHub {
- owner = "ghcjs";
- repo = "ghcjs-ffiqq";
- rev = "da31b18582542fcfceade5ef6b2aca66662b9e20";
- sha256 = "1mkp8p9hispyzvkb5v607ihjp912jfip61id8d42i19k554ssp8y";
- };
- libraryHaskellDepends = [
- base template-haskell ghcjs-base split containers text ghc-prim
- ];
- description = "FFI QuasiQuoter for GHCJS";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- ghcjs-dom = overrideCabal super.ghcjs-dom (drv: {
- libraryHaskellDepends = [ self.ghcjs-base ] ++
- removeLibraryHaskellDepends [
- "glib" "gtk" "gtk3" "webkitgtk" "webkitgtk3"
- ] drv.libraryHaskellDepends;
- });
-
- ghc-paths = overrideCabal super.ghc-paths (drv: {
- patches = [ ./patches/ghc-paths-nix-ghcjs.patch ];
- });
+ protolude = doJailbreak super.protolude;
# reflex 0.3, made compatible with the newest GHCJS.
reflex = overrideCabal super.reflex (drv: {
@@ -122,12 +180,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 37b050d05d4..f766b2be8f5 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -31,8 +31,13 @@ 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
+ # of this library are maked as "broken".
+ - ghcjs-base-0
+
default-package-overrides:
- # LTS Haskell 7.8
+ # LTS Haskell 7.14
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Vector ==2.3.2
@@ -46,7 +51,7 @@ default-package-overrides:
- adjunctions ==4.3
- adler32 ==0.1.1.0
- aeson ==0.11.2.1
- - aeson-better-errors ==0.9.0.1
+ - aeson-better-errors ==0.9.1.0
- aeson-casing ==0.1.0.5
- aeson-compat ==0.3.6
- aeson-generic-compat ==0.0.1.0
@@ -141,16 +146,16 @@ default-package-overrides:
- app-settings ==0.2.0.9
- appar ==0.1.4
- apply-refact ==0.3.0.0
- - arbtt ==0.9.0.10
+ - arbtt ==0.9.0.11
- arithmoi ==0.4.3.0
- array-memoize ==0.6.0
- arrow-list ==0.7
- ascii-progress ==0.3.3.0
- - asciidiagram ==1.3.2
+ - asciidiagram ==1.3.3
- asn1-encoding ==0.9.4
- asn1-parse ==0.9.4
- asn1-types ==0.3.2
- - async ==2.1.0
+ - async ==2.1.1
- async-dejafu ==0.1.3.0
- atndapi ==0.1.1.0
- atom-conduit ==0.3.1.2
@@ -165,7 +170,7 @@ default-package-overrides:
- auto-update ==0.1.4
- autoexporter ==0.2.2
- aws ==0.14.1
- - b9 ==0.5.21
+ - b9 ==0.5.30
- bake ==0.4
- bank-holidays-england ==0.1.0.5
- base-compat ==0.9.1
@@ -192,7 +197,7 @@ default-package-overrides:
- binary-orphans ==0.1.5.1
- binary-parser ==0.5.2
- binary-search ==1.0.0.3
- - binary-tagged ==0.1.4.1
+ - binary-tagged ==0.1.4.2
- binary-typed ==1.0
- bindings-DSL ==1.0.23
- bindings-GLFW ==3.1.2.2
@@ -214,12 +219,12 @@ default-package-overrides:
- bitx-bitcoin ==0.10.0.0
- blake2 ==0.2.0
- blank-canvas ==0.6
- - BlastHTTP ==1.2.0
+ - BlastHTTP ==1.2.1
- blastxml ==0.3.2
- blaze-bootstrap ==0.1.0.1
- blaze-builder ==0.4.0.2
- - blaze-html ==0.8.1.2
- - blaze-markup ==0.7.1.0
+ - blaze-html ==0.8.1.3
+ - blaze-markup ==0.7.1.1
- blaze-svg ==0.3.6
- blaze-textual ==0.2.1.0
- bloodhound ==0.11.0.0
@@ -231,7 +236,7 @@ default-package-overrides:
- both ==0.1.1.0
- BoundedChan ==1.0.3.0
- boundingboxes ==0.2.3
- - bower-json ==0.8.0
+ - bower-json ==0.8.1
- boxes ==0.1.4
- broadcast-chan ==0.1.1
- bson ==0.3.2.3
@@ -246,7 +251,7 @@ default-package-overrides:
- byteset ==0.1.1.0
- bytestring-builder ==0.10.8.1.0
- bytestring-conversion ==0.3.1
- - bytestring-handle ==0.1.0.4
+ - bytestring-handle ==0.1.0.5
- bytestring-lexing ==0.5.0.2
- bytestring-progress ==1.0.7
- bytestring-tree-builder ==0.2.7.1
@@ -254,12 +259,11 @@ default-package-overrides:
- bzlib ==0.5.0.5
- bzlib-conduit ==0.2.1.4
- c2hs ==0.28.1
- - Cabal ==1.24.1.0
+ - Cabal ==1.24.2.0
- cabal-dependency-licenses ==0.1.2.0
- - cabal-file-th ==0.2.3
+ - cabal-file-th ==0.2.4
- cabal-helper ==0.7.2.0
- - cabal-install ==1.24.0.1
- - cabal-rpm ==0.10.0
+ - cabal-rpm ==0.10.1
- cabal-sort ==0.0.5.3
- cabal-src ==0.3.0.2
- cache ==0.1.0.0
@@ -272,16 +276,16 @@ default-package-overrides:
- case-insensitive ==1.2.0.7
- cased ==0.1.0.0
- cases ==0.1.3.1
- - cassava ==0.4.5.0
+ - cassava ==0.4.5.1
- cassava-conduit ==0.3.2
- cassava-megaparsec ==0.1.0
- cassette ==0.1.0
- - cayley-client ==0.2.1.0
- - cereal ==0.5.3.0
+ - cayley-client ==0.2.1.1
+ - cereal ==0.5.4.0
- cereal-conduit ==0.7.3
- cereal-text ==0.1.0.2
- cereal-vector ==0.2.0.1
- - cgi ==3001.3.0.1
+ - cgi ==3001.3.0.2
- ChannelT ==0.0.0.2
- charset ==0.3.7.1
- charsetdetect-ae ==1.1.0.1
@@ -309,9 +313,9 @@ default-package-overrides:
- clash-systemverilog ==0.6.10
- clash-verilog ==0.6.10
- clash-vhdl ==0.6.16
- - classy-prelude ==1.0.0.2
- - classy-prelude-conduit ==1.0.0
- - classy-prelude-yesod ==1.0.0
+ - classy-prelude ==1.0.2
+ - classy-prelude-conduit ==1.0.2
+ - classy-prelude-yesod ==1.0.2
- clay ==0.11
- clckwrks ==0.23.19.2
- clckwrks-cli ==0.2.16
@@ -320,12 +324,12 @@ default-package-overrides:
- clckwrks-theme-bootstrap ==0.4.2
- cli ==0.1.2
- clientsession ==0.9.1.2
- - Clipboard ==2.3.0.1
+ - Clipboard ==2.3.0.2
- clock ==0.7.2
- clumpiness ==0.17.0.0
- ClustalParser ==1.1.4
- clustering ==0.2.1
- - cmark ==0.5.3.1
+ - cmark ==0.5.4
- cmark-highlight ==0.2.0.0
- cmark-lucid ==0.1.0.0
- cmdargs ==0.10.14
@@ -346,8 +350,8 @@ default-package-overrides:
- concurrent-output ==1.7.7
- concurrent-supply ==0.1.8
- conduit ==1.2.8
- - conduit-combinators ==1.0.8.1
- - conduit-extra ==1.1.13.3
+ - conduit-combinators ==1.0.8.3
+ - conduit-extra ==1.1.15
- conduit-iconv ==0.1.1.1
- conduit-parse ==0.1.2.0
- ConfigFile ==1.1.4
@@ -375,7 +379,7 @@ default-package-overrides:
- cpu ==0.1.2
- crackNum ==1.5
- criterion ==1.1.1.0
- - cron ==0.4.1.2
+ - cron ==0.4.2
- crypto-api ==0.13.2
- crypto-api-tests ==0.3
- crypto-cipher-tests ==0.0.11
@@ -389,6 +393,8 @@ default-package-overrides:
- cryptohash ==0.11.9
- cryptohash-conduit ==0.1.1
- cryptohash-cryptoapi ==0.1.4
+ - cryptohash-md5 ==0.11.100.1
+ - cryptohash-sha1 ==0.11.100.1
- cryptohash-sha256 ==0.11.100.1
- cryptol ==2.4.0
- cryptonite ==0.19
@@ -429,7 +435,7 @@ default-package-overrides:
- dependent-sum ==0.3.2.2
- dependent-sum-template ==0.0.0.5
- derive ==2.5.26
- - deriving-compat ==0.3.4
+ - deriving-compat ==0.3.5
- descriptive ==0.9.4
- diagrams ==1.3.0.1
- diagrams-cairo ==1.3.1.1
@@ -449,7 +455,7 @@ default-package-overrides:
- digest ==0.0.1.2
- digits ==0.3.1
- dimensional ==1.0.1.3
- - direct-sqlite ==2.3.18
+ - direct-sqlite ==2.3.19
- directory-tree ==0.12.1
- discount ==0.1.1
- disk-free-space ==0.1.0.1
@@ -462,20 +468,20 @@ default-package-overrides:
- djinn-lib ==0.0.1.2
- dlist ==0.8.0.2
- dlist-instances ==0.1.1.1
- - dns ==2.0.8
+ - dns ==2.0.10
- do-list ==1.0.1
- dockerfile ==0.1.0.1
- - docopt ==0.7.0.4
+ - docopt ==0.7.0.5
- doctest ==0.11.0
- doctest-discover ==0.1.0.7
- doctest-prop ==0.2.0.1
- docvim ==0.3.2.1
- dotenv ==0.3.1.0
- dotnet-timespan ==0.0.1.0
- - double-conversion ==2.0.1.0
+ - double-conversion ==2.0.2.0
- download ==0.3.2.5
- dpor ==0.2.0.0
- - drawille ==0.1.0.6
+ - drawille ==0.1.2.0
- DRBG ==0.5.5
- drifter ==0.2.2
- drifter-postgresql ==0.0.2
@@ -486,7 +492,7 @@ default-package-overrides:
- easy-file ==0.2.1
- Ebnf2ps ==1.0.15
- ed25519 ==0.0.5.0
- - ede ==0.2.8.5
+ - ede ==0.2.8.6
- EdisonAPI ==1.3.1
- EdisonCore ==1.3.1.1
- edit-distance ==0.2.2.1
@@ -510,7 +516,7 @@ default-package-overrides:
- eq ==4.0.4
- equivalence ==0.3.1
- erf ==2.0.0.0
- - errors ==2.1.2
+ - errors ==2.1.3
- ersatz ==0.3.1
- etcd ==1.0.5
- ether ==0.4.0.2
@@ -520,7 +526,7 @@ default-package-overrides:
- exact-combinatorics ==0.2.0.8
- exact-pi ==0.4.1.2
- exception-mtl ==0.4.0.1
- - exception-transformers ==0.4.0.4
+ - exception-transformers ==0.4.0.5
- exceptional ==0.3.0.0
- exceptions ==0.8.3
- executable-hash ==0.2.0.2
@@ -547,7 +553,7 @@ default-package-overrides:
- fay-text ==0.3.2.2
- fay-uri ==0.2.0.0
- fb ==1.0.13
- - fclabels ==2.0.3.1
+ - fclabels ==2.0.3.2
- feature-flags ==0.1.0.1
- feed ==0.3.11.1
- FenwickTree ==0.1.2.1
@@ -573,20 +579,20 @@ default-package-overrides:
- fmlist ==0.9
- fn ==0.3.0.1
- focus ==0.1.5
- - fold-debounce ==0.2.0.3
+ - fold-debounce ==0.2.0.4
- fold-debounce-conduit ==0.1.0.4
- foldl ==1.2.1
- FontyFruity ==0.5.3.2
- force-layout ==0.4.0.6
- forecast-io ==0.2.0.0
- foreign-store ==0.2
- - formatting ==6.2.3
+ - formatting ==6.2.4
- fortran-src ==0.1.0.4
- - Frames ==0.1.6
+ - Frames ==0.1.9
- free ==4.12.4
- free-vl ==0.1.4
- freenect ==1.2.1
- - freer ==0.2.3.0
+ - freer ==0.2.4.1
- friendly-time ==0.4
- frisby ==0.2
- frontmatter ==0.1.0.2
@@ -602,9 +608,11 @@ default-package-overrides:
- generic-xmlpickler ==0.1.0.5
- GenericPretty ==1.2.1
- generics-eot ==0.2.1.1
- - generics-sop ==0.2.2.0
- - generics-sop-lens ==0.1.2.0
+ - generics-sop ==0.2.3.0
+ - generics-sop-lens ==0.1.2.1
- geniplate-mirror ==0.7.4
+ - genvalidity ==0.2.0.4
+ - genvalidity-hspec ==0.2.0.5
- getopt-generics ==0.13
- ghc-events ==0.4.4.0
- ghc-exactprint ==0.5.2.1
@@ -616,7 +624,7 @@ default-package-overrides:
- ghc-typelits-extra ==0.2.1
- ghc-typelits-knownnat ==0.2.2
- ghc-typelits-natnormalise ==0.5.1
- - ghcid ==0.6.5
+ - ghcid ==0.6.6
- ghcjs-codemirror ==0.0.0.1
- ghcjs-hplay ==0.3.4.2
- ghcjs-perch ==0.3.3
@@ -647,9 +655,9 @@ default-package-overrides:
- glabrous ==0.1.3.0
- GLFW-b ==1.4.8.1
- glib ==0.13.4.1
- - Glob ==0.7.12
+ - Glob ==0.7.13
- gloss ==1.10.2.3
- - gloss-rendering ==1.10.3.3
+ - gloss-rendering ==1.10.3.5
- GLURaw ==2.0.0.2
- GLUT ==2.7.0.10
- gogol ==0.1.0
@@ -793,7 +801,7 @@ default-package-overrides:
- hashable ==1.2.4.0
- hashable-extras ==0.2.3
- hashable-time ==0.2
- - hashmap ==1.3.1.1
+ - hashmap ==1.3.2
- hashtables ==1.2.1.0
- haskeline ==0.7.2.3
- haskell-gi ==0.18
@@ -812,7 +820,7 @@ default-package-overrides:
- haskoin-core ==0.4.0
- hasql ==0.19.15.2
- hastache ==0.6.1
- - hasty-hamiltonian ==1.1.4
+ - hasty-hamiltonian ==1.1.5
- HaTeX ==3.17.0.2
- hatex-guide ==1.3.1.5
- hbayes ==0.5.2
@@ -826,7 +834,7 @@ default-package-overrides:
- heap ==1.0.3
- heaps ==0.3.3
- hebrew-time ==0.1.1
- - hedis ==0.9.4
+ - hedis ==0.9.5
- here ==1.2.9
- heredoc ==0.2.0.0
- hex ==0.1.2
@@ -839,16 +847,16 @@ default-package-overrides:
- hidapi ==0.1.4
- hierarchical-clustering ==0.4.6
- highlighting-kate ==0.6.3
- - hindent ==4.6.4
- - hinotify ==0.3.8.1
+ - hinotify ==0.3.9
- hint ==0.6.0
+ - hip ==1.2.0.0
- histogram-fill ==0.8.4.1
- hit ==0.6.3
- hjsmin ==0.2.0.2
- hjsonpointer ==1.0.0.2
- hjsonschema ==1.1.0.1
- hledger ==1.0.1
- - hledger-interest ==1.5
+ - hledger-interest ==1.5.1
- hledger-lib ==1.0.1
- hlibgit2 ==0.18.0.15
- hlibsass ==0.1.5.0
@@ -870,7 +878,6 @@ default-package-overrides:
- hostname ==1.0
- hostname-validate ==1.0.0
- hourglass ==0.2.10
- - hpack ==0.14.1
- hpack-convert ==0.14.6
- hpc-coveralls ==1.0.6
- hPDB ==1.2.0.9
@@ -878,7 +885,7 @@ default-package-overrides:
- HPDF ==1.4.10
- hpio ==0.8.0.4
- hprotoc ==2.4.0
- - hquantlib ==0.0.3.2
+ - hquantlib ==0.0.3.3
- hreader ==1.0.2
- hruby ==0.3.4.2
- hs-bibutils ==5.5
@@ -917,7 +924,7 @@ default-package-overrides:
- hspec-wai ==0.6.6
- hspec-wai-json ==0.6.1
- hspec-webdriver ==1.2.0
- - hstatistics ==0.2.5.3
+ - hstatistics ==0.2.5.4
- hstatsd ==0.1
- HStringTemplate ==0.8.5
- hsx-jmacro ==7.3.8
@@ -927,16 +934,16 @@ default-package-overrides:
- HTF ==0.13.1.0
- html ==1.0.1.2
- html-conduit ==1.2.1.1
- - htoml ==1.0.0.1
+ - htoml ==1.0.0.3
- HTTP ==4000.3.3
- http-api-data ==0.2.4
- - http-client ==0.4.31.1
+ - http-client ==0.4.31.2
- http-client-openssl ==0.2.0.4
- http-client-tls ==0.2.4.1
- http-common ==0.8.2.0
- http-conduit ==2.1.11
- http-date ==0.0.6.1
- - http-link-header ==1.0.2
+ - http-link-header ==1.0.3
- http-media ==0.6.4
- http-reverse-proxy ==0.4.3.2
- http-streams ==0.8.4.0
@@ -971,7 +978,7 @@ default-package-overrides:
- iconv ==0.4.1.3
- identicon ==0.1.0
- idris ==0.12.3
- - ieee754 ==0.7.8
+ - ieee754 ==0.7.9
- IfElse ==0.85
- ignore ==0.1.1.0
- ilist ==0.2.0.0
@@ -990,10 +997,10 @@ default-package-overrides:
- inline-r ==0.9.0.0
- insert-ordered-containers ==0.1.0.1
- integration ==0.2.1
- - intero ==0.1.19
+ - intero ==0.1.20
- interpolate ==0.1.0
- interpolatedstring-perl6 ==1.0.0
- - IntervalMap ==0.5.1.1
+ - IntervalMap ==0.5.2.0
- intervals ==0.7.2
- invariant ==0.4
- io-choice ==0.0.6
@@ -1006,7 +1013,7 @@ default-package-overrides:
- io-streams-haproxy ==1.0.0.1
- ip6addr ==0.5.1.4
- iproute ==1.7.1
- - IPv6Addr ==0.6.1.0
+ - IPv6Addr ==0.6.2.0
- irc ==0.6.1.0
- irc-client ==0.4.4.1
- irc-conduit ==0.2.1.1
@@ -1029,7 +1036,7 @@ default-package-overrides:
- js-flot ==0.8.3
- js-jquery ==3.1.1
- json ==0.9.1
- - json-autotype ==1.0.14
+ - json-autotype ==1.0.15
- json-rpc-generic ==0.2.1.2
- json-schema ==0.7.4.1
- JuicyPixels ==3.2.8
@@ -1049,14 +1056,14 @@ default-package-overrides:
- kraken ==0.0.3
- lackey ==0.4.1
- language-c ==0.5.0
- - language-c-quote ==0.11.7
+ - language-c-quote ==0.11.7.1
- language-dockerfile ==0.3.5.0
- language-ecmascript ==0.17.1.0
- language-fortran ==0.5.1
- language-glsl ==0.2.0
- language-haskell-extract ==0.2.4
- language-java ==0.2.8
- - language-javascript ==0.6.0.8
+ - language-javascript ==0.6.0.9
- language-lua2 ==0.1.0.5
- language-nix ==2.1.0.1
- language-puppet ==1.3.1.1
@@ -1087,6 +1094,7 @@ default-package-overrides:
- lift-generics ==0.1.1
- lifted-async ==0.9.0
- lifted-base ==0.2.3.8
+ - line ==1.0.1.0
- linear ==1.20.5
- linear-accelerate ==0.2
- linux-file-extents ==0.2.0.0
@@ -1105,7 +1113,7 @@ default-package-overrides:
- lrucache ==1.2.0.0
- lrucaching ==0.3.0
- ltext ==0.1.2.1
- - lucid ==2.9.6
+ - lucid ==2.9.7
- lucid-svg ==0.7.0.0
- machines ==0.6.1
- magic ==1.1
@@ -1113,21 +1121,21 @@ default-package-overrides:
- makefile ==0.1.0.5
- managed ==1.0.5
- mandrill ==0.5.2.3
- - markdown ==0.1.15
+ - markdown ==0.1.16
- markdown-unlit ==0.4.0
- markup ==3.1.0
- - math-functions ==0.2.0.2
- - matrices ==0.4.3
+ - math-functions ==0.2.1.0
+ - matrices ==0.4.4
- matrix ==0.3.5.0
- maximal-cliques ==0.1.1
- mbox ==0.3.3
- - mcmc-types ==1.0.2
+ - mcmc-types ==1.0.3
- megaparsec ==5.0.1
- memory ==0.13
- MemoTrie ==0.6.4
- mersenne-random ==1.0.0.1
- mersenne-random-pure64 ==0.2.0.5
- - messagepack ==0.5.3
+ - messagepack ==0.5.4
- messagepack-rpc ==0.5.1
- metrics ==0.3.0.2
- MFlow ==0.4.6.0
@@ -1139,15 +1147,15 @@ default-package-overrides:
- microlens-mtl ==0.1.10.0
- microlens-platform ==0.3.7.0
- microlens-th ==0.4.1.0
- - mighty-metropolis ==1.0.3
- - mime-mail ==0.4.11
+ - mighty-metropolis ==1.0.4
+ - mime-mail ==0.4.12
- mime-mail-ses ==0.3.2.3
- mime-types ==0.1.0.7
- misfortune ==0.1.1.2
- missing-foreign ==0.1.1
- MissingH ==1.4.0.1
- mmap ==0.5.9
- - mmorph ==1.0.6
+ - mmorph ==1.0.9
- mockery ==0.3.4
- modify-fasta ==0.8.2.1
- moesocks ==1.0.0.41
@@ -1156,10 +1164,10 @@ default-package-overrides:
- monad-extras ==0.5.11
- monad-http ==0.1.0.0
- monad-journal ==0.7.2
- - monad-logger ==0.3.20
+ - monad-logger ==0.3.20.1
- monad-logger-json ==0.1.0.0
- monad-logger-prefix ==0.1.6
- - monad-logger-syslog ==0.1.2.0
+ - monad-logger-syslog ==0.1.3.0
- monad-loops ==0.4.3
- monad-par ==0.3.4.8
- monad-par-extras ==0.3.3
@@ -1198,10 +1206,10 @@ default-package-overrides:
- murmur-hash ==0.1.0.9
- murmur3 ==1.0.3
- MusicBrainz ==0.2.4
- - mustache ==2.1
+ - mustache ==2.1.2
- mutable-containers ==0.3.3
- mwc-probability ==1.2.2
- - mwc-random ==0.13.4.0
+ - mwc-random ==0.13.5.0
- mwc-random-monad ==0.7.3.1
- nagios-check ==0.3.2
- names-th ==0.2.0.2
@@ -1245,7 +1253,7 @@ default-package-overrides:
- ObjectName ==1.1.0.1
- octane ==0.16.3
- Octree ==0.5.4.3
- - oeis ==0.3.7
+ - oeis ==0.3.8
- ofx ==0.4.2.0
- old-locale ==1.0.0.7
- old-time ==1.1.0.3
@@ -1253,15 +1261,15 @@ default-package-overrides:
- once ==0.2
- OneTuple ==0.2.1
- oo-prototypes ==0.1.0.0
- - opaleye ==0.5.1.1
+ - opaleye ==0.5.2.2
- opaleye-trans ==0.3.3
- open-browser ==0.2.1.0
- OpenGL ==3.0.1.0
- - OpenGLRaw ==3.2.3.0
+ - OpenGLRaw ==3.2.4.0
- openpgp-asciiarmor ==0.1
- opensource ==0.1.0.0
- openssl-streams ==1.2.1.0
- - operational ==0.2.3.4
+ - operational ==0.2.3.5
- operational-class ==0.3.0.0
- opml-conduit ==0.5.0.1
- optional-args ==1.0.1
@@ -1280,16 +1288,16 @@ default-package-overrides:
- pagination ==0.1.1
- palette ==0.1.0.4
- pandoc ==1.17.1
- - pandoc-citeproc ==0.10.2.2
+ - pandoc-citeproc ==0.10.3
- pandoc-types ==1.16.1.1
- pango ==0.13.3.1
- parallel ==3.2.1.0
- parallel-io ==0.3.3
- - parseargs ==0.2.0.7
+ - parseargs ==0.2.0.8
- parsec ==3.1.11
- parsers ==0.12.4
- partial-handler ==1.0.2
- - path ==0.5.9
+ - path ==0.5.11
- path-extra ==0.0.3
- path-io ==1.2.0
- path-pieces ==0.2.1
@@ -1315,7 +1323,7 @@ default-package-overrides:
- persistent-refs ==0.4
- persistent-sqlite ==2.6
- persistent-template ==2.5.1.6
- - pgp-wordlist ==0.1.0.1
+ - pgp-wordlist ==0.1.0.2
- phantom-state ==0.2.1.2
- picoparsec ==0.1.2.3
- pinboard ==0.9.6
@@ -1325,22 +1333,22 @@ default-package-overrides:
- pipes-aeson ==0.4.1.7
- pipes-attoparsec ==0.5.1.4
- pipes-bgzf ==0.2.0.1
- - pipes-bytestring ==2.1.3
+ - pipes-bytestring ==2.1.4
- pipes-cacophony ==0.4.0
- pipes-cliff ==0.12.0.0
- - pipes-concurrency ==2.0.6
+ - pipes-concurrency ==2.0.7
- pipes-csv ==1.4.3
- - pipes-extras ==1.0.7
+ - pipes-extras ==1.0.8
- pipes-fastx ==0.3.0.0
- - pipes-group ==1.0.5
+ - pipes-group ==1.0.6
- pipes-http ==1.0.4
- pipes-illumina ==0.1.0.0
- pipes-mongodb ==0.1.0.0
- pipes-network ==0.6.4.1
- - pipes-parse ==3.0.7
- - pipes-random ==1.0.0.1
+ - pipes-parse ==3.0.8
+ - pipes-random ==1.0.0.2
- pipes-safe ==2.2.4
- - pipes-text ==0.0.2.4
+ - pipes-text ==0.0.2.5
- pipes-wai ==3.2.0
- pixelated-avatar-generator ==0.1.3
- pkcs10 ==0.1.1.0
@@ -1394,7 +1402,7 @@ default-package-overrides:
- proxied ==0.2
- psql-helpers ==0.1.0.0
- PSQueue ==1.1
- - psqueues ==0.2.2.2
+ - psqueues ==0.2.2.3
- publicsuffix ==0.20160716
- pure-cdb ==0.1.2
- pure-io ==0.2.1
@@ -1435,9 +1443,9 @@ default-package-overrides:
- read-editor ==0.1.0.2
- read-env-var ==0.1.0.1
- readable ==0.3.1
- - ReadArgs ==1.2.2
+ - ReadArgs ==1.2.3
- readline ==1.0.3.0
- - rebase ==1.0.2.1
+ - rebase ==1.0.6
- redis-io ==0.7.0
- redis-resp ==0.4.0
- reducers ==3.12.1
@@ -1473,7 +1481,7 @@ default-package-overrides:
- reroute ==0.4.0.1
- resolve-trivial-conflicts ==0.3.2.3
- resource-pool ==0.2.3.2
- - resourcet ==1.1.8
+ - resourcet ==1.1.8.1
- rest-client ==0.5.1.1
- rest-core ==0.39
- rest-gen ==0.19.0.3
@@ -1484,7 +1492,7 @@ default-package-overrides:
- result ==0.2.6.0
- rethinkdb ==2.2.0.7
- rethinkdb-client-driver ==0.0.23
- - retry ==0.7.4.1
+ - retry ==0.7.4.2
- rev-state ==0.1.2
- rfc5051 ==0.1.0.3
- rng-utils ==0.2.1
@@ -1496,13 +1504,14 @@ default-package-overrides:
- runmemo ==1.0.0.1
- rvar ==0.2.0.3
- s3-signer ==0.3.0.0
- - safe ==0.3.9
+ - safe ==0.3.10
- safe-exceptions ==0.1.4.0
- safecopy ==0.9.2
- SafeSemaphore ==0.10.1
- sampling ==0.2.0
- sandi ==0.4.0
- sandman ==0.2.0.1
+ - say ==0.1.0.0
- sbv ==5.12
- scalpel ==0.3.1
- scanner ==0.2
@@ -1553,7 +1562,7 @@ default-package-overrides:
- SHA ==1.6.4.2
- shake ==0.15.10
- shake-language-c ==0.10.0
- - shakespeare ==2.0.11.1
+ - shakespeare ==2.0.11.2
- shell-conduit ==4.5.2
- shelly ==1.6.8.1
- shortcut-links ==0.4.2.0
@@ -1579,24 +1588,24 @@ default-package-overrides:
- smallcaps ==0.6.0.3
- smallcheck ==1.1.1
- smoothie ==0.4.2.3
- - smsaero ==0.6.1
+ - smsaero ==0.6.2
- smtLib ==1.0.8
- - smtp-mail ==0.1.4.5
- - snap-core ==1.0.0.0
- - snap-server ==1.0.1.0
+ - smtp-mail ==0.1.4.6
+ - snap-core ==1.0.1.0
+ - snap-server ==1.0.1.1
- snowflake ==0.1.1.1
- - soap ==0.2.3.1
+ - soap ==0.2.3.3
- soap-openssl ==0.1.0.2
- soap-tls ==0.1.1.2
- socket ==0.6.1.0
- socks ==0.5.5
- solga ==0.1.0.1
- - solga-swagger ==0.1.0.1
+ - solga-swagger ==0.1.0.2
- sorted-list ==0.2.0.0
- sourcemap ==0.1.6
- spdx ==0.2.1.0
- speculation ==1.5.0.3
- - speedy-slice ==0.1.4
+ - speedy-slice ==0.1.5
- sphinx ==0.6.0.2
- Spintax ==0.1.0.1
- splice ==0.6.1.1
@@ -1610,11 +1619,11 @@ default-package-overrides:
- spool ==0.1
- spoon ==0.3.1
- sql-words ==0.1.4.1
- - sqlite-simple ==0.4.9.0
+ - sqlite-simple ==0.4.12.0
- srcloc ==0.5.1.0
- stache ==0.1.8
- stack-run-auto ==0.1.1.4
- - stackage-curator ==0.14.1.1
+ - stackage-curator ==0.14.3
- stackage-types ==1.2.0
- state-plus ==0.1.2
- stateref ==0.3
@@ -1632,7 +1641,7 @@ default-package-overrides:
- STMonadTrans ==0.3.4
- stopwatch ==0.1.0.3
- storable-complex ==0.2.2
- - storable-endian ==0.2.5
+ - storable-endian ==0.2.6
- storable-record ==0.0.3.1
- store ==0.2.1.2
- store-core ==0.2.0.2
@@ -1683,7 +1692,7 @@ default-package-overrides:
- tar ==0.5.0.3
- tardis ==0.4.1.0
- tasty ==0.11.0.4
- - tasty-ant-xml ==1.0.2
+ - tasty-ant-xml ==1.0.3
- tasty-dejafu ==0.3.0.2
- tasty-expected-failure ==0.11.0.4
- tasty-golden ==2.3.1.1
@@ -1705,13 +1714,13 @@ default-package-overrides:
- terminal-progress-bar ==0.0.1.4
- terminal-size ==0.3.2.1
- terminfo ==0.4.0.2
- - test-fixture ==0.4.1.0
+ - test-fixture ==0.4.2.0
- test-framework ==0.8.1.1
- test-framework-hunit ==0.3.0.2
- test-framework-quickcheck2 ==0.3.0.3
- test-framework-smallcheck ==0.2
- test-framework-th ==0.2.4
- - test-simple ==0.1.8
+ - test-simple ==0.1.9
- testing-feat ==0.4.0.3
- texmath ==0.8.6.7
- text ==1.2.2.1
@@ -1730,16 +1739,17 @@ default-package-overrides:
- tf-random ==0.5
- th-data-compat ==0.0.2.2
- th-desugar ==1.6
- - th-expand-syns ==0.4.0.0
+ - th-expand-syns ==0.4.1.0
- th-extras ==0.0.0.4
- th-lift ==0.7.6
- - th-lift-instances ==0.1.10
- - th-orphans ==0.13.2
+ - th-lift-instances ==0.1.11
+ - th-orphans ==0.13.3
- th-printf ==0.3.1
- th-reify-compat ==0.0.1.1
- th-reify-many ==0.1.6
+ - th-to-exp ==0.0.1.0
- th-utilities ==0.2.0.1
- - these ==0.7.2
+ - these ==0.7.3
- threads ==0.5.1.4
- through-text ==0.1.0.0
- thumbnail-plus ==1.0.5
@@ -1748,7 +1758,7 @@ default-package-overrides:
- time-compat ==0.1.0.3
- time-lens ==0.4.0.1
- time-locale-compat ==0.1.1.3
- - time-parsers ==0.1.1.0
+ - time-parsers ==0.1.2.0
- timeit ==1.0.0.0
- timelens ==0.2.0.2
- timemap ==0.0.4
@@ -1764,13 +1774,13 @@ default-package-overrides:
- transformers-base ==0.4.4
- transformers-compat ==0.5.1.4
- transformers-lift ==0.1.0.1
- - transient ==0.4.4
- - transient-universe ==0.3.5
+ - transient ==0.4.4.1
+ - transient-universe ==0.3.5.1
- traverse-with-class ==0.2.0.4
- tree-fun ==0.8.1.0
- tree-view ==0.4
- tries ==0.0.4
- - trifecta ==1.6
+ - trifecta ==1.6.1
- true-name ==0.1.0.2
- ttrie ==0.1.2.1
- tttool ==1.6.1.2
@@ -1792,7 +1802,7 @@ default-package-overrides:
- typelits-witnesses ==0.2.3.0
- typography-geometry ==1.0.0.1
- tzdata ==0.1.20160614.0
- - ua-parser ==0.7.1
+ - ua-parser ==0.7.2
- uglymemo ==0.1.0.1
- unbound ==0.5.1
- unbound-generics ==0.3.1
@@ -1818,11 +1828,11 @@ default-package-overrides:
- universe-instances-trans ==1.0.0.1
- universe-reverse-instances ==1.0
- unix-bytestring ==0.3.7.3
- - unix-compat ==0.4.2.0
+ - unix-compat ==0.4.3.1
- unix-time ==0.3.7
- Unixutils ==1.54.1
- unordered-containers ==0.2.7.1
- - uri-bytestring ==0.2.2.0
+ - uri-bytestring ==0.2.2.1
- uri-encode ==1.5.0.5
- url ==2.1.3
- urlpath ==5.0.0.1
@@ -1835,18 +1845,19 @@ default-package-overrides:
- utility-ht ==0.0.12
- uu-interleaved ==0.2.0.0
- uu-parsinglib ==2.9.1.1
- - uuid ==1.3.12
+ - uuid ==1.3.13
- uuid-orphans ==1.4.1
- uuid-types ==1.0.3
- vado ==0.0.7
- validate-input ==0.4.0.0
- - validation ==0.5.3
+ - validation ==0.5.4
+ - validity ==0.3.0.4
- varying ==0.5.0.3
- vault ==0.3.0.6
- vcswrapper ==0.1.3
- vector ==0.11.0.0
- vector-algorithms ==0.7.0.1
- - vector-binary-instances ==0.2.3.2
+ - vector-binary-instances ==0.2.3.3
- vector-buffer ==0.4.1
- vector-fftw ==0.1.3.7
- vector-instances ==3.3.1
@@ -1856,7 +1867,7 @@ default-package-overrides:
- versions ==3.0.0
- vhd ==0.2.2
- ViennaRNAParser ==1.2.9
- - vinyl ==0.5.2
+ - vinyl ==0.5.3
- vinyl-utils ==0.3.0.0
- void ==0.7.1
- vty ==5.11.3
@@ -1885,7 +1896,7 @@ default-package-overrides:
- wai-transformers ==0.0.7
- wai-websockets ==3.0.1.1
- waitra ==0.0.4.0
- - warp ==3.2.8
+ - warp ==3.2.9
- warp-tls ==3.2.2
- web-plugins ==0.2.9
- web-routes ==0.27.11
@@ -1900,11 +1911,11 @@ default-package-overrides:
- webkitgtk3-javascriptcore ==0.14.2.1
- webpage ==0.0.4
- webrtc-vad ==0.1.0.3
- - websockets ==0.9.7.0
+ - websockets ==0.9.8.2
- weigh ==0.0.3
- werewolf ==1.5.1.1
- werewolf-slack ==1.0.2.0
- - wikicfp-scraper ==0.1.0.5
+ - wikicfp-scraper ==0.1.0.6
- Win32 ==2.3.1.1
- Win32-extras ==0.2.0.1
- Win32-notify ==0.3.0.1
@@ -1918,15 +1929,15 @@ default-package-overrides:
- wl-pprint-text ==1.1.0.4
- word-trie ==0.3.0
- word8 ==0.1.2
- - wordpass ==1.0.0.6
+ - wordpass ==1.0.0.7
- Workflow ==0.8.3
- wrap ==0.0.0
- wreq ==0.4.1.0
- - writer-cps-mtl ==0.1.0.2
- - writer-cps-transformers ==0.1.0.2
- - wuss ==1.1.1
+ - writer-cps-mtl ==0.1.1.1
+ - writer-cps-transformers ==0.1.1.0
+ - wuss ==1.1.3
- X11 ==1.6.1.2
- - x509 ==1.6.4
+ - x509 ==1.6.5
- x509-store ==1.6.2
- x509-system ==1.6.4
- x509-validation ==1.6.5
@@ -1952,35 +1963,35 @@ default-package-overrides:
- xss-sanitize ==0.3.5.7
- yackage ==0.8.1
- yahoo-finance-api ==0.1.0.0
- - yaml ==0.8.20
+ - yaml ==0.8.21.1
- Yampa ==0.10.5
- YampaSynth ==0.2
- yarr ==1.4.0.2
- yes-precure5-command ==5.5.3
- - yesod ==1.4.3
- - yesod-auth ==1.4.13.5
+ - yesod ==1.4.3.1
+ - yesod-auth ==1.4.15
- yesod-auth-account ==1.4.3
- yesod-auth-basic ==0.1.0.2
- yesod-auth-hashdb ==1.5.1.3
- yesod-auth-oauth2 ==0.2.2
- yesod-bin ==1.4.18.7
- - yesod-core ==1.4.25
+ - yesod-core ==1.4.30
- yesod-eventsource ==1.4.0.1
- yesod-fay ==0.8.0
- yesod-fb ==0.3.4
- - yesod-form ==1.4.8
+ - yesod-form ==1.4.9
- yesod-form-richtext ==0.1.0.0
- yesod-gitrepo ==0.2.1.0
- yesod-gitrev ==0.1.0.0
- yesod-job-queue ==0.3.0.1
- yesod-newsfeed ==1.6
- - yesod-persistent ==1.4.0.6
+ - yesod-persistent ==1.4.1.0
- yesod-sitemap ==1.4.0.1
- yesod-static ==1.5.1.1
- yesod-static-angular ==0.1.8
- yesod-table ==2.0.3
- - yesod-test ==1.5.3
- - yesod-websockets ==0.2.4
+ - yesod-test ==1.5.4.1
+ - yesod-websockets ==0.2.4.1
- yi ==0.12.6
- yi-fuzzy-open ==0.1.0.1
- yi-language ==0.2.1
@@ -1988,7 +1999,7 @@ default-package-overrides:
- yjtools ==0.9.18
- zero ==0.1.4
- zeromq4-haskell ==0.6.5
- - zip ==0.1.3
+ - zip ==0.1.4
- zip-archive ==0.3.0.5
- zippers ==0.2.2
- zlib ==0.6.1.2
@@ -2036,7 +2047,12 @@ package-maintainers:
- funcmp
- git-annex
- hackage-db
+ - hledger
+ - hledger-diff
- hledger-interest
+ - hledger-irr
+ - hledger-ui
+ - hledger-web
- hopenssl
- hsdns
- hsemail
@@ -2071,7 +2087,6 @@ package-maintainers:
- shakespeare
abbradar:
- Agda
- - lambdabot
dont-distribute-packages:
# hard restrictions that really belong into meta.platforms
@@ -2242,12 +2257,26 @@ dont-distribute-packages:
amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazon-products: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-apigateway: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ amazonka-appstream: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ amazonka-budgets: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ amazonka-codebuild: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-elbv2: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ amazonka-health: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-kinesis-analytics: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ amazonka-lightsail: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ amazonka-opsworks-cm: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ amazonka-pinpoint: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ amazonka-polly: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-rds: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ amazonka-rekognition: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-servicecatalog: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ amazonka-shield: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ amazonka-sms: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-snowball: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-sqs: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ amazonka-stepfunctions: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ amazonka-xray: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ amby: [ i686-linux, x86_64-linux, x86_64-darwin ]
AMI: [ i686-linux, x86_64-linux, x86_64-darwin ]
ampersand: [ i686-linux, x86_64-linux, x86_64-darwin ]
amqp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2584,6 +2613,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 ]
@@ -2649,6 +2679,7 @@ dont-distribute-packages:
cabalvchk: [ i686-linux, x86_64-linux, x86_64-darwin ]
cabocha: [ i686-linux, x86_64-linux, x86_64-darwin ]
cached-io: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ cacophony: [ i686-linux, x86_64-linux, x86_64-darwin ]
caffegraph: [ i686-linux, x86_64-linux, x86_64-darwin ]
cake3: [ i686-linux, x86_64-linux, x86_64-darwin ]
cakyrespa: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2672,6 +2703,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 ]
@@ -2760,6 +2792,7 @@ dont-distribute-packages:
chuchu: [ i686-linux, x86_64-linux, x86_64-darwin ]
chunks: [ i686-linux, x86_64-linux, x86_64-darwin ]
chunky: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ cielo: [ i686-linux, x86_64-linux, x86_64-darwin ]
cil: [ i686-linux, x86_64-linux, x86_64-darwin ]
cinvoke: [ i686-linux, x86_64-linux, x86_64-darwin ]
cio: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2893,6 +2926,7 @@ dont-distribute-packages:
concraft-hr: [ i686-linux, x86_64-linux, x86_64-darwin ]
concraft-pl: [ i686-linux, x86_64-linux, x86_64-darwin ]
concraft: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ concrete-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
concrete-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ]
concurrent-state: [ i686-linux, x86_64-linux, x86_64-darwin ]
Concurrential: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2908,6 +2942,7 @@ dont-distribute-packages:
conduit-resumablesink: [ i686-linux, x86_64-linux, x86_64-darwin ]
conf: [ i686-linux, x86_64-linux, x86_64-darwin ]
conffmt: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ config-ini: [ i686-linux, x86_64-linux, x86_64-darwin ]
config-select: [ i686-linux, x86_64-linux, x86_64-darwin ]
ConfigFileTH: [ i686-linux, x86_64-linux, x86_64-darwin ]
Configger: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2945,6 +2980,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 ]
@@ -3025,6 +3061,7 @@ dont-distribute-packages:
CSPM-Interpreter: [ i686-linux, x86_64-linux, x86_64-darwin ]
CSPM-ToProlog: [ i686-linux, x86_64-linux, x86_64-darwin ]
cspmchecker: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ cspretty: [ i686-linux, x86_64-linux, x86_64-darwin ]
css: [ i686-linux, x86_64-linux, x86_64-darwin ]
csv-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
ctemplate: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3033,6 +3070,7 @@ dont-distribute-packages:
cubicbezier: [ i686-linux, x86_64-linux, x86_64-darwin ]
cuboid: [ i686-linux, x86_64-linux, x86_64-darwin ]
cudd: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ cue-sheet: [ i686-linux, x86_64-linux, x86_64-darwin ]
currency-convert: [ i686-linux, x86_64-linux, x86_64-darwin ]
curry-base: [ i686-linux, x86_64-linux, x86_64-darwin ]
curry-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3206,11 +3244,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 ]
@@ -3237,6 +3273,7 @@ dont-distribute-packages:
direct-http: [ i686-linux, x86_64-linux, x86_64-darwin ]
direct-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ]
directed-cubical: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ directory-tree: [ i686-linux, x86_64-linux, x86_64-darwin ]
dirfiles: [ i686-linux, x86_64-linux, x86_64-darwin ]
discogs-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
discordian-calendar: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3334,6 +3371,7 @@ dont-distribute-packages:
dynamic-plot: [ i686-linux, x86_64-linux, x86_64-darwin ]
dynamic-pp: [ i686-linux, x86_64-linux, x86_64-darwin ]
DynamicTimeWarp: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ dynamodb-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
dynobud: [ i686-linux, x86_64-linux, x86_64-darwin ]
DysFRP-Cairo: [ i686-linux, x86_64-linux, x86_64-darwin ]
DysFRP-Craftwerk: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3375,6 +3413,7 @@ dont-distribute-packages:
electrum-mnemonic: [ i686-linux, x86_64-linux, x86_64-darwin ]
elevator: [ i686-linux, x86_64-linux, x86_64-darwin ]
elision: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ elm-export-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ]
elm-export: [ i686-linux, x86_64-linux, x86_64-darwin ]
elocrypt: [ i686-linux, x86_64-linux, x86_64-darwin ]
emacs-keys: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3558,6 +3597,7 @@ dont-distribute-packages:
fixed-point: [ i686-linux, x86_64-linux, x86_64-darwin ]
fixed-precision: [ i686-linux, x86_64-linux, x86_64-darwin ]
fixed-storable-array: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ fixed-width: [ i686-linux, x86_64-linux, x86_64-darwin ]
fixfile: [ i686-linux, x86_64-linux, x86_64-darwin ]
fizz-buzz: [ i686-linux, x86_64-linux, x86_64-darwin ]
flamethrower: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3676,6 +3716,7 @@ dont-distribute-packages:
fuzzy-timings: [ i686-linux, x86_64-linux, x86_64-darwin ]
fuzzytime: [ i686-linux, x86_64-linux, x86_64-darwin ]
fwgl-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ fwgl-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ]
fwgl: [ i686-linux, x86_64-linux, x86_64-darwin ]
g-npm: [ i686-linux, x86_64-linux, x86_64-darwin ]
gact: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3755,9 +3796,12 @@ dont-distribute-packages:
ghcjs-dom-jsaddle: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghcjs-dom-jsffi: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghcjs-dom: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ ghcjs-hplay: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ ghcjs-promise: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghclive: [ i686-linux, x86_64-linux, x86_64-darwin ]
ght: [ i686-linux, x86_64-linux, x86_64-darwin ]
gi-gdk: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ gi-girepository: [ i686-linux, x86_64-linux, x86_64-darwin ]
gi-gst: [ i686-linux, x86_64-linux, x86_64-darwin ]
gi-gstaudio: [ i686-linux, x86_64-linux, x86_64-darwin ]
gi-gstbase: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3843,6 +3887,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 +3981,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 ]
@@ -3957,7 +4011,9 @@ dont-distribute-packages:
gyah-bin: [ i686-linux, x86_64-linux, x86_64-darwin ]
h-booru: [ i686-linux, x86_64-linux, x86_64-darwin ]
h-gpgme: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ h-reversi: [ i686-linux, x86_64-linux, x86_64-darwin ]
h2048: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ H: [ i686-linux, x86_64-linux, x86_64-darwin ]
haar: [ i686-linux, x86_64-linux, x86_64-darwin ]
Hach: [ i686-linux, x86_64-linux, x86_64-darwin ]
hack-contrib-press: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4013,12 +4069,14 @@ dont-distribute-packages:
hakyll-ogmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ]
hakyll-R: [ i686-linux, x86_64-linux, x86_64-darwin ]
hakyll-sass: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hakyll-series: [ i686-linux, x86_64-linux, x86_64-darwin ]
hakyll-shakespeare: [ i686-linux, x86_64-linux, x86_64-darwin ]
hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ]
halberd: [ i686-linux, x86_64-linux, x86_64-darwin ]
halfs: [ i686-linux, x86_64-linux, x86_64-darwin ]
halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ]
halma: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hamilton: [ i686-linux, x86_64-linux, x86_64-darwin ]
HaMinitel: [ i686-linux, x86_64-linux, x86_64-darwin ]
hampp: [ i686-linux, x86_64-linux, x86_64-darwin ]
hamsql: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4082,6 +4140,7 @@ dont-distribute-packages:
harvest-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
has-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
has: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hasbolt: [ i686-linux, x86_64-linux, x86_64-darwin ]
hascal: [ i686-linux, x86_64-linux, x86_64-darwin ]
hascas: [ i686-linux, x86_64-linux, x86_64-darwin ]
hascat-lib: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4100,6 +4159,7 @@ dont-distribute-packages:
hasim: [ i686-linux, x86_64-linux, x86_64-darwin ]
hask-home: [ i686-linux, x86_64-linux, x86_64-darwin ]
hask: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ haskakafka: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskanoid: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskarrow: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskbot-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4138,10 +4198,13 @@ 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-daemon: [ 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 ]
@@ -4204,6 +4267,7 @@ dont-distribute-packages:
hasql-class: [ i686-linux, x86_64-linux, x86_64-darwin ]
hasql-cursor-query: [ i686-linux, x86_64-linux, x86_64-darwin ]
hasql-cursor-transaction: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hasql-generic: [ i686-linux, x86_64-linux, x86_64-darwin ]
hasql-postgres-options: [ i686-linux, x86_64-linux, x86_64-darwin ]
hasql-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ]
hasql-transaction: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4212,6 +4276,7 @@ dont-distribute-packages:
haste-gapi: [ i686-linux, x86_64-linux, x86_64-darwin ]
haste-perch: [ i686-linux, x86_64-linux, x86_64-darwin ]
haste: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hastily: [ i686-linux, x86_64-linux, x86_64-darwin ]
hat: [ i686-linux, x86_64-linux, x86_64-darwin ]
Hate: [ i686-linux, x86_64-linux, x86_64-darwin ]
hatex-guide: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4357,6 +4422,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 +4486,9 @@ 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-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 +4501,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 +4509,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 ]
@@ -4511,6 +4582,7 @@ dont-distribute-packages:
hpasteit: [ i686-linux, x86_64-linux, x86_64-darwin ]
HPath: [ i686-linux, x86_64-linux, x86_64-darwin ]
hpath: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hpc-coveralls: [ i686-linux, x86_64-linux, x86_64-darwin ]
hpc-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ]
hpdft: [ i686-linux, x86_64-linux, x86_64-darwin ]
HPi: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4637,6 +4709,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 ]
@@ -4645,6 +4718,7 @@ dont-distribute-packages:
hspec-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspec-snap: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspec-test-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hspec-webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ]
HsPerl5: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspread: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspresent: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4669,6 +4743,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 +4767,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 ]
@@ -4830,6 +4906,7 @@ dont-distribute-packages:
ImperativeHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
implicit-logging: [ i686-linux, x86_64-linux, x86_64-darwin ]
implicit-params: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ implicit: [ i686-linux, x86_64-linux, x86_64-darwin ]
imports: [ i686-linux, x86_64-linux, x86_64-darwin ]
impossible: [ i686-linux, x86_64-linux, x86_64-darwin ]
improve: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4852,6 +4929,7 @@ dont-distribute-packages:
informative: [ i686-linux, x86_64-linux, x86_64-darwin ]
inject-function: [ i686-linux, x86_64-linux, x86_64-darwin ]
inline-java: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ inline-r: [ i686-linux, x86_64-linux, x86_64-darwin ]
inserts: [ i686-linux, x86_64-linux, x86_64-darwin ]
inspector-wrecker: [ i686-linux, x86_64-linux, x86_64-darwin ]
instant-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4901,8 +4979,10 @@ 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 ]
+ itemfield: [ i686-linux, x86_64-linux, x86_64-darwin ]
iter-stats: [ i686-linux, x86_64-linux, x86_64-darwin ]
iteratee-compress: [ i686-linux, x86_64-linux, x86_64-darwin ]
iteratee-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4935,6 +5015,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 +5036,10 @@ 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-webkit2gtk: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ jsaddle-webkitgtk: [ 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 ]
@@ -4999,8 +5084,15 @@ dont-distribute-packages:
jvm: [ i686-linux, x86_64-linux, x86_64-darwin ]
JYU-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ kafka-device-glut: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ kafka-device-joystick: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ kafka-device-leap: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ kafka-device-spacenav: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ kafka-device-vrpn: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ kafka-device: [ i686-linux, x86_64-linux, x86_64-darwin ]
kaleidoscope: [ i686-linux, x86_64-linux, x86_64-darwin ]
Kalman: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ kalman: [ i686-linux, x86_64-linux, x86_64-darwin ]
kangaroo: [ i686-linux, x86_64-linux, x86_64-darwin ]
kanji: [ i686-linux, x86_64-linux, x86_64-darwin ]
kansas-lava-cores: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5053,6 +5145,7 @@ dont-distribute-packages:
kontra-config: [ i686-linux, x86_64-linux, x86_64-darwin ]
korfu: [ i686-linux, x86_64-linux, x86_64-darwin ]
kqueue: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ krapsh: [ i686-linux, x86_64-linux, x86_64-darwin ]
Kriens: [ i686-linux, x86_64-linux, x86_64-darwin ]
krpc: [ i686-linux, x86_64-linux, x86_64-darwin ]
KSP: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5071,10 +5164,13 @@ dont-distribute-packages:
lambda-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ]
lambda-devs: [ i686-linux, x86_64-linux, x86_64-darwin ]
lambda-options: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ lambda-sampler: [ i686-linux, x86_64-linux, x86_64-darwin ]
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 ]
@@ -5130,17 +5226,20 @@ dont-distribute-packages:
latex-formulae-hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ]
latex-formulae-image: [ i686-linux, x86_64-linux, x86_64-darwin ]
latex-formulae-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ latex-function-tables: [ i686-linux, x86_64-linux, x86_64-darwin ]
LATS: [ i686-linux, x86_64-linux, x86_64-darwin ]
launchpad-control: [ i686-linux, x86_64-linux, x86_64-darwin ]
layers: [ i686-linux, x86_64-linux, x86_64-darwin ]
layout-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ]
lazyarray: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ lazyset: [ i686-linux, x86_64-linux, x86_64-darwin ]
lazysplines: [ i686-linux, x86_64-linux, x86_64-darwin ]
LazyVault: [ i686-linux, x86_64-linux, x86_64-darwin ]
lcs: [ i686-linux, x86_64-linux, x86_64-darwin ]
ldif: [ i686-linux, x86_64-linux, x86_64-darwin ]
leaf: [ i686-linux, x86_64-linux, x86_64-darwin ]
leaky: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ leapseconds: [ i686-linux, x86_64-linux, x86_64-darwin ]
learn-physics-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
learn-physics: [ i686-linux, x86_64-linux, x86_64-darwin ]
leetify: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5180,8 +5279,10 @@ dont-distribute-packages:
libhbb: [ i686-linux, x86_64-linux, x86_64-darwin ]
libjenkins: [ i686-linux, x86_64-linux, x86_64-darwin ]
liblastfm: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ liblawless: [ i686-linux, x86_64-linux, x86_64-darwin ]
liblinear-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ]
libltdl: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ libmolude: [ i686-linux, x86_64-linux, x86_64-darwin ]
liboleg: [ i686-linux, x86_64-linux, x86_64-darwin ]
libpafe: [ i686-linux, x86_64-linux, x86_64-darwin ]
libpq: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5277,6 +5378,9 @@ 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-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ log-postgres: [ 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 +5505,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 ]
@@ -5410,6 +5515,7 @@ dont-distribute-packages:
mdapi: [ i686-linux, x86_64-linux, x86_64-darwin ]
mdcat: [ i686-linux, x86_64-linux, x86_64-darwin ]
mdp: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ mealstrom: [ i686-linux, x86_64-linux, x86_64-darwin ]
MeanShift: [ i686-linux, x86_64-linux, x86_64-darwin ]
Measure: [ i686-linux, x86_64-linux, x86_64-darwin ]
mecab: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5542,6 +5648,7 @@ dont-distribute-packages:
Monatron-IO: [ i686-linux, x86_64-linux, x86_64-darwin ]
Monatron: [ i686-linux, x86_64-linux, x86_64-darwin ]
mondo: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ money: [ i686-linux, x86_64-linux, x86_64-darwin ]
mongodb-queue: [ i686-linux, x86_64-linux, x86_64-darwin ]
mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ]
mongrel2-handler: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5596,6 +5703,7 @@ dont-distribute-packages:
multiplate: [ i686-linux, x86_64-linux, x86_64-darwin ]
multirec-alt-deriver: [ i686-linux, x86_64-linux, x86_64-darwin ]
multirec-binary: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ multirec: [ i686-linux, x86_64-linux, x86_64-darwin ]
multisetrewrite: [ i686-linux, x86_64-linux, x86_64-darwin ]
Munkres-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
muon: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5622,6 +5730,8 @@ 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-nem: [ 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 ]
@@ -5677,6 +5787,7 @@ dont-distribute-packages:
nettle-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ]
nettle: [ i686-linux, x86_64-linux, x86_64-darwin ]
netwire-input-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ netwire-input-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ]
netwire-input: [ i686-linux, x86_64-linux, x86_64-darwin ]
netwire-vinylglfw-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
netwire: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5823,6 +5934,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 ]
@@ -5864,6 +5976,7 @@ dont-distribute-packages:
panda: [ i686-linux, x86_64-linux, x86_64-darwin ]
pandoc-csv2table: [ i686-linux, x86_64-linux, x86_64-darwin ]
pandoc-japanese-filters: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ pandoc-placetable: [ i686-linux, x86_64-linux, x86_64-darwin ]
pandoc-plantuml-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ]
pandoc-unlit: [ i686-linux, x86_64-linux, x86_64-darwin ]
PandocAgda: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5982,6 +6095,7 @@ dont-distribute-packages:
pipes-async: [ i686-linux, x86_64-linux, x86_64-darwin ]
pipes-attoparsec-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ]
pipes-binary: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ pipes-cacophony: [ i686-linux, x86_64-linux, x86_64-darwin ]
pipes-cereal-plus: [ i686-linux, x86_64-linux, x86_64-darwin ]
pipes-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ]
pipes-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6183,6 +6297,7 @@ dont-distribute-packages:
qhull-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
QIO: [ i686-linux, x86_64-linux, x86_64-darwin ]
QLearn: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ qr-repa: [ i686-linux, x86_64-linux, x86_64-darwin ]
qt: [ i686-linux, x86_64-linux, x86_64-darwin ]
qtah-cpp-qt5: [ i686-linux, x86_64-linux, x86_64-darwin ]
qtah-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6294,6 +6409,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 +6491,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 ]
@@ -6433,6 +6551,7 @@ dont-distribute-packages:
rope: [ i686-linux, x86_64-linux, x86_64-darwin ]
rose-trie: [ i686-linux, x86_64-linux, x86_64-darwin ]
roshask: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ rosmsg-bin: [ i686-linux, x86_64-linux, x86_64-darwin ]
rosso: [ i686-linux, x86_64-linux, x86_64-darwin ]
rounding: [ i686-linux, x86_64-linux, x86_64-darwin ]
roundtrip-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6460,6 +6579,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 ]
@@ -6648,6 +6768,7 @@ dont-distribute-packages:
shellish: [ i686-linux, x86_64-linux, x86_64-darwin ]
shellmate-extras: [ i686-linux, x86_64-linux, x86_64-darwin ]
shelltestrunner: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ shikensu: [ i686-linux, x86_64-linux, x86_64-darwin ]
shoap: [ i686-linux, x86_64-linux, x86_64-darwin ]
shorten-strings: [ i686-linux, x86_64-linux, x86_64-darwin ]
showdown: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6666,6 +6787,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 ]
@@ -6733,9 +6855,11 @@ dont-distribute-packages:
snap-cors: [ i686-linux, x86_64-linux, x86_64-darwin ]
snap-error-collector: [ i686-linux, x86_64-linux, x86_64-darwin ]
snap-extras: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ snap-loader-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ]
snap-predicates: [ i686-linux, x86_64-linux, x86_64-darwin ]
snap-routes: [ i686-linux, x86_64-linux, x86_64-darwin ]
snap-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ snap-templates: [ i686-linux, x86_64-linux, x86_64-darwin ]
snap-testing: [ i686-linux, x86_64-linux, x86_64-darwin ]
snap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
snap-web-routes: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6773,6 +6897,7 @@ dont-distribute-packages:
snaplet-scoped-session: [ i686-linux, x86_64-linux, x86_64-darwin ]
snaplet-sedna: [ i686-linux, x86_64-linux, x86_64-darwin ]
snaplet-ses-html: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ snaplet-sqlite-simple-jwt-auth: [ i686-linux, x86_64-linux, x86_64-darwin ]
snaplet-sqlite-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
snaplet-stripe: [ i686-linux, x86_64-linux, x86_64-darwin ]
snaplet-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6838,12 +6963,15 @@ dont-distribute-packages:
splines: [ i686-linux, x86_64-linux, x86_64-darwin ]
split-record: [ i686-linux, x86_64-linux, x86_64-darwin ]
splitter: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ Spock-api-ghcjs: [ i686-linux, x86_64-linux, x86_64-darwin ]
Spock-auth: [ i686-linux, x86_64-linux, x86_64-darwin ]
Spock-digestive: [ i686-linux, x86_64-linux, x86_64-darwin ]
spoonutil: [ i686-linux, x86_64-linux, x86_64-darwin ]
spoty: [ i686-linux, x86_64-linux, x86_64-darwin ]
Sprig: [ i686-linux, x86_64-linux, x86_64-darwin ]
spritz: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ sproxy-web: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ sproxy2: [ i686-linux, x86_64-linux, x86_64-darwin ]
spsa: [ i686-linux, x86_64-linux, x86_64-darwin ]
sql-simple-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ]
sql-simple-pool: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7027,6 +7155,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 +7167,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 +7281,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 ]
@@ -7158,7 +7289,9 @@ dont-distribute-packages:
TimePiece: [ i686-linux, x86_64-linux, x86_64-darwin ]
timeplot: [ i686-linux, x86_64-linux, x86_64-darwin ]
timeprint: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ timeseries: [ i686-linux, x86_64-linux, x86_64-darwin ]
timestamp-subprocess-lines: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ timezone-unix: [ i686-linux, x86_64-linux, x86_64-darwin ]
TinyLaunchbury: [ i686-linux, x86_64-linux, x86_64-darwin ]
tinyMesh: [ i686-linux, x86_64-linux, x86_64-darwin ]
TinyURL: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7201,6 +7334,7 @@ dont-distribute-packages:
traildb: [ i686-linux, x86_64-linux, x86_64-darwin ]
trajectory: [ i686-linux, x86_64-linux, x86_64-darwin ]
transactional-events: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ transf: [ i686-linux, x86_64-linux, x86_64-darwin ]
transformations: [ i686-linux, x86_64-linux, x86_64-darwin ]
TransformeR: [ i686-linux, x86_64-linux, x86_64-darwin ]
transformers-compose: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7208,6 +7342,7 @@ dont-distribute-packages:
transformers-eff: [ i686-linux, x86_64-linux, x86_64-darwin ]
transformers-runnable: [ i686-linux, x86_64-linux, x86_64-darwin ]
TransformersStepByStep: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ transient-universe: [ i686-linux, x86_64-linux, x86_64-darwin ]
translatable-intset: [ i686-linux, x86_64-linux, x86_64-darwin ]
translate: [ i686-linux, x86_64-linux, x86_64-darwin ]
travis-meta-yaml: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7266,6 +7401,7 @@ dont-distribute-packages:
txtblk: [ i686-linux, x86_64-linux, x86_64-darwin ]
TYB: [ i686-linux, x86_64-linux, x86_64-darwin ]
typalyze: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ type-assertions: [ i686-linux, x86_64-linux, x86_64-darwin ]
type-cache: [ i686-linux, x86_64-linux, x86_64-darwin ]
type-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ]
type-combinators-quote: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7356,6 +7492,7 @@ dont-distribute-packages:
usb-hid: [ i686-linux, x86_64-linux, x86_64-darwin ]
usb-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ]
usb-safe: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ users-mysql-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
users-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ]
utc: [ i686-linux, x86_64-linux, x86_64-darwin ]
utf8-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7458,6 +7595,7 @@ dont-distribute-packages:
wai-middleware-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ]
wai-middleware-route: [ i686-linux, x86_64-linux, x86_64-darwin ]
wai-middleware-static-caching: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ wai-middleware-static: [ i686-linux, x86_64-linux, x86_64-darwin ]
wai-responsible: [ i686-linux, x86_64-linux, x86_64-darwin ]
wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ]
wai-routes: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7475,6 +7613,7 @@ dont-distribute-packages:
watchdog: [ i686-linux, x86_64-linux, x86_64-darwin ]
watcher: [ i686-linux, x86_64-linux, x86_64-darwin ]
watchit: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ wave: [ i686-linux, x86_64-linux, x86_64-darwin ]
WaveFront: [ i686-linux, x86_64-linux, x86_64-darwin ]
wavesurfer: [ i686-linux, x86_64-linux, x86_64-darwin ]
wavy: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7498,10 +7637,13 @@ dont-distribute-packages:
webcrank-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ]
webcrank-wai: [ i686-linux, x86_64-linux, x86_64-darwin ]
webcrank: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ webdriver-angular: [ i686-linux, x86_64-linux, x86_64-darwin ]
webdriver-snoy: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ]
WeberLogic: [ i686-linux, x86_64-linux, x86_64-darwin ]
webify: [ i686-linux, x86_64-linux, x86_64-darwin ]
webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ webkit2gtk3-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ]
Webrexp: [ i686-linux, x86_64-linux, x86_64-darwin ]
webserver: [ i686-linux, x86_64-linux, x86_64-darwin ]
websnap: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7592,6 +7734,7 @@ dont-distribute-packages:
xml-enumerator-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ]
xml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ]
xml-html-conduit-lens: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ xml-isogen: [ i686-linux, x86_64-linux, x86_64-darwin ]
xml-monad: [ i686-linux, x86_64-linux, x86_64-darwin ]
xml-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ]
xml-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7735,6 +7878,7 @@ dont-distribute-packages:
zip-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
zipedit: [ i686-linux, x86_64-linux, x86_64-darwin ]
zipkin: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ zipper: [ i686-linux, x86_64-linux, x86_64-darwin ]
zlib-enum: [ i686-linux, x86_64-linux, x86_64-darwin ]
ZMachine: [ i686-linux, x86_64-linux, x86_64-darwin ]
zmcat: [ 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 2b597532b44..f91bd474c6f 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.
@@ -103,10 +114,13 @@ let
(optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature enableStaticLibraries "library-vanilla"))
(optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic"))
(optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests"))
+ (optionalString (versionOlder "8.0.1" ghc.version) "--ghc-option=-j$NIX_BUILD_CORES")
] ++ optionals isGhcjs [
"--with-hsc2hs=${nativeGhc}/bin/hsc2hs"
"--ghcjs"
- ];
+ ] ++ optionals isCross ([
+ "--configure-option=--host=${ghc.cross.config}"
+ ] ++ crossCabalFlags);
setupCompileFlags = [
(optionalString (!coreSetup) "-${packageDbFlag}=$packageConfDir")
@@ -132,9 +146,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
@@ -194,9 +208,6 @@ stdenv.mkDerivation ({
fi
if [ -d "$p/lib" ]; then
configureFlags+=" --extra-lib-dirs=$p/lib"
- ${ stdenv.lib.optionalString stdenv.isDarwin
- "export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$p/lib"
- }
fi
done
${ghcCommand}-pkg --${packageDbFlag}="$packageConfDir" recache
@@ -236,7 +247,7 @@ stdenv.mkDerivation ({
buildPhase = ''
runHook preBuild
- ${setupCommand} build ${buildTarget}
+ ${setupCommand} build ${buildTarget}${crossCabalFlagsString}
runHook postBuild
'';
@@ -294,7 +305,7 @@ stdenv.mkDerivation ({
export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}"
export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg"
export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html"
- export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcEnv.name}"
+ export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}"
${shellHook}
'';
};
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 45839074b79..1bdf1256369 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -726,6 +726,53 @@ self: {
maintainers = with stdenv.lib.maintainers; [ abbradar ];
}) {inherit (pkgs) emacs;};
+ "Agda_2_5_1_2" = callPackage
+ ({ mkDerivation, alex, array, base, binary, boxes, bytestring
+ , containers, cpphs, data-hash, deepseq, directory, EdisonAPI
+ , EdisonCore, edit-distance, emacs, equivalence, filemanip
+ , filepath, geniplate-mirror, happy, hashable, hashtables
+ , haskeline, haskell-src-exts, monadplus, mtl, parallel, pretty
+ , process, QuickCheck, strict, template-haskell, text, time
+ , transformers, transformers-compat, unordered-containers, xhtml
+ , zlib
+ }:
+ mkDerivation {
+ pname = "Agda";
+ version = "2.5.1.2";
+ sha256 = "fb272bd6f7d532320c669b96faa85088b37bae02d906e9a9f764bc8e8639fb5e";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base binary boxes bytestring containers data-hash deepseq
+ directory EdisonAPI EdisonCore edit-distance equivalence filepath
+ geniplate-mirror hashable hashtables haskeline haskell-src-exts
+ monadplus mtl parallel pretty process QuickCheck strict
+ template-haskell text time transformers transformers-compat
+ unordered-containers xhtml zlib
+ ];
+ libraryToolDepends = [ alex cpphs happy ];
+ executableHaskellDepends = [
+ base binary containers directory filemanip filepath
+ haskell-src-exts mtl process
+ ];
+ executableToolDepends = [ emacs ];
+ postInstall = ''
+ files=("$out/share/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda})
+ for f in "''${files[@]}" ; do
+ $out/bin/agda $f
+ done
+ for f in "''${files[@]}" ; do
+ $out/bin/agda -c --no-main $f
+ done
+ $out/bin/agda-mode compile
+ '';
+ homepage = "http://wiki.portal.chalmers.se/agda/";
+ description = "A dependently typed functional programming language and proof assistant";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ maintainers = with stdenv.lib.maintainers; [ abbradar ];
+ }) {inherit (pkgs) emacs;};
+
"Agda-executable" = callPackage
({ mkDerivation, Agda, base }:
mkDerivation {
@@ -872,8 +919,8 @@ self: {
({ mkDerivation, base, mtl, multirec, parsec }:
mkDerivation {
pname = "Annotations";
- version = "0.2.1";
- sha256 = "12e2c8ad03795c5bceffc8f421655097f96bcde1ff68d98dbe2bd2990f790cc7";
+ version = "0.2.2";
+ sha256 = "31c0d4765aba5d21df0e2b38521828fda860139609c2f6a6947423650f66161c";
libraryHaskellDepends = [ base mtl multirec parsec ];
testHaskellDepends = [ base mtl multirec parsec ];
description = "Constructing, analyzing and destructing annotated trees";
@@ -1655,10 +1702,8 @@ self: {
}:
mkDerivation {
pname = "BlastHTTP";
- version = "1.2.0";
- sha256 = "65a58d1e7f5731feabef05480032c674fc55d559d2d4c391cf3fb0aa9ee4166e";
- revision = "1";
- editedCabalFile = "7076650ad04d2c5945b96ec1a8d5db8ee680314d4dc4cff54f264316e7f69bba";
+ version = "1.2.1";
+ sha256 = "cee85e0fba0530aff57209b3d91a800db52b63c3f7e4a431a04e7a9cbd355bd5";
libraryHaskellDepends = [
base biocore biofasta blastxml bytestring conduit HTTP http-conduit
hxt mtl network transformers
@@ -1699,8 +1744,8 @@ self: {
}:
mkDerivation {
pname = "BlogLiterately";
- version = "0.8.4.1";
- sha256 = "58b1f32660e20f13b6b6ce6b0668099a8ed4acc7939468108dcde283d2fe4429";
+ version = "0.8.4.3";
+ sha256 = "56789deadc7e7a3b94b6dbbc0f8857565348ddde049ed8f0d938d4701f761721";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -1723,8 +1768,8 @@ self: {
}:
mkDerivation {
pname = "BlogLiterately-diagrams";
- version = "0.2.0.3";
- sha256 = "a7aeaa8154c62fb6e64f661c34bc28f35b02ec5a8d87f6100a8d945b59db82c1";
+ version = "0.2.0.5";
+ sha256 = "9aa44dcff5bdddc3e3331a359ce517ec5f04258ebf2ab8c52c0971c38cd01948";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -2308,7 +2353,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "Cabal_1_24_1_0" = callPackage
+ "Cabal_1_24_2_0" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
, deepseq, directory, exceptions, filepath, old-time, pretty
, process, QuickCheck, regex-posix, tagged, tasty, tasty-hunit
@@ -2316,8 +2361,8 @@ self: {
}:
mkDerivation {
pname = "Cabal";
- version = "1.24.1.0";
- sha256 = "dd2085dafae5cb2b5f8f0ef068ad66a779fb1bf2d68642d3906ac0c666a96a6b";
+ version = "1.24.2.0";
+ sha256 = "b7d0eb8e3503fbca460c0a6ca5c88352cecfe1b69e0bbc79827872134ed86340";
libraryHaskellDepends = [
array base binary bytestring containers deepseq directory filepath
pretty process time unix
@@ -2701,8 +2746,8 @@ self: {
({ mkDerivation, base, directory, unix, utf8-string, X11 }:
mkDerivation {
pname = "Clipboard";
- version = "2.3.0.1";
- sha256 = "f559fa28d98f98355b6478b583f8f111e00573fd5b70111ad6ca11c12388ee1c";
+ version = "2.3.0.2";
+ sha256 = "c746972095b1c4473208992bb6f267a9b3ba2620b722922f0f4c35d71c71e939";
libraryHaskellDepends = [ base directory unix utf8-string X11 ];
homepage = "http://haskell.org/haskellwiki/Clipboard";
description = "System clipboard interface";
@@ -4504,8 +4549,8 @@ self: {
}:
mkDerivation {
pname = "EntrezHTTP";
- version = "1.0.2";
- sha256 = "547f087fcc10e85550775bb02c56b9eea6d2cd32d419cdbe0ab33ad28c0335e9";
+ version = "1.0.3";
+ sha256 = "395c438c8b5b68fc0826e1946483d252a8936d5a91a25bf928eef113b4f9a89b";
libraryHaskellDepends = [
base biocore bytestring conduit HTTP http-conduit hxt mtl network
Taxonomy text transformers
@@ -5389,17 +5434,23 @@ self: {
}) {};
"Frames" = callPackage
- ({ mkDerivation, base, ghc-prim, pipes, primitive, readable
- , template-haskell, text, transformers, vector, vinyl
+ ({ mkDerivation, base, directory, ghc-prim, hspec, htoml, pipes
+ , pretty, primitive, readable, regex-applicative, template-haskell
+ , temporary, text, transformers, unordered-containers, vector
+ , vinyl
}:
mkDerivation {
pname = "Frames";
- version = "0.1.6";
- sha256 = "7a7a6639b04e9650d5dde93bb67bc0f26b053fd3456a34808f39640a0f780a50";
+ version = "0.1.9";
+ sha256 = "18eaea64c8f3ff7156ca1dcc372bae3e8ff7538cffce4c415710eae770eb6b25";
libraryHaskellDepends = [
base ghc-prim pipes primitive readable template-haskell text
transformers vector vinyl
];
+ testHaskellDepends = [
+ base directory hspec htoml pretty regex-applicative
+ template-haskell temporary text unordered-containers
+ ];
description = "Data frames For working with tabular data files";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -5649,6 +5700,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
+ "GLURaw_2_0_0_3" = callPackage
+ ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }:
+ mkDerivation {
+ pname = "GLURaw";
+ version = "2.0.0.3";
+ sha256 = "582cf8c0c1b8c0123ee9a8a06eba65fffded6decfe4e2e08bfea308f55f7ccee";
+ libraryHaskellDepends = [ base OpenGLRaw transformers ];
+ librarySystemDepends = [ freeglut mesa ];
+ homepage = "http://www.haskell.org/haskellwiki/Opengl";
+ description = "A raw binding for the OpenGL graphics system";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
+
"GLUT" = callPackage
({ mkDerivation, array, base, containers, OpenGL, StateVar
, transformers
@@ -5672,8 +5737,8 @@ self: {
}:
mkDerivation {
pname = "GLUtil";
- version = "0.9.1.0";
- sha256 = "7f66dcdd5cdaa85d9ee14cbabb856e545b97f05ceeb55ce52ba1ef79ea33d3a9";
+ version = "0.9.1.1";
+ sha256 = "be780905be2f45683bb7ea702ac87f7c9b30d7cfeadc0fce9d5a9d989533a38c";
libraryHaskellDepends = [
array base bytestring containers directory filepath hpp JuicyPixels
linear OpenGL OpenGLRaw transformers vector
@@ -5751,12 +5816,19 @@ self: {
}) {};
"GPipe-GLFW" = callPackage
- ({ mkDerivation, base, GLFW-b, GPipe, transformers }:
+ ({ mkDerivation, base, exception-transformers, GLFW-b, GPipe
+ , transformers
+ }:
mkDerivation {
pname = "GPipe-GLFW";
- version = "1.2.2";
- sha256 = "b2c2764511504225550b7e03badba80ba6e264eb86bee3fcc2f7d54e2e11d652";
+ version = "1.3.0";
+ sha256 = "f929bfa320a76ca8c9769bf38b9de6b8928b9ef63f9b09c31a9dfe209f8826b6";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [ base GLFW-b GPipe transformers ];
+ executableHaskellDepends = [
+ base exception-transformers GPipe transformers
+ ];
homepage = "https://github.com/plredmond/GPipe-GLFW";
description = "GLFW OpenGL context creation for GPipe";
license = stdenv.lib.licenses.mit;
@@ -6057,17 +6129,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";
@@ -6093,8 +6168,8 @@ self: {
}:
mkDerivation {
pname = "Glob";
- version = "0.7.12";
- sha256 = "c7ca5459b2d98ae9f5db56351a512680c4375cfdf907073848aaf15d6b92c175";
+ version = "0.7.13";
+ sha256 = "fe99d9434a2dbbac5385cb6690cbb6e2f2eb25df6ab5ce99c8121fc3fdddbd4c";
libraryHaskellDepends = [
base containers directory dlist filepath transformers
transformers-compat
@@ -6530,6 +6605,7 @@ self: {
homepage = "https://tweag.github.io/HaskellR";
description = "The Haskell/R mixed programming environment";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"HARM" = callPackage
@@ -6741,8 +6817,8 @@ self: {
}:
mkDerivation {
pname = "HDBC-odbc";
- version = "2.5.0.0";
- sha256 = "729982fb31e2d7816e8600212236f32d9d9a59191d73ce57fce097be2234953b";
+ version = "2.5.0.1";
+ sha256 = "96000a9573e873d231ca09f974c4ff0c4d7ec86d7ec6ceaaeb0cc02fc5e6de99";
libraryHaskellDepends = [
base bytestring concurrent-extra HDBC mtl time utf8-string
];
@@ -6881,6 +6957,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
@@ -7283,7 +7360,7 @@ self: {
"HJVM" = callPackage
({ mkDerivation, base, Cabal, containers, filepath
- , haskell-src-exts, HUnit, jvm, mtl, parsec, process
+ , haskell-src-exts, HUnit, jdk, mtl, parsec, process
, test-framework, test-framework-hunit, transformers
}:
mkDerivation {
@@ -7294,7 +7371,7 @@ self: {
base containers filepath haskell-src-exts mtl parsec process
transformers
];
- librarySystemDepends = [ jvm ];
+ librarySystemDepends = [ jdk ];
testHaskellDepends = [
base Cabal haskell-src-exts HUnit mtl parsec test-framework
test-framework-hunit transformers
@@ -7303,7 +7380,7 @@ self: {
description = "A library to create a Java Virtual Machine and manipulate Java objects";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {jvm = null;};
+ }) {inherit (pkgs) jdk;};
"HJavaScript" = callPackage
({ mkDerivation, base, pretty }:
@@ -7506,6 +7583,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "HMarkov" = callPackage
+ ({ mkDerivation, base, lens, mtl, QuickCheck, random, tasty
+ , tasty-hunit, tasty-quickcheck, vector
+ }:
+ mkDerivation {
+ pname = "HMarkov";
+ version = "1.0.1.1";
+ sha256 = "f7b2753019c7348487d2b7df31f1b59522c008a90d59926a0f7fa6670fa89d03";
+ libraryHaskellDepends = [ base lens mtl random vector ];
+ testHaskellDepends = [
+ base lens mtl QuickCheck random tasty tasty-hunit tasty-quickcheck
+ vector
+ ];
+ homepage = "https://github.com/swizzard/HMarkov#readme";
+ description = "Markov-generated sequences";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"HNM" = callPackage
({ mkDerivation, base, containers, directory, glib, gtk, haskell98
, mtl, process, regex-posix, unix
@@ -8306,6 +8401,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "HaTeX_3_17_1_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, matrix, parsec
+ , QuickCheck, tasty, tasty-quickcheck, text, transformers
+ , wl-pprint-extras
+ }:
+ mkDerivation {
+ pname = "HaTeX";
+ version = "3.17.1.0";
+ sha256 = "c497c6b2853018b09016c4422f22d18956881fc774066626d7c43c8b8f0917c3";
+ libraryHaskellDepends = [
+ base bytestring containers matrix parsec QuickCheck text
+ transformers wl-pprint-extras
+ ];
+ testHaskellDepends = [
+ base QuickCheck tasty tasty-quickcheck text
+ ];
+ homepage = "https://github.com/Daniel-Diaz/HaTeX/blob/master/README.md";
+ description = "The Haskell LaTeX library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"HaTeX-meta" = callPackage
({ mkDerivation, base, Cabal, containers, directory, filepath, ghc
, haddock, haskell-src-exts, mtl, parsec
@@ -9562,8 +9679,8 @@ self: {
}:
mkDerivation {
pname = "IPv6Addr";
- version = "0.6.1.0";
- sha256 = "dea0eb0a534e1df647487f120428ac7cfc54ab9c8ca75f63fe47a4020d4888c6";
+ version = "0.6.2.0";
+ sha256 = "c0123cbacaba0266ea6eed1cf0ceb0cf323600e9eaa0ca855090edae0b085926";
libraryHaskellDepends = [
attoparsec base iproute network network-info random text
];
@@ -9688,8 +9805,8 @@ self: {
({ mkDerivation, base, Cabal, containers, deepseq, QuickCheck }:
mkDerivation {
pname = "IntervalMap";
- version = "0.5.1.1";
- sha256 = "5a3324a4a98f2b15f871db98e2b2fe4a0f65d9de776314b955f30d4c1eda32ab";
+ version = "0.5.2.0";
+ sha256 = "031a491ae40c333a3227d147aae9ace42f2f4b535fcbbb991c6b4f35a1531684";
libraryHaskellDepends = [ base containers deepseq ];
testHaskellDepends = [ base Cabal containers deepseq QuickCheck ];
homepage = "http://www.chr-breitkopf.de/comp/IntervalMap";
@@ -10556,8 +10673,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
@@ -10957,11 +11074,12 @@ self: {
({ mkDerivation, base, bytestring, hidapi, mtl }:
mkDerivation {
pname = "MBot";
- version = "0.1.0.2";
- sha256 = "147655ce2a168c963fa04130b0f6196cb3679dbc8512d04dbff3c12406d16ec2";
+ version = "0.1.1.0";
+ sha256 = "6752fb112e01c02273ef55254b0f9cb16bbff4954592372ba9c152d9cb41dc12";
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
@@ -11332,8 +11450,8 @@ self: {
}:
mkDerivation {
pname = "MiniAgda";
- version = "0.2014.9.12";
- sha256 = "16e457ddf76d11c05905e057381fccb0373c021dbccfbcabeb31f2929a9e0792";
+ version = "0.2016.12.19";
+ sha256 = "c182c028ecf764a4f363426fbd101eb1e3c9283d5558cae898cdbd45847d4fca";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -11850,6 +11968,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "NMap" = callPackage
+ ({ mkDerivation, base, containers }:
+ mkDerivation {
+ pname = "NMap";
+ version = "0.12";
+ sha256 = "84133b162935f6f249fd8a7d19dcf378482fec0d292df929cee2dd4984281ab5";
+ libraryHaskellDepends = [ base containers ];
+ description = "A transparent nested Map structure";
+ license = "LGPL";
+ }) {};
+
"NTRU" = callPackage
({ mkDerivation, arithmoi, base, bytestring, containers, crypto-api
, polynomial, random, SHA, split
@@ -12051,8 +12180,8 @@ self: {
({ mkDerivation, base, bytestring, HUnit, net_snmp, process }:
mkDerivation {
pname = "NetSNMP";
- version = "0.3.2.2";
- sha256 = "7f29640168103c6a6194b37737a62057e7bb8cff3e8503e9dd1e46bb60552c9b";
+ version = "0.3.2.5";
+ sha256 = "e036a091b68190b8a6491cde1e14189f00c0c04de05a07a12678dc48d587543f";
libraryHaskellDepends = [ base bytestring ];
librarySystemDepends = [ net_snmp ];
testHaskellDepends = [ base bytestring HUnit process ];
@@ -12693,8 +12822,8 @@ self: {
}:
mkDerivation {
pname = "OpenGLRaw";
- version = "3.2.3.0";
- sha256 = "e64cb1b8ea0f87857e44396fb948751bdcace2a1c924875c8aa91b20e4d90ba3";
+ version = "3.2.4.0";
+ sha256 = "e3f9910be96b375fdf30db5a2cb6d55869eab11d507aa14edee177495c7dcb2e";
libraryHaskellDepends = [
base bytestring containers fixed half text transformers
];
@@ -13666,10 +13795,10 @@ self: {
({ mkDerivation, base, containers, mtl, old-time, random }:
mkDerivation {
pname = "QIO";
- version = "1.2";
- sha256 = "a6c35c08c698137e2923a1e5d5877d0349f75711d6119fcb68eb395b72b1a0f2";
+ version = "1.3";
+ sha256 = "e81da8f965cc031009fd9005f5cc253b83466bc0a14a2857d73c2c902ab6aba7";
libraryHaskellDepends = [ base containers mtl old-time random ];
- homepage = "http://www.cs.nott.ac.uk/~asg/QIO/";
+ homepage = "https://github.com/alexandersgreen/qio-haskell";
description = "The Quantum IO Monad is a library for defining quantum computations in Haskell";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -13901,8 +14030,8 @@ self: {
}:
mkDerivation {
pname = "R-pandoc";
- version = "0.2.1";
- sha256 = "57f08dfd05b50b9961ad4427fa6925d3a388618d73b41df7bee095b8349cbbd3";
+ version = "0.2.2";
+ sha256 = "988608b7353738a664a0557be210e82fd0db8e4a116577221fddc6b9b86d69cd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -14116,8 +14245,8 @@ self: {
}:
mkDerivation {
pname = "RNAlien";
- version = "1.2.5";
- sha256 = "ab604c7e96b0801d9dc4fa7f30335e918b485dc433efdfb1e56f4c4dc38be6cd";
+ version = "1.2.6";
+ sha256 = "a3a0de2cde3813f9e7f87f27f8ebf306bcb6da8da6b818624a335c329e051874";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -14320,15 +14449,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
@@ -14342,8 +14473,8 @@ self: {
({ mkDerivation, base, hspec, system-filepath, text }:
mkDerivation {
pname = "ReadArgs";
- version = "1.2.2";
- sha256 = "47a1a21621a45a960f516393c1e7c5d33a7d840db0f7eff20d43e6fc7fc9deec";
+ version = "1.2.3";
+ sha256 = "9f4b2a9dfa9f0d851f79853a56ffde3b35e218d5f2bf8354c91a1344a1251a69";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base system-filepath text ];
@@ -15669,6 +15800,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "Spintax_0_3_0_0" = callPackage
+ ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:
+ mkDerivation {
+ pname = "Spintax";
+ version = "0.3.0.0";
+ sha256 = "b417809b3734c582f1a08be3a14845b913562077bfc35b3bf067ced2309b0ffc";
+ libraryHaskellDepends = [
+ attoparsec base extra mtl mwc-random text
+ ];
+ homepage = "https://github.com/MichelBoucey/spintax";
+ description = "Random text generation based on spintax";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"Spock" = callPackage
({ mkDerivation, base, base64-bytestring, bytestring, containers
, cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect
@@ -15723,8 +15869,8 @@ self: {
homepage = "https://www.spock.li";
description = "Another Haskell web framework for rapid development";
license = stdenv.lib.licenses.bsd3;
- broken = true;
- }) {ghcjs-base = null;};
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
"Spock-api-server" = callPackage
({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }:
@@ -15851,6 +15997,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "Stack" = callPackage
+ ({ mkDerivation, base, nats, stm }:
+ mkDerivation {
+ pname = "Stack";
+ version = "0.3.2";
+ sha256 = "2ba17b68a6daef6040f30cfd6b0044380890bc9f7faf8ab21192ff467d2757e5";
+ libraryHaskellDepends = [ base nats stm ];
+ homepage = "https://en.wikipedia.org/wiki/Stack_(abstract_data_type)";
+ description = "Stack data structure";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"Stasis" = callPackage
({ mkDerivation, base, containers }:
mkDerivation {
@@ -17789,6 +17947,26 @@ self: {
inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr;
inherit (pkgs.xorg) libXrender;};
+ "X11_1_7" = callPackage
+ ({ mkDerivation, base, data-default, libX11, libXext, libXinerama
+ , libXrandr, libXrender
+ }:
+ mkDerivation {
+ pname = "X11";
+ version = "1.7";
+ sha256 = "9e7a67b9521fc0140b4804928f3821b6c3d3950fdc1d9c55478844dc4f57f5f4";
+ libraryHaskellDepends = [ base data-default ];
+ librarySystemDepends = [
+ libX11 libXext libXinerama libXrandr libXrender
+ ];
+ homepage = "https://github.com/xmonad/X11";
+ description = "A binding to the X11 graphics library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXext;
+ inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr;
+ inherit (pkgs.xorg) libXrender;};
+
"X11-extras" = callPackage
({ mkDerivation, base, libX11, X11 }:
mkDerivation {
@@ -17938,22 +18116,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.1.0.0";
- sha256 = "580f29b238c9195613f836eea693a937ba1ad00ea4591bbb7cb1a6a2032f02fd";
- revision = "4";
- editedCabalFile = "0cd366fd1401a0c35d4b127ef70b7c26447b6ab2c6c5cb4b0c8b4b4b654e27b2";
+ 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";
@@ -18214,8 +18390,8 @@ self: {
pname = "ZEBEDDE";
version = "0.1.0.0";
sha256 = "27b4f25adda6a500627a9311fe4c74c92dae0a18789cc7ea8e828c74a0ba05c5";
- revision = "3";
- editedCabalFile = "bd302015dbeab652042fed7c86f942d1cdf28d365de82e742290d5aac13d97c2";
+ revision = "5";
+ editedCabalFile = "5974fb98c510f354b64292143938ae0ccaebf69acd95400b5ac0cdb1d7deba9d";
libraryHaskellDepends = [ base vect ];
description = "Polymer growth simulation method";
license = stdenv.lib.licenses.bsd3;
@@ -18377,7 +18553,7 @@ self: {
description = "Bindings for ABC, A System for Sequential Synthesis and Verification";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {inherit (pkgs) abc;};
+ }) {abc = null;};
"abcnotation" = callPackage
({ mkDerivation, base, parsec, prettify, process, semigroups }:
@@ -19360,6 +19536,19 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "acme-smuggler" = callPackage
+ ({ mkDerivation, base, hspec }:
+ mkDerivation {
+ pname = "acme-smuggler";
+ version = "0.1.0.1";
+ sha256 = "740ecdf25dd30475f44b865490b8efecfb39621e91569c988d21ca0762946ac7";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base hspec ];
+ homepage = "https://github.com/benclifford/acme-smuggler";
+ description = "Smuggle arbitrary values in ()";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"acme-strfry" = callPackage
({ mkDerivation, base, bytestring }:
mkDerivation {
@@ -19411,8 +19600,8 @@ self: {
({ mkDerivation, base, time }:
mkDerivation {
pname = "acme-year";
- version = "2015";
- sha256 = "3b8b506b4d38b3e781aa3296f10643e76214a3a80e023c653951c41d8aefbafa";
+ version = "2016";
+ sha256 = "b43d1f33434930d8f6f2971eef34bd12c305f3976d7115688b87b00c85f170ff";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base time ];
homepage = "http://github.com/joeyadams/hs-acme-year";
@@ -19887,10 +20076,8 @@ self: {
}:
mkDerivation {
pname = "aeson-better-errors";
- version = "0.9.0.1";
- sha256 = "125f4453f945b5b051fa596cd148b7db0414942cdfbe1d6fd0359989ab45d8e6";
- revision = "1";
- editedCabalFile = "8aa3d1ad76116aad051bc6adce10e2798191bdd6ecf84145687e5c77d3a7a2c2";
+ version = "0.9.1.0";
+ sha256 = "68f001bf055ec7b755d91019f2a0ef136307d157a231acddad6b4cc561f67327";
libraryHaskellDepends = [
aeson base bytestring dlist mtl scientific text transformers
transformers-compat unordered-containers vector void
@@ -20036,8 +20223,8 @@ self: {
}:
mkDerivation {
pname = "aeson-filthy";
- version = "0.1";
- sha256 = "d4dc207915fca4e65a2de331898ea870c9e09247a93dd0bc0abe159b932ee0b4";
+ version = "0.1.1";
+ sha256 = "58fda3fb2ba49a952242d570bce4fa2cae47c0a47957e5f4b9ef66b9de5663cb";
libraryHaskellDepends = [
aeson base bytestring text unordered-containers
];
@@ -20113,8 +20300,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\"";
@@ -20390,8 +20577,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
@@ -20702,8 +20889,8 @@ self: {
({ mkDerivation, array, base, containers, mtl, random, vector }:
mkDerivation {
pname = "aivika";
- version = "4.5";
- sha256 = "4a86928ea9d289f82a5e81227dd2f5b29870fa3be608f135e4469e5a8f08c865";
+ version = "5.0.1";
+ sha256 = "ec5dd90074c05a947f3c1506fb58d7ab0eae497b31c2bba9641c9ff3cbf5ca57";
libraryHaskellDepends = [
array base containers mtl random vector
];
@@ -20735,8 +20922,8 @@ self: {
}:
mkDerivation {
pname = "aivika-distributed";
- version = "0.2";
- sha256 = "19dac37eb6436ce9dbcda7b8a30ee914ec28b6704321512571c27c483ac8b8cc";
+ version = "0.3.1";
+ sha256 = "e5db4e1da578aa873d1777a82ce3ab84af8fc58cc55ac76d19835bb4e004e852";
libraryHaskellDepends = [
aivika aivika-transformers base binary containers
distributed-process exceptions mtl random stm time
@@ -20832,14 +21019,15 @@ self: {
"aivika-realtime" = callPackage
({ mkDerivation, aivika, aivika-transformers, async, base
- , containers, mtl, stm, time
+ , containers, mtl, random, stm, time
}:
mkDerivation {
pname = "aivika-realtime";
- version = "0.1";
- sha256 = "843febd0367be16058268bb2d3e5cb65b42018c69aa21dd1351089b72a4a81bf";
+ version = "0.1.2";
+ sha256 = "fb60a9126563c09f44e915991f655cb062807deb3c8a51892d6bfba97d30de7a";
libraryHaskellDepends = [
- aivika aivika-transformers async base containers mtl stm time
+ aivika aivika-transformers async base containers mtl random stm
+ time
];
homepage = "http://www.aivikasoft.com/en/products/aivika.html";
description = "Soft real-time simulation module for the Aivika library";
@@ -20852,8 +21040,8 @@ self: {
}:
mkDerivation {
pname = "aivika-transformers";
- version = "4.5.1";
- sha256 = "76bfd156d6e9d037adf65b22ea1b66c75ed15ec00fd6b773c34e1c60ac12444a";
+ version = "5.0.1";
+ sha256 = "7a4e0088489642819513ab9acc0e05ab2ec94e4fddf5ac2df519740e7d7333d9";
libraryHaskellDepends = [
aivika array base containers mtl random vector
];
@@ -21455,8 +21643,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
@@ -21622,7 +21810,7 @@ self: {
license = "unknown";
}) {};
- "amazonka_1_4_4_2" = callPackage
+ "amazonka_1_4_5" = callPackage
({ mkDerivation, amazonka-core, base, bytestring, conduit
, conduit-extra, directory, exceptions, http-conduit, ini, mmorph
, monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text
@@ -21630,8 +21818,8 @@ self: {
}:
mkDerivation {
pname = "amazonka";
- version = "1.4.4.2";
- sha256 = "c0880ecc8794f71d1e7a9a3e6aae4e788430c7a8beeb0fae75f6b779ffd8640f";
+ version = "1.4.5";
+ sha256 = "86e7b7ef0dea4a6bc9a7644ec17908a3d9f781ac1190fcb4bd33690b8bca885c";
libraryHaskellDepends = [
amazonka-core base bytestring conduit conduit-extra directory
exceptions http-conduit ini mmorph monad-control mtl resourcet
@@ -21663,14 +21851,14 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "amazonka-apigateway_1_4_4" = callPackage
+ "amazonka-apigateway_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-apigateway";
- version = "1.4.4";
- sha256 = "a32aab9e4c78b15f609de4718845e593dcd5c4c29ee18643dde47c9c33adba21";
+ version = "1.4.5";
+ sha256 = "cccd4f7832b75b3df0de5946fdc0d9277fe2e267fce7a93524ebc609234d0e4a";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -21700,14 +21888,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-application-autoscaling_1_4_4" = callPackage
+ "amazonka-application-autoscaling_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-application-autoscaling";
- version = "1.4.4";
- sha256 = "f45fc7dd0b3b7be5cd4fa188cf7b0a3007c48db11ee8c92cbf16e6e20ea66f7e";
+ version = "1.4.5";
+ sha256 = "e6b4e51be8eb4279e0a5daa81b858e6b7a35a7005d48e038c1b53d5c9feec24e";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -21719,6 +21907,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "amazonka-appstream" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-appstream";
+ version = "1.4.5";
+ sha256 = "7f15da60e2afdf90ea98bec5734c5f387e2676fd7ef9a1388501396f7782517c";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon AppStream SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-autoscaling" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21737,14 +21944,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-autoscaling_1_4_4" = callPackage
+ "amazonka-autoscaling_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-autoscaling";
- version = "1.4.4";
- sha256 = "bb54c9340d38d4b08cbb43321eaad731416a38dda4a36e768e12d0d54ec8ab13";
+ version = "1.4.5";
+ sha256 = "f887bf9f7ff88edc228dee99a858a097e6235f066886430ce4d7c5dc339e6bda";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -21756,6 +21963,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "amazonka-budgets" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-budgets";
+ version = "1.4.5";
+ sha256 = "a1363b6057e1e85b9e4a18491056f8eeeee7dbd4798cc3292ba89fb4e7ea1d8b";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Budgets SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-certificatemanager" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -21774,14 +22000,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-certificatemanager_1_4_4" = callPackage
+ "amazonka-certificatemanager_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-certificatemanager";
- version = "1.4.4";
- sha256 = "dea7c0aaa3f69f3da3f8755ee47a4a402603aad8602f3a8ce92a302fabbf0fc6";
+ version = "1.4.5";
+ sha256 = "9990c1090044eb24013197b94bb923e800c6312c87c89f4caae6bbe36c0632b0";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -21811,14 +22037,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-cloudformation_1_4_4" = callPackage
+ "amazonka-cloudformation_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-cloudformation";
- version = "1.4.4";
- sha256 = "aee7abe767b8287213406e1e79db9be1d83f510f9239f8faf7e03cca3e40a923";
+ version = "1.4.5";
+ sha256 = "fac2471ee46e386baa7751ac091194d90f84c96eb0c0a1094e790ecb62ddb7f6";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -21848,14 +22074,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-cloudfront_1_4_4" = callPackage
+ "amazonka-cloudfront_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-cloudfront";
- version = "1.4.4";
- sha256 = "ef921bc77e37c6e0cc8ad8943fe11360ecc0f7ae3031fd99cfc4a28023201cfb";
+ version = "1.4.5";
+ sha256 = "0e89f49e5ab607a45f5ac94d9b47d3102c11c5d7b7249eb0303e9350a3a5aad1";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -21885,14 +22111,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-cloudhsm_1_4_4" = callPackage
+ "amazonka-cloudhsm_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-cloudhsm";
- version = "1.4.4";
- sha256 = "cf37dcb18bd9baa0cd8ddcf334fdbf9a649a5aebacc63a11b7e9de70f994d5d4";
+ version = "1.4.5";
+ sha256 = "0114a91437d3dfa7e03e656750a47fe2b4c223ec5c4a66ad533bd0893c77a837";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -21922,14 +22148,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-cloudsearch_1_4_4" = callPackage
+ "amazonka-cloudsearch_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-cloudsearch";
- version = "1.4.4";
- sha256 = "27c1fe0dee9fbb1ec9f1d90e89527483133d14cf85b9199cbf9b7e96f3586e42";
+ version = "1.4.5";
+ sha256 = "62c42b596e1682e438966f536db36e284926141487dd9c49a634f3ffacba325b";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -21959,14 +22185,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-cloudsearch-domains_1_4_4" = callPackage
+ "amazonka-cloudsearch-domains_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-cloudsearch-domains";
- version = "1.4.4";
- sha256 = "f5516758925123c47a89ffb1abe120efca0ac2c0f218babc13089f7c6e78e1ff";
+ version = "1.4.5";
+ sha256 = "e0090397d9d6ce30a99537bb5041b6085aa758502a809d8e5744cd222fea028a";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -21996,14 +22222,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-cloudtrail_1_4_4" = callPackage
+ "amazonka-cloudtrail_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-cloudtrail";
- version = "1.4.4";
- sha256 = "114a334efd63d9b5ef8b50425a96e8672e5d84f6cabb2b8d4c15784d1afa4b46";
+ version = "1.4.5";
+ sha256 = "45e80bd1a66402e9a56355a88bfaa3407fd9549f3ee66a9d9a344fccfaccc276";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22033,14 +22259,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-cloudwatch_1_4_4" = callPackage
+ "amazonka-cloudwatch_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-cloudwatch";
- version = "1.4.4";
- sha256 = "e76a1f166dd3f4ac110579961f4b142a42017e800d401a7fd8bfa85ecea0257c";
+ version = "1.4.5";
+ sha256 = "00e6b5f8d949ed5b4d4c7fc2c8264677018c54d7e5f36a6ead297da22f8c2201";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22070,14 +22296,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-cloudwatch-events_1_4_4" = callPackage
+ "amazonka-cloudwatch-events_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-cloudwatch-events";
- version = "1.4.4";
- sha256 = "cf7be01a292dbeb153560891f2eb65df1583df0248073668211320bf5fbe2559";
+ version = "1.4.5";
+ sha256 = "b1a2b8119e6c104e2820febd9a743c74b220ea70b2fdb4d464a8edc0bdc9fc7d";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22107,14 +22333,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-cloudwatch-logs_1_4_4" = callPackage
+ "amazonka-cloudwatch-logs_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-cloudwatch-logs";
- version = "1.4.4";
- sha256 = "4c29612100b88bd6d9e611f20e555ed69939e66e9e1502561ae345095ba23060";
+ version = "1.4.5";
+ sha256 = "10cffb3ce3f6ee216b740b78d56a3689b7f1d4e0e367c92afac8f4d412799032";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22126,6 +22352,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "amazonka-codebuild" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-codebuild";
+ version = "1.4.5";
+ sha256 = "24426e202b2171181bd3b0ffe8fa2e2032561d233fa36f1fe0dfb890887afdd0";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon CodeBuild SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-codecommit" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -22144,14 +22389,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-codecommit_1_4_4" = callPackage
+ "amazonka-codecommit_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-codecommit";
- version = "1.4.4";
- sha256 = "02d3c4988f82a20b2175a99203aec701efbeeb25a47bda53f6a755937f77d261";
+ version = "1.4.5";
+ sha256 = "fc8fed2cedf92680d4cffe7467c6b33259a0fb9b2461f11017eb85ce1a668063";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22181,14 +22426,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-codedeploy_1_4_4" = callPackage
+ "amazonka-codedeploy_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-codedeploy";
- version = "1.4.4";
- sha256 = "d900d37a7f47aaeec516dd149a2d2a8595a2dfaa75168624d49fdb96d2246482";
+ version = "1.4.5";
+ sha256 = "b1f0222e0d3504c116f5b1ff6d4769edafe7655bb0fd0deaa955689e9f7071b7";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22218,14 +22463,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-codepipeline_1_4_4" = callPackage
+ "amazonka-codepipeline_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-codepipeline";
- version = "1.4.4";
- sha256 = "dca521df26d5f53de2780b72a3d9c922326cc48847519e1ad088f330a5c02a6e";
+ version = "1.4.5";
+ sha256 = "6608a8f8f1adc996cbba830988cde869c425b1bc779bdb7f259d619f654646ec";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22255,14 +22500,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-cognito-identity_1_4_4" = callPackage
+ "amazonka-cognito-identity_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-cognito-identity";
- version = "1.4.4";
- sha256 = "61dc9389d62ee2f260dec8c3ba07a03afdb01c5150ac87b49ffba58561ce16df";
+ version = "1.4.5";
+ sha256 = "2cac79694e1b0c0a694525904bf8031d57a79c5fee2dda16b1126655ccf50d06";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22292,14 +22537,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-cognito-idp_1_4_4" = callPackage
+ "amazonka-cognito-idp_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-cognito-idp";
- version = "1.4.4";
- sha256 = "8e7370f170810959f61aaf2030f570e4486f24c2741cd185339e6c06039dc263";
+ version = "1.4.5";
+ sha256 = "bcf273498b47ecdfe30922bc22ad68d8d04773fd1a4ede8d98b6598cd7126618";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22329,14 +22574,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-cognito-sync_1_4_4" = callPackage
+ "amazonka-cognito-sync_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-cognito-sync";
- version = "1.4.4";
- sha256 = "85c4ff9369475464be0c912557b7e05876a401240ed63eb9582293e39c655c59";
+ version = "1.4.5";
+ sha256 = "1331523164798c0162904f58d95a100fec9527652fcdebb81846c460a6344edf";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22366,14 +22611,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-config_1_4_4" = callPackage
+ "amazonka-config_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-config";
- version = "1.4.4";
- sha256 = "a0d2e3dc82dbdcf3387a2ba5be959442b261b31083e063453cf4c1a4fd1b9a91";
+ version = "1.4.5";
+ sha256 = "775c5b9ff6efb185ee6954aaf57f607ac1fcc386daf6a7aa7071e7364c7fbe24";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22417,7 +22662,7 @@ self: {
license = "unknown";
}) {};
- "amazonka-core_1_4_4" = callPackage
+ "amazonka-core_1_4_5" = callPackage
({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
, case-insensitive, conduit, conduit-extra, cryptonite, deepseq
, exceptions, hashable, http-conduit, http-types, lens, memory, mtl
@@ -22428,8 +22673,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-core";
- version = "1.4.4";
- sha256 = "ad0b79e5f369d079389250310ac865125f41b8025b18bbec93293e787112f45b";
+ version = "1.4.5";
+ sha256 = "db13e1d0ced722c21187815f34975d08a6e5a432ed58c17b3bbac75389cdee7f";
libraryHaskellDepends = [
aeson attoparsec base bifunctors bytestring case-insensitive
conduit conduit-extra cryptonite deepseq exceptions hashable
@@ -22466,14 +22711,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-datapipeline_1_4_4" = callPackage
+ "amazonka-datapipeline_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-datapipeline";
- version = "1.4.4";
- sha256 = "cd68a5f94435542e4a348b23931ab619f866ed9ce773d500f6575eb9e1b5c1cb";
+ version = "1.4.5";
+ sha256 = "258812a9a3c553bf56e8d18f32ff69d28860f65664fb2510e5f5b1ff3ff25cb5";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22503,14 +22748,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-devicefarm_1_4_4" = callPackage
+ "amazonka-devicefarm_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-devicefarm";
- version = "1.4.4";
- sha256 = "242a32cdb5502ac586f2e1ffb2921280907cbf6eecaaf431206bb6f3aa5d8e3b";
+ version = "1.4.5";
+ sha256 = "ea472974c93f360186baea4a5b746ac37ff1c573c778b747c9be479dda458802";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22540,14 +22785,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-directconnect_1_4_4" = callPackage
+ "amazonka-directconnect_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-directconnect";
- version = "1.4.4";
- sha256 = "043dbd7e4ebc086155270118ca4329f3ad03a730c0b8aabe183958fba844de0d";
+ version = "1.4.5";
+ sha256 = "52139e543342d60607fc24e0ff5a25e38dc8868590aefbabf659bced71b3dea9";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22577,14 +22822,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-discovery_1_4_4" = callPackage
+ "amazonka-discovery_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-discovery";
- version = "1.4.4";
- sha256 = "9bbb7e4f2baec019ce8fb41ff6382e5fa1a7c3010012cad2f7d315f5220e8045";
+ version = "1.4.5";
+ sha256 = "df5781938eda734bcce63fc6f7b674422bfa1dde5dbdf46d6cc1cf7bcdbcadb8";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22614,14 +22859,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-dms_1_4_4" = callPackage
+ "amazonka-dms_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-dms";
- version = "1.4.4";
- sha256 = "a8f6b3684de4d1b190aebf1966e2497fc8f8b18bed3dea687e4603fe8b70caaa";
+ version = "1.4.5";
+ sha256 = "334209b75c646cb4783ec19b98bece9274291402627bc65a86180bffb15171fc";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22651,14 +22896,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-ds_1_4_4" = callPackage
+ "amazonka-ds_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-ds";
- version = "1.4.4";
- sha256 = "5cae6b1926cfd6ea5f7fb4ad596a3d7fec80ad6e2ae6bb37f837ce5e5a9b48a0";
+ version = "1.4.5";
+ sha256 = "e711f34752793135a9bc088789f69482faf3044d23394c0455a8873ec76944dd";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22688,14 +22933,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-dynamodb_1_4_4" = callPackage
+ "amazonka-dynamodb_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-dynamodb";
- version = "1.4.4";
- sha256 = "9e0d23783e6e02eb3dd3edaa890a90a92be51024bd1e25967e680e8be257f49e";
+ version = "1.4.5";
+ sha256 = "74b23d5a012af7b2f3a14001a41496e22bdc61884aa52b8aac7f687c64bcd762";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22725,14 +22970,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-dynamodb-streams_1_4_4" = callPackage
+ "amazonka-dynamodb-streams_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-dynamodb-streams";
- version = "1.4.4";
- sha256 = "575ee098e69bf18cb59549cac9ff4ce9c40ef54860b58210886290c933b04fa9";
+ version = "1.4.5";
+ sha256 = "83a340d763fbcd62b0b6f4c09358646516c7949b5f86423d4263874175e1feed";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22762,14 +23007,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-ec2_1_4_4" = callPackage
+ "amazonka-ec2_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-ec2";
- version = "1.4.4";
- sha256 = "6fef83cb09e9ca74a6f1fb18f3add1420fc6c237aeafdb450a97d3216037741c";
+ version = "1.4.5";
+ sha256 = "e4a4938f947b6d69b799b5abc47a2d36e57ba68fdcc51a10b01c2566510cd498";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22799,14 +23044,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-ecr_1_4_4" = callPackage
+ "amazonka-ecr_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-ecr";
- version = "1.4.4";
- sha256 = "d38d111fa1801b048fcadd67475b0a916a0813636607df2db48747c8190148db";
+ version = "1.4.5";
+ sha256 = "c3fa1094ea22402a87f4803301b74081bfd3a6dd1db42536ade0994548fd690c";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22836,14 +23081,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-ecs_1_4_4" = callPackage
+ "amazonka-ecs_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-ecs";
- version = "1.4.4";
- sha256 = "fd2b867115fcd1a0b0ea992f3d2e902d7a5b66cce7c62da66ee1ac49c93aa574";
+ version = "1.4.5";
+ sha256 = "ba72592448eee9123acc7b700067343712c6c05f0635d6a52ebdcf3c08e2c414";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22873,14 +23118,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-efs_1_4_4" = callPackage
+ "amazonka-efs_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-efs";
- version = "1.4.4";
- sha256 = "fb10cf8284a036623620f80c5fd938d5200e4e5ba67a8352e5549479a5661544";
+ version = "1.4.5";
+ sha256 = "e8fba140dc9ca493da92ba57873b54e4488ad63d1a7e6b914b0149338cb52c50";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22910,14 +23155,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-elasticache_1_4_4" = callPackage
+ "amazonka-elasticache_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-elasticache";
- version = "1.4.4";
- sha256 = "70a1bfb0f6f48d4c7d650c20c0397b6722f9658e59c99b330ad1002bfdaedc2f";
+ version = "1.4.5";
+ sha256 = "6f592d7af0a9b0433ab9332bbfbb84b3b75c27b6a4df45006ff096c261be45bb";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22947,14 +23192,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-elasticbeanstalk_1_4_4" = callPackage
+ "amazonka-elasticbeanstalk_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-elasticbeanstalk";
- version = "1.4.4";
- sha256 = "ebd1f78511256ff1592e71bd4368308689faec1fbee98d7217436a735cf93270";
+ version = "1.4.5";
+ sha256 = "e3ac291b93b951ab557ff82bed2cbe702e56b8b24e5f95e3330777fb82df59f8";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22984,14 +23229,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-elasticsearch_1_4_4" = callPackage
+ "amazonka-elasticsearch_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-elasticsearch";
- version = "1.4.4";
- sha256 = "c69aefafbd4a6117fec49da4dac96bf26ac06f82474b6b515f99803f00c87222";
+ version = "1.4.5";
+ sha256 = "bdc5f8bf276fde27b5357048f77b261569cddc1ffe1de2ff1035e436b9255303";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23021,14 +23266,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-elastictranscoder_1_4_4" = callPackage
+ "amazonka-elastictranscoder_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-elastictranscoder";
- version = "1.4.4";
- sha256 = "1d66ce985ba936e20b13364c672b4e3f017edbeae2ecc5005899f20072844ec7";
+ version = "1.4.5";
+ sha256 = "306760ad72bae83f29cfa574caac2646e3eac6935596d0e7ed66201b8e2c123b";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23058,14 +23303,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-elb_1_4_4" = callPackage
+ "amazonka-elb_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-elb";
- version = "1.4.4";
- sha256 = "1fac7fd383a58c8455e0de38fbafc9aff7fd6301594adafe3660380f16a63f4f";
+ version = "1.4.5";
+ sha256 = "e6ca6ef93fc988ff9cb4314ff6668f415ea4306d41a5e8c555d6deefd210eb62";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23083,8 +23328,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-elbv2";
- version = "1.4.4";
- sha256 = "41587adac7111d7fd6e4c913bdb3a135fab0a81b90b8d137f4554043de7a9ba2";
+ version = "1.4.5";
+ sha256 = "fa4c8d492f85be81c2ad3d47f08d464acb7003e9fb003724daa8992de75dd847";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23114,14 +23359,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-emr_1_4_4" = callPackage
+ "amazonka-emr_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-emr";
- version = "1.4.4";
- sha256 = "5c9ad06a37ffa2d8c79ad068430c361c7e792f59528846aae18380f75453dcd7";
+ version = "1.4.5";
+ sha256 = "2c99f0be432d535e7e55a958cb6d8c65e9e48dc5f337daf61705aa2de0e924b7";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23151,14 +23396,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-gamelift_1_4_4" = callPackage
+ "amazonka-gamelift_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-gamelift";
- version = "1.4.4";
- sha256 = "bfef8aeb54f867d9c818405082022492c47ff4bcea2239610b51d8529b73707b";
+ version = "1.4.5";
+ sha256 = "e05847758651f3f658c1db3275798deffaabc4eb0ed1e1e2bc87ef1608dc8152";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23188,14 +23433,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-glacier_1_4_4" = callPackage
+ "amazonka-glacier_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-glacier";
- version = "1.4.4";
- sha256 = "551f1dd605fcd0d8efc2cf8db2fefd1385eefcbe40aee62ed7991acae8c19b7a";
+ version = "1.4.5";
+ sha256 = "9ca17da801fa3b470796a4285e5d45592005d2d9ec96bb3d9298868535ad52e3";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23207,6 +23452,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "amazonka-health" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-health";
+ version = "1.4.5";
+ sha256 = "ec1def33813329c965a92c4becd7b942750c8da9b1f81b00b673aa676c1e2e61";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Health APIs and Notifications SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-iam" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -23225,14 +23489,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-iam_1_4_4" = callPackage
+ "amazonka-iam_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-iam";
- version = "1.4.4";
- sha256 = "b2911ae52d1476f7109a96c2fc2e1ba58950aae6de57aefc1c4ad0c74be19067";
+ version = "1.4.5";
+ sha256 = "c37c6081febdce459a9683ac9ea22f45161dd86d56f452e2699f819a729068ca";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23262,14 +23526,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-importexport_1_4_4" = callPackage
+ "amazonka-importexport_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-importexport";
- version = "1.4.4";
- sha256 = "463e6ad69547306e34848a40382aea4ff187b1fc7e838481b08f9ad5970167df";
+ version = "1.4.5";
+ sha256 = "24b131fbf1af88531c1688541cc357e22cc4cd770a5a691ea59b02bd3959c5ec";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23299,14 +23563,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-inspector_1_4_4" = callPackage
+ "amazonka-inspector_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-inspector";
- version = "1.4.4";
- sha256 = "76fe8fc64f948ed26e36c11fe7aa3650bd7f971726a2dbd5215d3be58ff1ba01";
+ version = "1.4.5";
+ sha256 = "8408f9535fbd5c3136a2adc5afb7d698520db7a5577c598c8d7ed02e9d9aa78a";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23336,14 +23600,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-iot_1_4_4" = callPackage
+ "amazonka-iot_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-iot";
- version = "1.4.4";
- sha256 = "fde976b7e41af4cb3d3a6399f0a8e5b76993f11b94381a1fffdafbdc2c67a1bd";
+ version = "1.4.5";
+ sha256 = "bac8bb743fc67bbcd62b2c636c922af58d0866df1859cd266ceda2f1d3d66293";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23373,14 +23637,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-iot-dataplane_1_4_4" = callPackage
+ "amazonka-iot-dataplane_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-iot-dataplane";
- version = "1.4.4";
- sha256 = "ba3451574fbf7a49ec5f50e5c8479bfb3235db42a792760d01247968412900f5";
+ version = "1.4.5";
+ sha256 = "3b3dc22d05f534fefb163600963793dbcd9d077200255f7ce106fe54f6d4d962";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23410,14 +23674,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-kinesis_1_4_4" = callPackage
+ "amazonka-kinesis_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-kinesis";
- version = "1.4.4";
- sha256 = "734f9f465eec775faa97f0379933d469ce35c8ac6651bfd47b530ccc3d0c739a";
+ version = "1.4.5";
+ sha256 = "69661eeaf4b9c9e8082d3e576eb705ae8de3c3e90c814f90bc0cbd0e2f1ea24d";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23435,8 +23699,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-kinesis-analytics";
- version = "1.4.4";
- sha256 = "fe628e5e65947849c7ec390140144d257bebf994ea2a76ddb6b11eaee69c02a9";
+ version = "1.4.5";
+ sha256 = "36917ed8d951b2cae224f1fd1f41a94741d5a51d7606de11af28f3bb63e5908a";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23466,14 +23730,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-kinesis-firehose_1_4_4" = callPackage
+ "amazonka-kinesis-firehose_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-kinesis-firehose";
- version = "1.4.4";
- sha256 = "33274c4050b98ce89cb5495a92642d9ea99edcff70a2c8e994c6761921a4bef9";
+ version = "1.4.5";
+ sha256 = "fcdccc16e54f79b99d98e32790284ea0d64207bce0e0405e9cfd7632d24ce103";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23503,14 +23767,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-kms_1_4_4" = callPackage
+ "amazonka-kms_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-kms";
- version = "1.4.4";
- sha256 = "20537bfd340f26e2f78fde482754e362e2a9369d4697141192c1cd3e759a62ac";
+ version = "1.4.5";
+ sha256 = "8578614ba763ed460f78b55ae975680b43d856a7c57d7380c034097d1c68f0f6";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23540,14 +23804,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-lambda_1_4_4" = callPackage
+ "amazonka-lambda_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-lambda";
- version = "1.4.4";
- sha256 = "0dd073dd98625b829ed38345f57615f65492158c6731b9ca7522414d24ba9eb3";
+ version = "1.4.5";
+ sha256 = "b210aa40ff787d5c848278609b9a9b4d001f1c0a38b965488e6d416af949cf22";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23559,6 +23823,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "amazonka-lightsail" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-lightsail";
+ version = "1.4.5";
+ sha256 = "9204a4a4d70e8edd998011a5e3216f269ba291e004d3ad88a343d1c097c3e980";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Lightsail SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-marketplace-analytics" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -23577,14 +23860,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-marketplace-analytics_1_4_4" = callPackage
+ "amazonka-marketplace-analytics_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-marketplace-analytics";
- version = "1.4.4";
- sha256 = "0027736e24e0fe98388269a64c8d27fbec52e6c6944241c22a6d9d8dbd191d2d";
+ version = "1.4.5";
+ sha256 = "43d428b51e7a38aac08c64dc2dc01e98021a11b5fa9d178c351808d4f109ab28";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23614,14 +23897,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-marketplace-metering_1_4_4" = callPackage
+ "amazonka-marketplace-metering_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-marketplace-metering";
- version = "1.4.4";
- sha256 = "047fa110ee9969017e81b1643dfc653c86efa7cb10999bb2185ebac1a4832397";
+ version = "1.4.5";
+ sha256 = "76144fe48a26014c40ec0fca4f828c9e4b5dfd08f1efc0ffb5b3b1829d8e3cde";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23651,14 +23934,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-ml_1_4_4" = callPackage
+ "amazonka-ml_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-ml";
- version = "1.4.4";
- sha256 = "f03c3da79b2e386f5355f2b5f8cab536f739b99aa44865a33876b751de15cd12";
+ version = "1.4.5";
+ sha256 = "579b0d042abdc637d14f394a89b2e192b1c5e1bc82fff1c666e6f5eac9544865";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23688,14 +23971,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-opsworks_1_4_4" = callPackage
+ "amazonka-opsworks_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-opsworks";
- version = "1.4.4";
- sha256 = "8b15270cfe54ff8ab6f427118771bc26878ac5f21bd2bd0785b74c6736bab2ba";
+ version = "1.4.5";
+ sha256 = "c91802c8bdcf0d259d86b382e5ce1fb25795e73810631f9367d5603afc2f8d34";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23707,6 +23990,63 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "amazonka-opsworks-cm" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-opsworks-cm";
+ version = "1.4.5";
+ sha256 = "5791722b0bb3783dfc11ddffa284024b5317f3da817040b4a6389b6dec9d29d3";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon OpsWorks for Chef Automate SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "amazonka-pinpoint" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-pinpoint";
+ version = "1.4.5";
+ sha256 = "91267103b0453e5f56ef6e01f24a139ea2c4020a8344cd8664e7958f9ac1bcdd";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Pinpoint SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "amazonka-polly" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-polly";
+ version = "1.4.5";
+ sha256 = "b5d5e2347c9a98daf4182e16a8100c6c1ffe5ed86d9adc69ae888c5aaeb3cec6";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Polly SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-rds" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -23726,14 +24066,14 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "amazonka-rds_1_4_4" = callPackage
+ "amazonka-rds_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-rds";
- version = "1.4.4";
- sha256 = "dbc9ae2a6945ee1cad0c7ac0df9557dd362648b0ee8b73ccfc7e7da79f732f30";
+ version = "1.4.5";
+ sha256 = "8377e03b84e6d8d8ec2417046ce3d67bc052632fc05d92f2f6299e6808c2a30b";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23763,14 +24103,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-redshift_1_4_4" = callPackage
+ "amazonka-redshift_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-redshift";
- version = "1.4.4";
- sha256 = "1329dfc9055b46d1539a871d2c148760f1f62802a2d7b3d4253aacd91b7caa2d";
+ version = "1.4.5";
+ sha256 = "b7ecd60b51ff6b28d3435ef716485a2ebb1e3863a13cdb90b4ceb2ec65ffa84a";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23782,6 +24122,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "amazonka-rekognition" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-rekognition";
+ version = "1.4.5";
+ sha256 = "a6c3aec679aa4b7c4484644b22738fb9611dffe72c38fd80ecf1c19c067a25be";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Rekognition SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-route53" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
@@ -23800,15 +24159,15 @@ self: {
license = "unknown";
}) {};
- "amazonka-route53_1_4_4" = callPackage
+ "amazonka-route53_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-route53";
- version = "1.4.4";
- sha256 = "74cb1fa132aa0888c8c12acd1aca4e87360ae4a238052dcf21fc3070a10d609d";
- libraryHaskellDepends = [ amazonka-core base ];
+ version = "1.4.5";
+ sha256 = "68f49826d8f594abc99311081a9d8224f6e79457e6118c5bc7a55bd4aed8425d";
+ libraryHaskellDepends = [ amazonka-core base text ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
time unordered-containers
@@ -23837,14 +24196,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-route53-domains_1_4_4" = callPackage
+ "amazonka-route53-domains_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-route53-domains";
- version = "1.4.4";
- sha256 = "bbcdbda4a0f0a7bc408e033183bc46cc680b121d43d2ad44a66b07c70195a6f1";
+ version = "1.4.5";
+ sha256 = "1fb74290a0c019f4dfa1fba75b553efd90c440fb3f4a89fba66dd5ec7ad4fd3d";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23874,14 +24233,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-s3_1_4_4" = callPackage
+ "amazonka-s3_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, lens, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-s3";
- version = "1.4.4";
- sha256 = "bd32c46e99cca9c1acf6647813975411c5fec92690982fc2e00881da58759435";
+ version = "1.4.5";
+ sha256 = "78297e966eac3ba9045612c8e09d3e6e34c83b5dfb3d59e489edc7cd3a2fe4ad";
libraryHaskellDepends = [ amazonka-core base lens text ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23911,14 +24270,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-sdb_1_4_4" = callPackage
+ "amazonka-sdb_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-sdb";
- version = "1.4.4";
- sha256 = "eae1f14a0ae2e0ea39ed9a1212d63fe9d7262e01d05bce8869b83525e690c58d";
+ version = "1.4.5";
+ sha256 = "fdec685f8184680eaea76456db18cd552ccb77fd40e941d3590f2f57f2bec6b2";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23936,8 +24295,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-servicecatalog";
- version = "1.4.4";
- sha256 = "6d2766375d3ed2b0f3b4f4604eab62887a23a7ecd64c1a8c8ed5411a1af0432a";
+ version = "1.4.5";
+ sha256 = "a5e0106a155a5bd51ac6bb8f2d1037419a621fe5402f2a0888399bb98f74d6e7";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23967,14 +24326,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-ses_1_4_4" = callPackage
+ "amazonka-ses_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-ses";
- version = "1.4.4";
- sha256 = "ceb5a1d20b2b2a2b5cbb6e54a731f82902552c01f5b7406cedd469256e74ec56";
+ version = "1.4.5";
+ sha256 = "a30f23624dcba2d779dc67a13e9b6f9092f7526e1bf54290fdd0684ae42e1329";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23986,14 +24345,52 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "amazonka-shield" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-shield";
+ version = "1.4.5";
+ sha256 = "8c2ec2c561fca8653d33136d0f93f6dc4cd4de1b15a0cc00e5eb0ec9d7242fdc";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Shield SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "amazonka-sms" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-sms";
+ version = "1.4.5";
+ sha256 = "4a6ffbf02c58db9928517f48d392d7068a5439b39a7a119a727a9c6dd7b0da78";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Server Migration Service SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amazonka-snowball" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-snowball";
- version = "1.4.4";
- sha256 = "d66c1d7ed36ff62a79a973ba9afbd2e050933d59350bfc65e7fc0a59d7b26103";
+ version = "1.4.5";
+ sha256 = "e27f2c73800874531269dae80e823575ac71820453f1b8c6e406d542ed831e1e";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24023,14 +24420,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-sns_1_4_4" = callPackage
+ "amazonka-sns_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-sns";
- version = "1.4.4";
- sha256 = "335f380c3579f139ab5deff522fbfd07398ba6019214923e92657b322a8eadef";
+ version = "1.4.5";
+ sha256 = "e875c23e6a55cb9753d84f1dab58a39728b9c1ec6b1834db8b5b5d150f888681";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24061,14 +24458,14 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "amazonka-sqs_1_4_4" = callPackage
+ "amazonka-sqs_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-sqs";
- version = "1.4.4";
- sha256 = "cfd9c9d4ee269a36a9f05f4fae6261f8707fcf43d738b57758bdbf43a9eff466";
+ version = "1.4.5";
+ sha256 = "90a38f27bdbe229300cf4a64a253078e51703ad76eb799b597f2ff580fac52dd";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24098,21 +24495,40 @@ self: {
license = "unknown";
}) {};
- "amazonka-ssm_1_4_4" = callPackage
+ "amazonka-ssm_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-ssm";
- version = "1.4.4";
- sha256 = "fdf85f55da22e55c8569b2f5149e7f45acd99a6d3bd656d42977f8885a3e727f";
+ version = "1.4.5";
+ sha256 = "fbd16ca62f55f53904e78db6e6e3832b94b84541ca22271cd73c51ab7150df52";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
time unordered-containers
];
homepage = "https://github.com/brendanhay/amazonka";
- description = "Amazon Simple Systems Management Service SDK";
+ description = "Amazon Simple Systems Manager (SSM) SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "amazonka-stepfunctions" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-stepfunctions";
+ version = "1.4.5";
+ sha256 = "990379c5baff3e530eea53dbd00a43bf49868d81bdc4abd057e6d9ea6ef05218";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon Step Functions SDK";
license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -24135,14 +24551,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-storagegateway_1_4_4" = callPackage
+ "amazonka-storagegateway_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-storagegateway";
- version = "1.4.4";
- sha256 = "5375ce7683cd502795f810dbefd8207b823b1d74a63a29f1f3b9c3bd1bf458c7";
+ version = "1.4.5";
+ sha256 = "8cdf92d74e7911efabb6cc67bbcdaecbcf71363fc1277b5eb1cadc8c4cf21aeb";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24172,14 +24588,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-sts_1_4_4" = callPackage
+ "amazonka-sts_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-sts";
- version = "1.4.4";
- sha256 = "5eac6f9cb9b5710cf24fdae9f46362d05ae3f1d14a791c7439653b6f2a3f9b9f";
+ version = "1.4.5";
+ sha256 = "b83baf2122c0c30f52a5e7f9d896b2d9b623ed768e61bf7e9d246534f36de3d5";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24209,14 +24625,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-support_1_4_4" = callPackage
+ "amazonka-support_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-support";
- version = "1.4.4";
- sha256 = "162469b9af326e2a6003a86783fb9275e6ba7c402452c200e94380bbd83455e2";
+ version = "1.4.5";
+ sha256 = "135f841dfa793226d7b5d166dfa1d8f0c4fce632228329052178389791db8e2b";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24246,14 +24662,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-swf_1_4_4" = callPackage
+ "amazonka-swf_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-swf";
- version = "1.4.4";
- sha256 = "f99a09b5d58a125c2cf3f52a2e20fec1b8d5f9b1aac40e01ee4f53872c67f574";
+ version = "1.4.5";
+ sha256 = "4397c168cb7bb864e8819ac12e76b9b86885721fda9bc97f42bd6482d7279928";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24287,7 +24703,7 @@ self: {
license = "unknown";
}) {};
- "amazonka-test_1_4_4_2" = callPackage
+ "amazonka-test_1_4_5" = callPackage
({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring
, case-insensitive, conduit, conduit-extra, groom, http-client
, http-types, process, resourcet, tasty, tasty-hunit
@@ -24296,8 +24712,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-test";
- version = "1.4.4.2";
- sha256 = "aff0b797f4d00a89d6f0a97e662157f8c510ea8585db26a8f8c2ad2ee37fdd46";
+ version = "1.4.5";
+ sha256 = "988872cbcd4b102f1fd45a5160b81026087bf4eec1c982dcaaa3df8296b75e3a";
libraryHaskellDepends = [
aeson amazonka-core base bifunctors bytestring case-insensitive
conduit conduit-extra groom http-client http-types process
@@ -24328,14 +24744,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-waf_1_4_4" = callPackage
+ "amazonka-waf_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-waf";
- version = "1.4.4";
- sha256 = "8a3b59a42d1344cd48418764b17afabacdc1720247af144f332282e41104e88b";
+ version = "1.4.5";
+ sha256 = "fdc63d12726b015627b135539c732116e96b947be9a774df72ee1d1646cff155";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24365,14 +24781,14 @@ self: {
license = "unknown";
}) {};
- "amazonka-workspaces_1_4_4" = callPackage
+ "amazonka-workspaces_1_4_5" = callPackage
({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
, tasty, tasty-hunit, text, time, unordered-containers
}:
mkDerivation {
pname = "amazonka-workspaces";
- version = "1.4.4";
- sha256 = "ea89d4cd168dec09787c276ede32ce85536d46e15c88a3fcfe5b3205303307e7";
+ version = "1.4.5";
+ sha256 = "356c5f0267aa61f4cc3181a8719f7e3a3d9244c473c728aaaba0b4babcb7a7df";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24384,6 +24800,50 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "amazonka-xray" = callPackage
+ ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+ , tasty, tasty-hunit, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "amazonka-xray";
+ version = "1.4.5";
+ sha256 = "e133389857343433d017950ec6b9c853d884d391b91986691f9e6afeeecee250";
+ libraryHaskellDepends = [ amazonka-core base ];
+ testHaskellDepends = [
+ amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+ time unordered-containers
+ ];
+ homepage = "https://github.com/brendanhay/amazonka";
+ description = "Amazon X-Ray SDK";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "amby" = callPackage
+ ({ mkDerivation, base, bytestring, cassava, Chart, Chart-cairo
+ , Chart-diagrams, colour, containers, data-default
+ , data-default-class, datasets, doctest, either, exceptions, extra
+ , foldl, lens, mtl, mwc-random, pretty-display, process, safe
+ , scientific, statistics, tasty, tasty-hunit, text, vector
+ , vector-algorithms
+ }:
+ mkDerivation {
+ pname = "amby";
+ version = "0.3.2";
+ sha256 = "fa7b70c21377bb19396a69a5782abb0400ce19d99082d6a9f191c790a5049369";
+ libraryHaskellDepends = [
+ base bytestring cassava Chart Chart-cairo Chart-diagrams colour
+ containers data-default data-default-class datasets either
+ exceptions extra foldl lens mtl mwc-random pretty-display process
+ safe scientific statistics text vector vector-algorithms
+ ];
+ testHaskellDepends = [ base doctest tasty tasty-hunit vector ];
+ homepage = "https://github.com/jsermeno/amby#readme";
+ description = "Statistical data visualization";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ampersand" = callPackage
({ mkDerivation, base, bytestring, conduit, containers, csv
, directory, filepath, graphviz, hashable, HStringTemplate, lens
@@ -24472,8 +24932,8 @@ self: {
}:
mkDerivation {
pname = "amqp-worker";
- version = "0.2.1";
- sha256 = "f3b89e4286f84b4d1029d4750184831b2fcb5f194446fb1b1d938824abcf08a4";
+ version = "0.2.3";
+ sha256 = "41e7ed6f745cde27d451057958e5d017a6e6558ed5083f0cd0a10ee3bc757a09";
libraryHaskellDepends = [
aeson amqp base bytestring data-default exceptions monad-control
mtl resource-pool split text transformers-base
@@ -24650,6 +25110,8 @@ self: {
pname = "angel";
version = "0.6.2";
sha256 = "caff0b06481dc3858b059e2faa12afdad66152c0341020dc53cceacf28e2e358";
+ revision = "1";
+ editedCabalFile = "b8dc3c8526dde130a1acd260a062b184f0c614cb459116455d8637a83702a23f";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -24807,10 +25269,8 @@ self: {
}:
mkDerivation {
pname = "ansi-pretty";
- version = "0.1.2.0";
- sha256 = "11079e97b7faaf3825d0ab2bb3e111b5d1b9085343e6505fc2b58240c4eaa424";
- revision = "3";
- editedCabalFile = "f95f677bc3d419b5ad555799a7456684a11612e35ab08e2fe557323ed22d3127";
+ version = "0.1.2.1";
+ sha256 = "708819f93f1759919a19dcfccddf3ddc8d9fba930cb73fab3ec9f6f5691394c6";
libraryHaskellDepends = [
aeson ansi-wl-pprint array base bytestring containers generics-sop
nats scientific semigroups tagged text time unordered-containers
@@ -25519,6 +25979,19 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "apioiaf-client" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, lens, wreq }:
+ mkDerivation {
+ pname = "apioiaf-client";
+ version = "0.1.0.0";
+ sha256 = "8493248ae0d1303afba5f600e7c38fb29b6811d2348f994af056413a3ebbd0ff";
+ libraryHaskellDepends = [ aeson base bytestring lens wreq ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/kberger/anapioficeandfire-haskell#readme";
+ description = "Consumer library for anapioficeandfire.com";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"apis" = callPackage
({ mkDerivation, aeson, base, containers, deepseq, directory
, ecma262, exceptions, filemanip, filepath, hslogger, hxt, mtl
@@ -25766,6 +26239,38 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "apply-refact_0_3_0_1" = callPackage
+ ({ mkDerivation, base, containers, directory, filemanip, filepath
+ , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
+ , silently, syb, tasty, tasty-expected-failure, tasty-golden
+ , temporary, transformers, unix-compat
+ }:
+ mkDerivation {
+ pname = "apply-refact";
+ version = "0.3.0.1";
+ sha256 = "1754bd300db92fdf668d4698af053d4da686512264275478946b7e0710c5e814";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers directory filemanip ghc ghc-exactprint mtl process
+ refact syb temporary transformers unix-compat
+ ];
+ executableHaskellDepends = [
+ base containers directory filemanip filepath ghc ghc-exactprint mtl
+ optparse-applicative process refact syb temporary transformers
+ unix-compat
+ ];
+ testHaskellDepends = [
+ base containers directory filemanip filepath ghc ghc-exactprint mtl
+ optparse-applicative process refact silently syb tasty
+ tasty-expected-failure tasty-golden temporary transformers
+ unix-compat
+ ];
+ description = "Perform refactorings specified by the refact library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"apportionment" = callPackage
({ mkDerivation, base, containers, utility-ht }:
mkDerivation {
@@ -25913,8 +26418,8 @@ self: {
}:
mkDerivation {
pname = "arbtt";
- version = "0.9.0.10";
- sha256 = "cc58ebe8508c682f783b238652f0415958c948b4957854624c4f23c131b0fcc2";
+ version = "0.9.0.11";
+ sha256 = "9133fb9cc88568c3baec403e674e95cfe0ebedc1ff974499d97e93d916bdefef";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -26693,8 +27198,8 @@ self: {
}:
mkDerivation {
pname = "asciidiagram";
- version = "1.3.2";
- sha256 = "11eb37084513a6b510f88f043a10c2cdc9b039041b6e5d3ae0decd7c40de4784";
+ version = "1.3.3";
+ sha256 = "694948f5f408aa7dfcab17ffefb74e413f1d3dacf2c523bfbf9ecaf972645f18";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -26961,8 +27466,8 @@ self: {
}:
mkDerivation {
pname = "async";
- version = "2.1.0";
- sha256 = "93c37611f9c68b5cdc8cd9960ae77a7fbc25da83cae90137ef1378d857f22c2f";
+ version = "2.1.1";
+ sha256 = "24134b36921f9874abb73be90886b4c23a67a9b4990f2d8e32d08dbfa5f74f90";
libraryHaskellDepends = [ base stm ];
testHaskellDepends = [
base HUnit test-framework test-framework-hunit
@@ -28096,6 +28601,8 @@ self: {
pname = "avers";
version = "0.0.17.0";
sha256 = "3e6b4a39ccb99373a1a574625b86d4948f4ba4a747652e3c5ddd8d8b09fe212d";
+ revision = "1";
+ editedCabalFile = "76f5fea6b94a6dd6041577fd29de245130f3003c73296a94baea62f066b9b474";
libraryHaskellDepends = [
aeson attoparsec base bytestring clock containers cryptonite
filepath inflections memory MonadRandom mtl network network-uri
@@ -28139,6 +28646,8 @@ self: {
pname = "avers-api-docs";
version = "0.0.17.0";
sha256 = "24029af182f7eff072fa05615cea5cf69ab2c5b481f1b2df5f7a606714ca716f";
+ revision = "1";
+ editedCabalFile = "cfd40f6559ac3e05f5d0da009454b18208e7b76ec87a15fa7311d4f0a7caf7ec";
libraryHaskellDepends = [
aeson avers avers-api base cookie lens servant servant-swagger
swagger2 text unordered-containers
@@ -28160,6 +28669,8 @@ self: {
pname = "avers-server";
version = "0.0.17.0";
sha256 = "6da0c28f2b75989805cb4c2c7bf10b1b6ac4211f310d2bb902a4a7725ce05c3c";
+ revision = "1";
+ editedCabalFile = "8fb371992bc5535a3d923ec6e16e975ac3d5efaadbb1ae8d4e08400b318f92dc";
libraryHaskellDepends = [
aeson avers avers-api base base64-bytestring bytestring
bytestring-conversion containers cookie cryptonite either
@@ -28728,6 +29239,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "aws-simple" = callPackage
+ ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, amazonka-sqs
+ , base, blaze-builder, bytestring, conduit, lens, mtl, resourcet
+ , text
+ }:
+ mkDerivation {
+ pname = "aws-simple";
+ version = "0.1.0.0";
+ sha256 = "70091063d883e2320a622a2909abc093e11a47d0a18c64b6557679e401ba918f";
+ libraryHaskellDepends = [
+ amazonka amazonka-core amazonka-s3 amazonka-sqs base blaze-builder
+ bytestring conduit lens mtl resourcet text
+ ];
+ homepage = "https://github.com/agrafix/aws-simple#readme";
+ description = "Dead simple bindings to commonly used AWS Services";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"aws-sns" = callPackage
({ mkDerivation, aeson, aws, aws-general, base, blaze-builder
, bytestring, conduit, containers, errors, http-conduit, http-types
@@ -28891,8 +29420,8 @@ self: {
}:
mkDerivation {
pname = "b9";
- version = "0.5.21";
- sha256 = "a7db049d73b0800399cef22fa016932cd5699d6faf9f6056a350eae1952f6cb4";
+ version = "0.5.30";
+ sha256 = "27e1437813bc55f173251c3e38f8de81fdc31ebb0f0ae59f10c954ce4cc4c071";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -29349,10 +29878,8 @@ self: {
}:
mkDerivation {
pname = "barrier";
- version = "0.1.0";
- sha256 = "9f7c56af995b47791ee0ffa69c27d3de0b895125dbd5fe0c84d8b621467f90ba";
- revision = "2";
- editedCabalFile = "bcb912e8105f792720b8515ddf9b37d6a1eecd17cb325cc40bd688641068e9e6";
+ version = "0.1.1";
+ sha256 = "6395da01eea1984c7bcc85c624b1b5dfbe0b6b764adeed7b04c9fa4d8de91ed9";
libraryHaskellDepends = [
base blaze-svg bytestring template-haskell text
unordered-containers
@@ -30053,14 +30580,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;
@@ -30313,8 +30844,8 @@ self: {
({ mkDerivation, attoparsec, base, bytestring, time }:
mkDerivation {
pname = "bgmax";
- version = "0.1.0.1";
- sha256 = "ba68978e53d15d069ac31064069d641a89bfee1d5133c05670848112076ce271";
+ version = "0.2.0.1";
+ sha256 = "2e8abcb38c557c256d871f5df7566d02e74741bec24d86d2a65c97d6c1dc3b40";
libraryHaskellDepends = [ attoparsec base bytestring time ];
homepage = "http://github.com/jonpetterbergman/bgmax";
description = "Parse BgMax-files";
@@ -30346,8 +30877,8 @@ self: {
}:
mkDerivation {
pname = "bibdb";
- version = "0.5.2";
- sha256 = "afe2b25a3544994f32c62975f7eddeec5a690562e7ed234b9fb851aef0f7bc80";
+ version = "0.5.3";
+ sha256 = "8dcac183199d1bbfc7cd835f6d965ea9fedcc7874c9db458c221cede246ead12";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -30427,6 +30958,8 @@ self: {
pname = "bifunctors";
version = "5.4.1";
sha256 = "3746f971f69ce31ced23d12e4785d96985f5c620ac7a26d5f4efead970c43b87";
+ revision = "1";
+ editedCabalFile = "64c592384987528035860a9b2b5d77995f16e9c7d138cf7310e1facd42e36505";
libraryHaskellDepends = [
base base-orphans comonad containers semigroups tagged
template-haskell transformers transformers-compat
@@ -31023,8 +31556,8 @@ self: {
}:
mkDerivation {
pname = "binary-tagged";
- version = "0.1.4.1";
- sha256 = "86ae562f528dd85e1d87f2e4c886be168e1b1dd78c42e22ae3e9bf36ff879acd";
+ version = "0.1.4.2";
+ sha256 = "311fab8c2bac00cb6785cb144e25ed58b2efce85e5dc64e30e2b5a2a16cdc784";
libraryHaskellDepends = [
aeson array base base16-bytestring binary bytestring containers
generics-sop hashable nats scientific semigroups SHA tagged text
@@ -32742,6 +33275,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "bitx-bitcoin_0_11_0_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, deepseq, directory
+ , doctest, exceptions, hspec, http-client, http-client-tls
+ , http-types, microlens, microlens-th, network, QuickCheck, safe
+ , scientific, split, text, time
+ }:
+ mkDerivation {
+ pname = "bitx-bitcoin";
+ version = "0.11.0.0";
+ sha256 = "9f46782f5a9688b7c1681789d7165c9a21247dc5fc67807cf847bf526414ce20";
+ libraryHaskellDepends = [
+ aeson base bytestring deepseq exceptions http-client
+ http-client-tls http-types microlens microlens-th network
+ QuickCheck scientific split text time
+ ];
+ testHaskellDepends = [
+ aeson base bytestring directory doctest hspec http-client
+ http-types microlens safe text time
+ ];
+ homepage = "https://github.com/tebello-thejane/bitx.hs";
+ description = "A Haskell library for working with the BitX bitcoin exchange";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"bk-tree" = callPackage
({ mkDerivation, base, containers }:
mkDerivation {
@@ -33083,8 +33641,8 @@ self: {
}:
mkDerivation {
pname = "blaze-html";
- version = "0.8.1.2";
- sha256 = "f7ee92b38112e939bf251530afb7385a1588a8a6c929f409492dfde7b67ef2b7";
+ version = "0.8.1.3";
+ sha256 = "8c16e717d353f981e0cd67b50f89ef6f94ab9c56662b3e58bd8a6c552433d637";
libraryHaskellDepends = [
base blaze-builder blaze-markup bytestring text
];
@@ -33174,8 +33732,8 @@ self: {
}:
mkDerivation {
pname = "blaze-markup";
- version = "0.7.1.0";
- sha256 = "62ce7977b68873eda328c4e8e3c2034102a49718d63631a6dc76abf479b7c6ba";
+ version = "0.7.1.1";
+ sha256 = "638da5984ecd5bcc87f5836786ff93352058a8856bea428d7ffd25bc26c54303";
libraryHaskellDepends = [ base blaze-builder bytestring text ];
testHaskellDepends = [
base blaze-builder bytestring containers HUnit QuickCheck
@@ -33418,18 +33976,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "bloodhound_0_11_1_0" = callPackage
+ "bloodhound_0_12_0_0" = callPackage
({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
- , data-default-class, derive, directory, doctest, doctest-prop
- , errors, exceptions, filepath, hashable, hspec, http-client
- , http-types, mtl, mtl-compat, network-uri, QuickCheck
- , quickcheck-properties, scientific, semigroups, text, time
- , transformers, unordered-containers, vector
+ , data-default-class, directory, doctest, errors, exceptions
+ , filepath, generics-sop, hashable, hspec, http-client, http-types
+ , mtl, mtl-compat, network-uri, QuickCheck, quickcheck-properties
+ , scientific, semigroups, temporary, text, time, transformers, unix
+ , unordered-containers, vector
}:
mkDerivation {
pname = "bloodhound";
- version = "0.11.1.0";
- sha256 = "ecaf8e6d1bcb197387f8f7862420a362f33f03cb86fd068b8b9a1e462813d557";
+ version = "0.12.0.0";
+ sha256 = "b3673675c75ee393281502ce45d0d9768c6a9165df9cebc23beb25539d7acbdc";
libraryHaskellDepends = [
aeson base blaze-builder bytestring containers data-default-class
exceptions hashable http-client http-types mtl mtl-compat
@@ -33437,10 +33995,10 @@ self: {
unordered-containers vector
];
testHaskellDepends = [
- aeson base bytestring containers derive directory doctest
- doctest-prop errors filepath hspec http-client http-types mtl
- QuickCheck quickcheck-properties semigroups text time
- unordered-containers vector
+ aeson base bytestring containers directory doctest errors
+ exceptions filepath generics-sop hspec http-client http-types mtl
+ network-uri QuickCheck quickcheck-properties semigroups temporary
+ text time unix unordered-containers vector
];
homepage = "https://github.com/bitemyapp/bloodhound";
description = "ElasticSearch client library for Haskell";
@@ -33533,6 +34091,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "blosum_0_1_1_4" = callPackage
+ ({ mkDerivation, base, containers, fasta, lens
+ , optparse-applicative, pipes, pipes-text, split, text, text-show
+ }:
+ mkDerivation {
+ pname = "blosum";
+ version = "0.1.1.4";
+ sha256 = "44b12d24d56bfadec7a53c1d620e1cc52f4126ba01ab541a135b187846c10380";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers fasta lens text text-show
+ ];
+ executableHaskellDepends = [
+ base containers fasta optparse-applicative pipes pipes-text split
+ text
+ ];
+ homepage = "http://github.com/GregorySchwartz/blosum#readme";
+ description = "BLOSUM generator";
+ license = stdenv.lib.licenses.gpl2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"bloxorz" = callPackage
({ mkDerivation, base, GLFW, OpenGL }:
mkDerivation {
@@ -33703,6 +34284,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "bolt" = callPackage
+ ({ mkDerivation, base, bifunctors, bytestring, cereal, containers
+ , hashable, network, network-uri, scientific, text, transformers
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "bolt";
+ version = "0.2.0.0";
+ sha256 = "2a066c5e24a707c7fb418b34c01b7dc0f47b084eb621baefa3a79afe03640e12";
+ libraryHaskellDepends = [
+ base bifunctors bytestring cereal containers hashable network
+ network-uri scientific text transformers unordered-containers
+ vector
+ ];
+ homepage = "https://github.com/bflyblue/bolt#readme";
+ description = "Bolt driver for Neo4j";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"bond" = callPackage
({ mkDerivation, aeson, aeson-pretty, async, base, bytestring
, cmdargs, derive, Diff, directory, filepath, HUnit, monad-loops
@@ -33711,8 +34311,8 @@ self: {
}:
mkDerivation {
pname = "bond";
- version = "0.6.0.0";
- sha256 = "1b6437cda224d2c1250ff83fa9af1c4e9b7890613a6de7b658672f9dc35cee0a";
+ version = "0.7.0.0";
+ sha256 = "b55acc5eb137f8dc9a85a7eedc8dc2f26c22d91b8593b856b155c6cd2597a7d3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -33742,8 +34342,8 @@ self: {
}:
mkDerivation {
pname = "bond-haskell";
- version = "0.1.4.1";
- sha256 = "914e2dd778f817536ad36708983a57517356b4d8c44368544c9ae5e73ef8e900";
+ version = "0.1.5.0";
+ sha256 = "db62f0b0913e92c1892cdbeeb67a0397e911eae67aa3de8255bc61d19fb18606";
libraryHaskellDepends = [
aeson array base binary bond-haskell-compiler bytestring containers
deepseq extra hashable mtl scientific text unordered-containers
@@ -33766,8 +34366,8 @@ self: {
}:
mkDerivation {
pname = "bond-haskell-compiler";
- version = "0.1.4.1";
- sha256 = "f48b794e2b9096a0f7335bc8ab6264a841fd35d369929105011d16e574684aac";
+ version = "0.1.5.0";
+ sha256 = "08fcc16b2990bb16ad43fa9cccb460f8299243ddc4a277395bc230021a5ebc13";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -33789,8 +34389,8 @@ self: {
}:
mkDerivation {
pname = "bookkeeper";
- version = "0.2.3";
- sha256 = "7aa2a2a42ed03eee2eccc96ed63cfa3b090f55dd432936dc801cd331b684f5b6";
+ version = "0.2.4";
+ sha256 = "0f75317b35b8c4984fd9e1c0f3a33179387648b1aad33efc7a00d0cc0b7e1f9f";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -33910,6 +34510,8 @@ self: {
pname = "boolsimplifier";
version = "0.1.8";
sha256 = "096fa9377241520ee114403fd53b51a7369187fb4dca65f19f85a727d689828f";
+ revision = "1";
+ editedCabalFile = "d05220c8f3aaeb0c5f6f92cd6c3d869b7f5253b66cdb6d5d392b9198ec061577";
libraryHaskellDepends = [ base containers ];
description = "Simplification tools for simple propositional formulas";
license = stdenv.lib.licenses.bsd3;
@@ -34126,17 +34728,17 @@ self: {
}) {};
"bower-json" = callPackage
- ({ mkDerivation, aeson, aeson-better-errors, base, bytestring, mtl
- , scientific, tasty, tasty-hunit, text, transformers
+ ({ mkDerivation, aeson, aeson-better-errors, base, bytestring
+ , deepseq, mtl, scientific, tasty, tasty-hunit, text, transformers
, unordered-containers, vector
}:
mkDerivation {
pname = "bower-json";
- version = "0.8.0";
- sha256 = "ee8efa507020dc3f7439849a3662d6bbc72dfec8c1ae8d158e75546138dff3cf";
+ version = "0.8.1";
+ sha256 = "3fb3cdecc55a0997a9d4d9c3443bcf39b7feed09feb8629fc89b48b1ca7b713f";
libraryHaskellDepends = [
- aeson aeson-better-errors base bytestring mtl scientific text
- transformers unordered-containers vector
+ aeson aeson-better-errors base bytestring deepseq mtl scientific
+ text transformers unordered-containers vector
];
testHaskellDepends = [
aeson base bytestring tasty tasty-hunit text unordered-containers
@@ -34332,8 +34934,8 @@ self: {
}:
mkDerivation {
pname = "brick";
- version = "0.13";
- sha256 = "5e5687cdb05065e564140d1970d737f8c8a73f57b321fb522cc7b32c96765ee7";
+ version = "0.15.2";
+ sha256 = "7407473d133588df46c43480a2b41a50a04a7f0e63a996c6422a07592b8ca85e";
libraryHaskellDepends = [
base containers contravariant data-default deepseq microlens
microlens-mtl microlens-th template-haskell text text-zipper
@@ -34342,6 +34944,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
@@ -34554,6 +35157,50 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "btrfs_0_1_2_2" = callPackage
+ ({ mkDerivation, base, bytestring, time, unix }:
+ mkDerivation {
+ pname = "btrfs";
+ version = "0.1.2.2";
+ sha256 = "0a362bd0aef9c11212c095a3da17279a5c1ac490eee49822a04138503212e7b5";
+ libraryHaskellDepends = [ base bytestring time unix ];
+ homepage = "https://github.com/redneb/hs-btrfs";
+ description = "Bindings to the btrfs API";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "buchhaltung" = callPackage
+ ({ mkDerivation, aeson, ansi-wl-pprint, array, async, base, boxes
+ , bytestring, Cabal, cassava, containers, data-default, Decimal
+ , deepseq, directory, edit-distance, file-embed, filepath
+ , formatting, hashable, haskeline, hint, hledger, hledger-lib, lens
+ , lifted-base, ListLike, megaparsec, MissingH, monad-control, mtl
+ , optparse-applicative, parsec, process, regex-compat, regex-tdfa
+ , regex-tdfa-text, safe, semigroups, split, strict, temporary, text
+ , time, transformers, unordered-containers, vector, yaml
+ }:
+ mkDerivation {
+ pname = "buchhaltung";
+ version = "0.0.1";
+ sha256 = "fd2dd47210a9d7200c0d4259646963b6bc848ff656255b66b14648b949dec70f";
+ isLibrary = false;
+ isExecutable = true;
+ setupHaskellDepends = [ base Cabal ];
+ executableHaskellDepends = [
+ aeson ansi-wl-pprint array async base boxes bytestring cassava
+ containers data-default Decimal deepseq directory edit-distance
+ file-embed filepath formatting hashable haskeline hint hledger
+ hledger-lib lens lifted-base ListLike megaparsec MissingH
+ monad-control mtl optparse-applicative parsec process regex-compat
+ regex-tdfa regex-tdfa-text safe semigroups split strict temporary
+ text time transformers unordered-containers vector yaml
+ ];
+ homepage = "http://johannesgerer.com/buchhaltung";
+ description = "Automates most of your plain text accounting data entry in ledger format";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"buffer-builder" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
, deepseq, HTF, mtl, quickcheck-instances, text
@@ -34561,8 +35208,8 @@ self: {
}:
mkDerivation {
pname = "buffer-builder";
- version = "0.2.4.3";
- sha256 = "8a3da08e222498a245405d77eed7da90a943e848396291e617ba0b6daf27ad6f";
+ version = "0.2.4.4";
+ sha256 = "01c0bafb776784a08c041abfc89c3eaee3236bf5555b98e9542676dc43db2dd8";
libraryHaskellDepends = [
base bytestring mtl text unordered-containers vector
];
@@ -35036,8 +35683,8 @@ self: {
({ mkDerivation, base, bytestring, cryptohash, QuickCheck }:
mkDerivation {
pname = "bytestring-arbitrary";
- version = "0.1.0";
- sha256 = "248378d6a7b75e8b9cbadcb3793ddcb17bd1ef7b36ffce02dc99ff11ef49c92b";
+ version = "0.1.1";
+ sha256 = "bbe78d37e9788ecf6fc4d64633047579b66e71ffcab70cbc8be100a722056efd";
libraryHaskellDepends = [ base bytestring cryptohash QuickCheck ];
testHaskellDepends = [ base bytestring cryptohash QuickCheck ];
homepage = "https://github.com/tsuraan/bytestring-arbitrary";
@@ -35142,8 +35789,8 @@ self: {
}:
mkDerivation {
pname = "bytestring-handle";
- version = "0.1.0.4";
- sha256 = "3083c6434a6ec552c6c29030f7b2c44b53dead5f05f4a8363e3c350552ffbe60";
+ version = "0.1.0.5";
+ sha256 = "a2c426f35ba32822e45bcc2e6d4945bbb2ee10b8540bb0965ab6f3304325bb83";
libraryHaskellDepends = [ base bytestring ];
testHaskellDepends = [
base bytestring HUnit QuickCheck test-framework
@@ -35286,6 +35933,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "bytestring-time" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, Cabal, hspec
+ , QuickCheck, text, time
+ }:
+ mkDerivation {
+ pname = "bytestring-time";
+ version = "0.1.0";
+ sha256 = "824afd4536f2062ffb16169b0989dc26890a83cd1515dff34e33b826608a7603";
+ libraryHaskellDepends = [ attoparsec base bytestring text time ];
+ testHaskellDepends = [
+ attoparsec base bytestring Cabal hspec QuickCheck text time
+ ];
+ homepage = "https://github.com/klangner/bytestring-time";
+ description = "Library for Time parsing from ByteString";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"bytestring-tree-builder" = callPackage
({ mkDerivation, base, base-prelude, bytestring
, quickcheck-instances, semigroups, tasty, tasty-hunit
@@ -35675,8 +36339,8 @@ self: {
}:
mkDerivation {
pname = "cabal-debian";
- version = "4.33";
- sha256 = "ae69fd45365f670b3d36274884b1a7d1b1ec0429f7775ee79d5d813d82e93193";
+ version = "4.35.6";
+ sha256 = "8ef80d1bc5b3085475c3486c900defb0aeae2ef5ff23bf6d41653d12a3e7e4de";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -35748,15 +36412,16 @@ self: {
}) {};
"cabal-file-th" = callPackage
- ({ mkDerivation, base, Cabal, directory, template-haskell }:
+ ({ mkDerivation, base, Cabal, directory, pretty, template-haskell
+ }:
mkDerivation {
pname = "cabal-file-th";
- version = "0.2.3";
- sha256 = "2866e1bea82f5873423411bec9dbded2e4cc878ad7d05108c1339b62cbda5c4d";
- revision = "1";
- editedCabalFile = "50bc6cf5a335a2608ab1e5e59b73f184d3f48d91f49fec189701416ff3e1e37e";
- libraryHaskellDepends = [ base Cabal directory template-haskell ];
- testHaskellDepends = [ base ];
+ version = "0.2.4";
+ sha256 = "0b55d7ffacd0c6324fa7c8b8f148e788e6b899fb9bf8795285dea66575bed91c";
+ libraryHaskellDepends = [
+ base Cabal directory pretty template-haskell
+ ];
+ testHaskellDepends = [ base Cabal ];
homepage = "http://github.com/nkpart/cabal-file-th";
description = "Template Haskell expressions for reading fields from a project's cabal file";
license = stdenv.lib.licenses.bsd3;
@@ -35872,10 +36537,8 @@ self: {
}:
mkDerivation {
pname = "cabal-install";
- version = "1.24.0.1";
- sha256 = "09f5fd8a2aa7f9565800a711a133f8142d36d59b38f59da09c25045b83ee9ecc";
- revision = "1";
- editedCabalFile = "bf42e042bf673561d1d6c2c82d5679e1d0972e6ba8ee2d76604fd188174fa797";
+ version = "1.24.0.2";
+ sha256 = "2ac8819238a0e57fff9c3c857e97b8705b1b5fef2e46cd2829e85d96e2a00fe0";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -36103,8 +36766,8 @@ self: {
}:
mkDerivation {
pname = "cabal-rpm";
- version = "0.10.0";
- sha256 = "b516bd0850bd1433bd5bba7e93d98c6fe22ea785aa0d640584208d9c22437112";
+ version = "0.10.1";
+ sha256 = "46aae9f3b5734ceb9c35d9a5dbe7603bd26235169f16a10035078de33140cde9";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -36364,8 +37027,8 @@ self: {
}:
mkDerivation {
pname = "cabal2nix";
- version = "2.0.3";
- sha256 = "d3e2f376bf255daab8ea476831c8f4948e774e7307b19dbceb15a7f0df882654";
+ version = "2.0.4";
+ sha256 = "b20b597df92787ba878073cd7cc855b3c0186f1781ac65056f261c420a1c7fe3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -36605,6 +37268,30 @@ self: {
homepage = "https://github.com/centromere/cacophony";
description = "A library implementing the Noise protocol";
license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "cacophony_0_9_0" = callPackage
+ ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring
+ , cryptonite, deepseq, directory, exceptions, free, hlint, lens
+ , memory, monad-coroutine, mtl, safe-exceptions, text, transformers
+ }:
+ mkDerivation {
+ pname = "cacophony";
+ version = "0.9.0";
+ sha256 = "7394383af54b84ff5efdb491cafa6ffc569266c522c7395ee099a45bbd0588cb";
+ libraryHaskellDepends = [
+ base bytestring cryptonite deepseq exceptions free lens memory
+ monad-coroutine mtl safe-exceptions transformers
+ ];
+ testHaskellDepends = [
+ aeson async base base16-bytestring bytestring directory free hlint
+ lens memory mtl text
+ ];
+ homepage = "https://github.com/centromere/cacophony";
+ description = "A library implementing the Noise protocol";
+ license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"caf" = callPackage
@@ -37335,6 +38022,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "carte" = callPackage
+ ({ mkDerivation, base, filepath, mtl, network, optparse-applicative
+ , random, semigroups, time, transformers, tuple
+ }:
+ mkDerivation {
+ pname = "carte";
+ version = "0.1.0.0";
+ sha256 = "3a6a40c11fa4544082a752630e381b89e9a16b305f967fcf0ff6eb8f358b5136";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base filepath mtl network optparse-applicative random semigroups
+ time transformers tuple
+ ];
+ homepage = "https://github.com/m1dnight/carte";
+ description = "Carte: A commandline pastebin server";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"cartel" = callPackage
({ mkDerivation, base, directory, filepath, multiarg
, optparse-applicative, pretty-show, process, QuickCheck, random
@@ -37390,13 +38097,13 @@ self: {
}:
mkDerivation {
pname = "casadi-bindings";
- version = "3.0.0.5";
- sha256 = "338690af83dd423a118f00fdf7dba3b6a4b49875f7e9e685bc2a68f5284853a9";
+ version = "3.1.0.2";
+ sha256 = "c137dece9554219a980a74f0aaa3d44c13f83b6312c8802f4766702250514a95";
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
@@ -37430,12 +38137,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;
@@ -37445,10 +38152,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;
@@ -37838,8 +38545,8 @@ self: {
}:
mkDerivation {
pname = "cassava";
- version = "0.4.5.0";
- sha256 = "7320a1c764efd3baae6944b31f7fdb438ae307876dce283a242e8f1deeb371c9";
+ version = "0.4.5.1";
+ sha256 = "7c622ae9dc647508662a1cda3fe3f6d7032786e4e3d15f8488de9e9330cf9d9f";
libraryHaskellDepends = [
array attoparsec base blaze-builder bytestring containers deepseq
hashable text unordered-containers vector
@@ -37872,19 +38579,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "cassava-conduit_0_3_4" = 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.4";
- sha256 = "cebd36d3b7cd575f2ccf38860d3f89ba0872cd196d25f5f5d1cefb579a111849";
+ version = "0.3.5.1";
+ sha256 = "45853e32dbac212d41d800c539c7d9184e05d0b7b48df458a7963138449a75d5";
libraryHaskellDepends = [
array base bifunctors bytestring cassava conduit conduit-extra
containers mtl text
];
- testHaskellDepends = [ base QuickCheck ];
+ testHaskellDepends = [
+ base bytestring cassava conduit conduit-extra QuickCheck text
+ ];
homepage = "https://github.com/domdere/cassava-conduit";
description = "Conduit interface for cassava package";
license = stdenv.lib.licenses.bsd3;
@@ -38132,8 +38841,8 @@ self: {
}:
mkDerivation {
pname = "cayley-client";
- version = "0.2.1.0";
- sha256 = "670264faf8ac3366ffe40d22fae24fde437d60fffbff6f1753a92aef798a1c19";
+ version = "0.2.1.1";
+ sha256 = "04547226bf0e504d41527de6e2d81ba66d6c59d4460e2ce37f34a6d9aca747cf";
libraryHaskellDepends = [
aeson attoparsec base binary bytestring exceptions http-client
http-conduit lens lens-aeson mtl text transformers
@@ -38339,8 +39048,8 @@ self: {
}:
mkDerivation {
pname = "cereal";
- version = "0.5.3.0";
- sha256 = "c316e07cde7559684b71d345890e8f16eb5f6cc1cdd29f96e8c4296bcf8a8af4";
+ version = "0.5.4.0";
+ sha256 = "daca6c5aeff21ca233bebe006c158b0e4421b239c722768b568fca9b32cafee7";
libraryHaskellDepends = [
array base bytestring containers ghc-prim
];
@@ -38639,8 +39348,8 @@ self: {
}:
mkDerivation {
pname = "cgi";
- version = "3001.3.0.1";
- sha256 = "96859110c72904089d8b3ac5fe493ac6f47aeafd1b30ffd1efce649442cc4752";
+ version = "3001.3.0.2";
+ sha256 = "92111387216c4941271a833a1214d61ad21aaf3337ae48ea6d99d4a035bd77c1";
libraryHaskellDepends = [
base bytestring containers exceptions mtl multipart network
network-uri parsec time xhtml
@@ -39395,8 +40104,10 @@ self: {
}:
mkDerivation {
pname = "chronos";
- version = "0.2.0";
- sha256 = "229742c16772aa4befe5b37c4f6862b128ef51fbdcef07ac856f3349d4b7dd70";
+ version = "0.3";
+ sha256 = "97e9bcdb2a65bb5034d2d6af2e0ac23dd91e797d7d4b914bad0110e9740486b5";
+ revision = "1";
+ editedCabalFile = "61e89d96d116d28efa59ca1583ce5e1a9dd6bbc8a644000f182233aa5fb480a0";
libraryHaskellDepends = [
aeson attoparsec base bytestring hashable primitive text vector
];
@@ -39405,7 +40116,7 @@ self: {
test-framework-hunit test-framework-quickcheck2 text
];
homepage = "https://github.com/andrewthad/chronos#readme";
- description = "A time library, encoding, decoding, and instances";
+ description = "A performant time library";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -39504,6 +40215,30 @@ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"cil" = callPackage
({ mkDerivation, base, bytestring, language-c }:
mkDerivation {
@@ -39957,8 +40692,8 @@ self: {
}:
mkDerivation {
pname = "clang-pure";
- version = "0.2.0.1";
- sha256 = "27c81214e72d9a4c6e701fc05d2adc5cb0732cc07c4fb715a6bf2f9d904058ee";
+ version = "0.2.0.2";
+ sha256 = "fad48f3ba3fad6a99d73923a6034a3d2a6610812404b39c05e6dc3dd20e0604c";
libraryHaskellDepends = [
base bytestring containers contravariant inline-c microlens
microlens-contra singletons stm template-haskell vector
@@ -40201,22 +40936,23 @@ self: {
, 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
- , semigroups, stm, text, time, time-locale-compat, transformers
- , transformers-base, unordered-containers, vector, vector-instances
+ , 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.0.2";
- sha256 = "a4fa52c6b571df5cc98c1cebf97b41085104a17b2e23c2221cd2061ec7a9c262";
+ version = "1.0.2";
+ sha256 = "4e5facf997758af2f15387349f373997abeee3edf3a3953e412490d4a9f5a467";
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 semigroups stm text time time-locale-compat
- transformers transformers-base unordered-containers vector
- vector-instances
+ 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
@@ -40234,8 +40970,8 @@ self: {
}:
mkDerivation {
pname = "classy-prelude-conduit";
- version = "1.0.0";
- sha256 = "248b3a30c6da08400039b5a9485039319e059c52927edf2a1dbcd6a9089da22e";
+ version = "1.0.2";
+ sha256 = "ab8f17db80cf1058013e00a16078275681faa93f91894263cf6a608c03843f19";
libraryHaskellDepends = [
base bytestring classy-prelude conduit conduit-combinators
monad-control resourcet transformers void
@@ -40256,8 +40992,8 @@ self: {
}:
mkDerivation {
pname = "classy-prelude-yesod";
- version = "1.0.0";
- sha256 = "12ac3f4b72302cf18a7ebd5a836eb8cfe22729cbcd1f0a723db047c2b80a9ce2";
+ version = "1.0.2";
+ sha256 = "3183921a292159e8deb0ed63130defa239510beb1692f505438edebd2ca19406";
libraryHaskellDepends = [
aeson base classy-prelude classy-prelude-conduit data-default
http-conduit http-types persistent yesod yesod-newsfeed
@@ -40269,6 +41005,37 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "classy-prelude-yesod_1_1_0" = 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.1.0";
+ sha256 = "2b7672093e16850dba4c118c56d8626d8049e3c29b163c8389619bfc265f5b58";
+ 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 {
+ pname = "classyplate";
+ version = "0.3.0.0";
+ sha256 = "a422c975aa2e1fd56ad44261f45023d555a777a81bee672de547c7b7ff7c4bc6";
+ libraryHaskellDepends = [ base template-haskell type-list ];
+ description = "Fuseable type-class based generics";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"clay" = callPackage
({ mkDerivation, base, hspec, hspec-expectations, mtl, text }:
mkDerivation {
@@ -40330,6 +41097,40 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) openssl;};
+ "clckwrks_0_24_0" = callPackage
+ ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base
+ , blaze-html, bytestring, cereal, containers, directory, filepath
+ , happstack-authenticate, happstack-hsp, happstack-jmacro
+ , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs
+ , ixset, jmacro, lens, mtl, network, network-uri, old-locale
+ , openssl, process, random, reform, reform-happstack, reform-hsp
+ , safecopy, stm, text, time, time-locale-compat
+ , unordered-containers, userid, utf8-string, uuid-orphans
+ , uuid-types, vector, web-plugins, web-routes, web-routes-happstack
+ , web-routes-hsp, web-routes-th, xss-sanitize
+ }:
+ mkDerivation {
+ pname = "clckwrks";
+ version = "0.24.0";
+ sha256 = "aae3a0d63da228eb0876505ec574f90955d5f2c3512003b57371d988b94a2e5c";
+ libraryHaskellDepends = [
+ acid-state aeson aeson-qq attoparsec base blaze-html bytestring
+ cereal containers directory filepath happstack-authenticate
+ happstack-hsp happstack-jmacro happstack-server
+ happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl
+ network network-uri old-locale process random reform
+ reform-happstack reform-hsp safecopy stm text time
+ time-locale-compat unordered-containers userid utf8-string
+ uuid-orphans uuid-types vector web-plugins web-routes
+ web-routes-happstack web-routes-hsp web-routes-th xss-sanitize
+ ];
+ librarySystemDepends = [ openssl ];
+ homepage = "http://www.clckwrks.com/";
+ description = "A secure, reliable content management system (CMS) and blogging platform";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) openssl;};
+
"clckwrks-cli" = callPackage
({ mkDerivation, acid-state, base, clckwrks, haskeline, mtl
, network, parsec
@@ -40349,6 +41150,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "clckwrks-cli_0_2_17_1" = callPackage
+ ({ mkDerivation, acid-state, base, clckwrks, haskeline, mtl
+ , network, parsec
+ }:
+ mkDerivation {
+ pname = "clckwrks-cli";
+ version = "0.2.17.1";
+ sha256 = "d3f5546425c363b8d25d9d5060839431176829c017994709fc0060868ced25ea";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ acid-state base clckwrks haskeline mtl network parsec
+ ];
+ homepage = "http://www.clckwrks.com/";
+ description = "a command-line interface for adminstrating some aspects of clckwrks";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"clckwrks-dot-com" = callPackage
({ mkDerivation, base, clckwrks, clckwrks-plugin-media
, clckwrks-plugin-page, clckwrks-theme-clckwrks, containers
@@ -40446,6 +41266,30 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "clckwrks-plugin-media_0_6_16_1" = callPackage
+ ({ mkDerivation, acid-state, attoparsec, base, blaze-html, cereal
+ , clckwrks, containers, directory, filepath, gd, happstack-server
+ , hsp, hsx2hs, ixset, magic, mtl, reform, reform-happstack
+ , reform-hsp, safecopy, text, web-plugins, web-routes
+ , web-routes-th
+ }:
+ mkDerivation {
+ pname = "clckwrks-plugin-media";
+ version = "0.6.16.1";
+ sha256 = "acd1df19bf6b98d18202c925f7cf6800d378c190d36e5a88422dda3e19eaf079";
+ libraryHaskellDepends = [
+ acid-state attoparsec base blaze-html cereal clckwrks containers
+ directory filepath gd happstack-server hsp ixset magic mtl reform
+ reform-happstack reform-hsp safecopy text web-plugins web-routes
+ web-routes-th
+ ];
+ libraryToolDepends = [ hsx2hs ];
+ homepage = "http://clckwrks.com/";
+ description = "media plugin for clckwrks";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"clckwrks-plugin-page" = callPackage
({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
, containers, directory, filepath, happstack-hsp, happstack-server
@@ -40472,6 +41316,32 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "clckwrks-plugin-page_0_4_3_7" = callPackage
+ ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
+ , containers, directory, filepath, happstack-hsp, happstack-server
+ , hsp, hsx2hs, ixset, mtl, old-locale, random, reform
+ , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell
+ , text, time, time-locale-compat, uuid, uuid-orphans, web-plugins
+ , web-routes, web-routes-happstack, web-routes-th
+ }:
+ mkDerivation {
+ pname = "clckwrks-plugin-page";
+ version = "0.4.3.7";
+ sha256 = "4f621eea6793307fb025ac9738f273c61c0e643f604bd2489b2bdf6fc06639d7";
+ libraryHaskellDepends = [
+ acid-state aeson attoparsec base clckwrks containers directory
+ filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl
+ old-locale random reform reform-happstack reform-hsp safecopy
+ tagsoup template-haskell text time time-locale-compat uuid
+ uuid-orphans web-plugins web-routes web-routes-happstack
+ web-routes-th
+ ];
+ homepage = "http://www.clckwrks.com/";
+ description = "support for CMS/Blogging in clckwrks";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"clckwrks-theme-bootstrap" = callPackage
({ mkDerivation, base, clckwrks, happstack-authenticate, hsp
, hsx-jmacro, hsx2hs, jmacro, mtl, text, web-plugins
@@ -40490,6 +41360,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "clckwrks-theme-bootstrap_0_4_2_1" = callPackage
+ ({ mkDerivation, base, clckwrks, happstack-authenticate, hsp
+ , hsx-jmacro, hsx2hs, jmacro, mtl, text, web-plugins
+ }:
+ mkDerivation {
+ pname = "clckwrks-theme-bootstrap";
+ version = "0.4.2.1";
+ sha256 = "44c1fda59c72b807c4abe63d19c98de1b0523d78dd3392bb68064dd3f18878d6";
+ libraryHaskellDepends = [
+ base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro
+ mtl text web-plugins
+ ];
+ homepage = "http://www.clckwrks.com/";
+ description = "simple bootstrap based template for clckwrks";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"clckwrks-theme-clckwrks" = callPackage
({ mkDerivation, base, clckwrks, containers, happstack-authenticate
, hsp, hsx2hs, mtl, text, web-plugins
@@ -40619,6 +41507,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "cli-builder" = callPackage
+ ({ mkDerivation, base, doctest, either, exceptions, filemanip
+ , hspec, optparse-applicative, QuickCheck, transformers
+ }:
+ mkDerivation {
+ pname = "cli-builder";
+ version = "0.1.0";
+ sha256 = "0a72dbaa461d913c4cb8e0315d00148e9106da9558281bf803b3fbad33ad24e5";
+ libraryHaskellDepends = [
+ base either exceptions optparse-applicative transformers
+ ];
+ testHaskellDepends = [ base doctest filemanip hspec QuickCheck ];
+ homepage = "https://github.com/uecmma/haskell-library-collections/tree/master/cli-builder";
+ description = "Simple project template from stack";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"click-clack" = callPackage
({ mkDerivation, base, containers, GLFW, Hipmunk, MonadRandom, mtl
, OpenGL, random, StateVar, transformers
@@ -40759,6 +41664,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "clit" = callPackage
+ ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
+ , http-client, http-client-tls, http-types, optparse-applicative
+ , split
+ }:
+ mkDerivation {
+ pname = "clit";
+ version = "0.1.1.1";
+ sha256 = "bb2be5226f6659b709b87ebe593c7c1a2b9447d2b681dc9c97130254ba4e4a61";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson authenticate-oauth base bytestring http-client
+ http-client-tls http-types optparse-applicative split
+ ];
+ executableHaskellDepends = [ base ];
+ homepage = "https://github.com/vmchale/command-line-tweeter#readme";
+ description = "Post tweets from stdin";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"cloben" = callPackage
({ mkDerivation, base, foldl, process, system-filepath, temporary
, text, turtle
@@ -41014,6 +41940,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "clustering_0_3_1" = callPackage
+ ({ mkDerivation, base, binary, containers, hierarchical-clustering
+ , matrices, mwc-random, parallel, primitive, Rlang-QQ, split, tasty
+ , tasty-hunit, tasty-quickcheck, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "clustering";
+ version = "0.3.1";
+ sha256 = "bc69248083d4c7f7ed32b1f0971d18a52414fd0ee8bc1f05fea8e4538fe87f86";
+ libraryHaskellDepends = [
+ base binary containers matrices mwc-random parallel primitive
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ base binary hierarchical-clustering matrices mwc-random Rlang-QQ
+ split tasty tasty-hunit tasty-quickcheck vector
+ ];
+ description = "High performance clustering algorithms";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"clustertools" = callPackage
({ mkDerivation, base, bio, bytestring, containers, QuickCheck
, regex-compat, simpleargs
@@ -41071,11 +42019,11 @@ self: {
({ mkDerivation, base, bytestring, HUnit, text }:
mkDerivation {
pname = "cmark";
- version = "0.5.3.1";
- sha256 = "4ae12da7e712d10a662a8323e7bc513daa1abf3ad4d055054b5f19b1122ca124";
+ version = "0.5.4";
+ sha256 = "06f62f52870103be29c92eabfed84be96b4b38a12c3c0b96dffe61b3a0dfa807";
libraryHaskellDepends = [ base bytestring text ];
testHaskellDepends = [ base HUnit text ];
- homepage = "https://github.com/jgm/commonmark-hs";
+ homepage = "https://github.com/jgm/cmark-hs";
description = "Fast, accurate CommonMark (Markdown) parser and renderer";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -41113,8 +42061,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
];
@@ -41355,8 +42303,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "code-page";
- version = "0.1";
- sha256 = "543968422a3bbccdeddb1fe7258ef28ed7fb87c839da817c4d7935a9a2f20653";
+ version = "0.1.1";
+ sha256 = "16b8b802bca21b71dd782560978b7ac88866c129df83b760e9059a7da04d70f7";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
homepage = "https://github.com/RyanGlScott/code-page";
@@ -41580,8 +42528,8 @@ self: {
}:
mkDerivation {
pname = "coin";
- version = "1.1.1";
- sha256 = "e020b0b4f31586832db5e56e0d757d60546071d2ca7bfef1f451d154f02486a2";
+ version = "1.2";
+ sha256 = "d046c554fbb2111641744507625518b8a3b012fcbe8c7a88e3ce971291f47907";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -41776,6 +42724,8 @@ self: {
pname = "collections-api";
version = "1.0.0.0";
sha256 = "b4dc47ec1552b66e69a465e9f974c8afab914b6a85f8214398969b1daf0efc6d";
+ revision = "2";
+ editedCabalFile = "b497904367aafbe7949dfa846aa34eec27b9ee99bc61ee2f665d48fdf83e7d1c";
libraryHaskellDepends = [ array base QuickCheck ];
homepage = "http://code.haskell.org/collections/";
description = "API for collection data structures";
@@ -41896,15 +42846,18 @@ self: {
}) {};
"colour-space" = callPackage
- ({ mkDerivation, base, colour, JuicyPixels, manifolds, semigroups
- , vector-space
+ ({ mkDerivation, base, colour, constrained-categories, JuicyPixels
+ , linear, linearmap-category, manifolds, semigroups, vector-space
}:
mkDerivation {
pname = "colour-space";
- version = "0.1.0.0";
- sha256 = "4b26cee762f9e673f3e461c25622942e80b7676950f768ce607f90ebc6ae6b48";
+ version = "0.1.2.0";
+ sha256 = "963b04b703a2d5f273ffc43b3687e6d58afed144eef47d4070b0bdec6f3bd3e5";
+ revision = "1";
+ editedCabalFile = "54a4d19227a0e550ad5c89295596d5c8b3b3d8d9ffd0b1f937ca48198ce6e7ad";
libraryHaskellDepends = [
- base colour JuicyPixels manifolds semigroups vector-space
+ base colour constrained-categories JuicyPixels linear
+ linearmap-category manifolds semigroups vector-space
];
homepage = "https://github.com/leftaroundabout/colour-space";
description = "Instances of the manifold-classes for colour types";
@@ -42586,8 +43539,8 @@ self: {
({ mkDerivation, base, doctest, QuickCheck }:
mkDerivation {
pname = "composition-tree";
- version = "0.2.0.2";
- sha256 = "67d26787ad5e35d1840b5e1bd325bb12815bd151faa0f6e13aaeb55e63af9bd6";
+ version = "0.2.0.3";
+ sha256 = "40243191eb557a9a5d7a6986dee5aa56968a3f36901a2ca6035310cfc4b255cc";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest QuickCheck ];
homepage = "https://github.com/liamoc/composition-tree";
@@ -42812,6 +43765,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "concrete-haskell" = callPackage
+ ({ mkDerivation, base, bytestring, containers, hashable, QuickCheck
+ , text, thrift, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "concrete-haskell";
+ version = "0.1.0.4";
+ sha256 = "6fbe447023cb0b5f7b3753e354af34c8a35f1497b5829a907728e336de64eb2b";
+ libraryHaskellDepends = [
+ base bytestring containers hashable QuickCheck text thrift
+ unordered-containers vector
+ ];
+ homepage = "https://github.com/hltcoe";
+ description = "Library for the Concrete data format";
+ license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"concrete-relaxng-parser" = callPackage
({ mkDerivation, base, cmdargs, containers, hxt, hxt-charproperties
, hxt-curl, hxt-relaxng, hxt-tagsoup
@@ -42958,6 +43929,23 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "concurrent-output_1_7_8" = callPackage
+ ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
+ , process, stm, terminal-size, text, transformers, unix
+ }:
+ mkDerivation {
+ pname = "concurrent-output";
+ version = "1.7.8";
+ sha256 = "8c9b0ab30ff9ea930039efcd9cc3d8541f0647c617afc17370de9de793ca9a6f";
+ libraryHaskellDepends = [
+ ansi-terminal async base directory exceptions process stm
+ terminal-size text transformers unix
+ ];
+ description = "Ungarble output from several threads or commands";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"concurrent-rpc" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -43252,8 +44240,8 @@ self: {
}:
mkDerivation {
pname = "conduit-combinators";
- version = "1.0.8.1";
- sha256 = "cf347790f173dce64ebf7ef1b364686fee2d890bfa38caa9145494a5909a7637";
+ version = "1.0.8.3";
+ sha256 = "3b81e379c4dcb1cb6212bcbad1d0714e46f400ebf9ae2abe23621db500406dbe";
libraryHaskellDepends = [
base base16-bytestring base64-bytestring bytestring chunked-data
conduit conduit-extra filepath monad-control mono-traversable
@@ -43300,8 +44288,8 @@ self: {
}:
mkDerivation {
pname = "conduit-extra";
- version = "1.1.13.3";
- sha256 = "c2efc890925ca9adcff7006b6155804b4a3712940f70b3e3be8b1e9be7c56c48";
+ version = "1.1.15";
+ sha256 = "7bef29eb0db59c236519b0c5cac82183ed7741a535a57e0772aac1158e90bb8d";
libraryHaskellDepends = [
async attoparsec base blaze-builder bytestring conduit directory
exceptions filepath monad-control network primitive process
@@ -43309,7 +44297,7 @@ self: {
];
testHaskellDepends = [
async attoparsec base blaze-builder bytestring bytestring-builder
- conduit exceptions hspec process QuickCheck resourcet stm
+ conduit directory exceptions hspec process QuickCheck resourcet stm
streaming-commons text transformers transformers-base
];
homepage = "http://github.com/snoyberg/conduit";
@@ -43476,6 +44464,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "conf-json" = callPackage
+ ({ mkDerivation, aeson, base, binary, bytestring, directory, hspec
+ , QuickCheck
+ }:
+ mkDerivation {
+ pname = "conf-json";
+ version = "1.1";
+ sha256 = "3d870c1fade614cac69169404ea6b1d6318a8026e121a14937a0e8e74ca1fe49";
+ revision = "6";
+ editedCabalFile = "8e300dbe34fc4677039940c6d91fb746a086097b276356b43019fecf24fadbb7";
+ libraryHaskellDepends = [ aeson base bytestring directory ];
+ testHaskellDepends = [
+ aeson base binary bytestring directory hspec QuickCheck
+ ];
+ homepage = "https://github.com/ciez/conf-json";
+ description = "read, parse json config";
+ license = stdenv.lib.licenses.publicDomain;
+ }) {};
+
"conffmt" = callPackage
({ mkDerivation, base, language-conf, megaparsec
, optparse-applicative, pretty, text
@@ -43495,6 +44502,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "config-ini" = callPackage
+ ({ mkDerivation, base, directory, doctest, ini, megaparsec
+ , microlens, QuickCheck, text, transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "config-ini";
+ version = "0.1.2.0";
+ sha256 = "d3a2b77545fba315db644ce177248e59f918cf4b6e17123c04d66e8bb3c7ee15";
+ libraryHaskellDepends = [
+ base megaparsec text transformers unordered-containers
+ ];
+ testHaskellDepends = [
+ base directory doctest ini microlens QuickCheck text
+ unordered-containers
+ ];
+ homepage = "https://github.com/aisamanra/config-ini";
+ description = "A library for simple INI-based configuration files";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"config-manager" = callPackage
({ mkDerivation, base, directory, filepath, HUnit, parsec
, temporary, test-framework, test-framework-hunit, text, time
@@ -43831,17 +44859,29 @@ 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;
}) {};
+ "console-style" = callPackage
+ ({ mkDerivation, base, mtl, transformers }:
+ mkDerivation {
+ pname = "console-style";
+ version = "0.0.2.1";
+ sha256 = "6d818ea841d7acfe6c42cc3fc7751e324656abfd0509ce470bc8bdbf52d1bd7f";
+ libraryHaskellDepends = [ base mtl transformers ];
+ homepage = "https://github.com/minad/console-style#readme";
+ description = "Styled console text output using ANSI escape sequences";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"const-math-ghc-plugin" = callPackage
({ mkDerivation, base, containers, directory, ghc, process }:
mkDerivation {
@@ -44078,15 +45118,15 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "containers_0_5_8_1" = callPackage
+ "containers_0_5_9_1" = callPackage
({ mkDerivation, array, base, ChasingBottoms, deepseq, ghc-prim
, HUnit, QuickCheck, test-framework, test-framework-hunit
, test-framework-quickcheck2, transformers
}:
mkDerivation {
pname = "containers";
- version = "0.5.8.1";
- sha256 = "f7e65874f5592c7fd7c24aaca67d8ccf87887e5a69ea8e97890c40c3bb07f142";
+ version = "0.5.9.1";
+ sha256 = "132d2ab0d56a631fc883bc843c5661380135e19992f724897d24cf6ead450a23";
libraryHaskellDepends = [ array base deepseq ghc-prim ];
testHaskellDepends = [
array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck
@@ -44590,27 +45630,28 @@ self: {
}) {};
"convert-annotation" = callPackage
- ({ mkDerivation, aeson, base, bytestring, cassava, containers, HTTP
- , lens, lens-aeson, optparse-generic, pipes, pipes-bytestring
- , pipes-csv, safe, text, wreq
+ ({ mkDerivation, aeson, base, bytestring, cassava, containers
+ , deepseq, HTTP, inline-r, lens, lens-aeson, optparse-generic
+ , pipes, pipes-bytestring, pipes-csv, safe, text, vector, wreq
}:
mkDerivation {
pname = "convert-annotation";
- version = "0.2.0.1";
- sha256 = "93db09c63eed3c744673d89e20560c028f6e424396933d9a67fb49f78a764449";
+ version = "0.5.0.0";
+ sha256 = "946e3b0961a64fe7c3a8ffe28c8f87675a4f37000f3a4a7431f9b9c1af7dca67";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base bytestring containers HTTP lens lens-aeson safe text
- wreq
+ aeson base bytestring containers deepseq HTTP inline-r lens
+ lens-aeson safe text wreq
];
executableHaskellDepends = [
- base bytestring cassava lens optparse-generic pipes
- pipes-bytestring pipes-csv text
+ base bytestring cassava inline-r lens optparse-generic pipes
+ pipes-bytestring pipes-csv text vector
];
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
@@ -45133,15 +46174,15 @@ self: {
}) {};
"countable-inflections" = callPackage
- ({ mkDerivation, base, bytestring, exceptions, hspec, pcre-light
- , QuickCheck, text
+ ({ mkDerivation, base, bytestring, exceptions, hspec, pcre-utils
+ , QuickCheck, regex-pcre-builtin, text
}:
mkDerivation {
pname = "countable-inflections";
- version = "0.1.0";
- sha256 = "24bb1f350cfbab09c8de1ededab28f138038d04c86e3614d8dc8514f8c8f1db9";
+ version = "0.2.0";
+ sha256 = "1ee92bece3c2bbf153dac013ee854fe8132702ee74cb61c07e7999ca1e35496d";
libraryHaskellDepends = [
- base bytestring exceptions pcre-light text
+ base bytestring exceptions pcre-utils regex-pcre-builtin text
];
testHaskellDepends = [ base hspec QuickCheck text ];
homepage = "https://github.com/tippenein/countable-inflections";
@@ -45761,8 +46802,8 @@ self: {
}:
mkDerivation {
pname = "crawlchain";
- version = "0.1.0.9";
- sha256 = "12bd2f1f2f9dbe5abb67a77a85db087669917381f2ddcc2b28fb5d3aa1248238";
+ version = "0.1.1.4";
+ sha256 = "0754ba3c874648e6c6e84c17d2d729cc3427f3cad2f1d0f37fbbcb4841020917";
libraryHaskellDepends = [
base bytestring directory HTTP network-uri split tagsoup time
];
@@ -46051,6 +47092,36 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "criterion_1_1_4_0" = callPackage
+ ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring
+ , cassava, code-page, containers, deepseq, directory, filepath
+ , Glob, hastache, HUnit, js-flot, js-jquery, mtl, mwc-random
+ , optparse-applicative, parsec, QuickCheck, statistics, tasty
+ , tasty-hunit, tasty-quickcheck, text, time, transformers
+ , transformers-compat, vector, vector-algorithms
+ }:
+ mkDerivation {
+ 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
+ js-jquery mtl mwc-random optparse-applicative parsec statistics
+ text time transformers transformers-compat vector vector-algorithms
+ ];
+ testHaskellDepends = [
+ aeson base bytestring HUnit QuickCheck statistics tasty tasty-hunit
+ tasty-quickcheck vector
+ ];
+ homepage = "http://www.serpentine.com/criterion";
+ description = "Robust, reliable performance measurement and analysis";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"criterion-plus" = callPackage
({ mkDerivation, base, criterion, deepseq, HTF, HUnit, loch-th
, monad-control, mtl, optparse-applicative, placeholders
@@ -46131,19 +47202,21 @@ self: {
}) {};
"cron" = callPackage
- ({ mkDerivation, attoparsec, base, derive, mtl, mtl-compat
+ ({ mkDerivation, attoparsec, base, generics-sop, mtl, mtl-compat
, old-locale, quickcheck-instances, semigroups, tasty, tasty-hunit
, tasty-quickcheck, text, time, transformers-compat
}:
mkDerivation {
pname = "cron";
- version = "0.4.1.2";
- sha256 = "554c0b971306e55815cce41e2b1c6cc14aaecd7728795310d13b114e5260daa5";
+ version = "0.4.2";
+ sha256 = "31f186b9237c802260a7c1468e9b81006c086df1d6ad3d0d6ef51d9d2e8d07d3";
+ revision = "1";
+ editedCabalFile = "5f6737e07b84d324ea03dc18096622a49b649c5eb372ef64e504695d442b0bde";
libraryHaskellDepends = [
attoparsec base mtl mtl-compat old-locale semigroups text time
];
testHaskellDepends = [
- attoparsec base derive quickcheck-instances semigroups tasty
+ attoparsec base generics-sop quickcheck-instances semigroups tasty
tasty-hunit tasty-quickcheck text time transformers-compat
];
homepage = "http://github.com/michaelxavier/cron";
@@ -46504,6 +47577,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "crypto-rng" = callPackage
+ ({ mkDerivation, base, bytestring, crypto-api, DRBG, exceptions
+ , monad-control, mtl, transformers-base
+ }:
+ mkDerivation {
+ pname = "crypto-rng";
+ version = "0.1.0.0";
+ sha256 = "cde72050adb3c430de86c9c830d9fe9255ab857285c35adc20bded58f3df12cc";
+ libraryHaskellDepends = [
+ base bytestring crypto-api DRBG exceptions monad-control mtl
+ transformers-base
+ ];
+ homepage = "https://github.com/scrive/crypto-rng";
+ description = "Cryptographic random number generator";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"crypto-simple" = callPackage
({ mkDerivation, base, bytestring, cryptonite, hspec, QuickCheck }:
mkDerivation {
@@ -46729,15 +47819,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "cryptonite_0_20" = callPackage
+ "cryptonite_0_21" = callPackage
({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim
, integer-gmp, memory, tasty, tasty-hunit, tasty-kat
, tasty-quickcheck
}:
mkDerivation {
pname = "cryptonite";
- version = "0.20";
- sha256 = "261bfac4e032f24658a31d8c34abd0c0f64f9de07be69ad43a9139a7c0b5c354";
+ version = "0.21";
+ sha256 = "639a66aee1c3fa64161b1886d319612b8ce92f751adde476fdc35aea730262ee";
libraryHaskellDepends = [
base bytestring deepseq ghc-prim integer-gmp memory
];
@@ -46774,9 +47864,9 @@ self: {
}:
mkDerivation {
pname = "cryptonite-openssl";
- version = "0.2";
- sha256 = "bbf6787c33edb287359fc48802512ab2d5c95b02bd6c1a759d7f9bc157703fcb";
- libraryHaskellDepends = [ base bytestring memory ];
+ version = "0.3";
+ sha256 = "43c8f8b4259f103be4408734f604c55a0053e60d302890174ba4773828bdee26";
+ libraryHaskellDepends = [ base bytestring cryptonite memory ];
librarySystemDepends = [ openssl ];
testHaskellDepends = [
base bytestring cryptonite tasty tasty-hunit tasty-kat
@@ -46839,8 +47929,8 @@ self: {
}:
mkDerivation {
pname = "csound-catalog";
- version = "0.5.0";
- sha256 = "6eacf0967f30ae543f25e3a0982f015c10d7241dba680b5d889bfe5a4ad6d29e";
+ version = "0.6.1";
+ sha256 = "aa97c5076d7d1d217ea62027b7529b8acfb6539001aafa50da3064fb4afbf1c1";
libraryHaskellDepends = [
base csound-expression csound-sampler sharc-timbre transformers
];
@@ -46858,8 +47948,8 @@ self: {
}:
mkDerivation {
pname = "csound-expression";
- version = "5.0.1";
- sha256 = "ed771c3351358b67b25aecfaebdacdf38c5dffe2dddf306dc93466fd440c3978";
+ version = "5.1.0";
+ sha256 = "3d42e34bb20823342974362c08f6bc386656922119020b34dbf92c39e72c8885";
libraryHaskellDepends = [
base Boolean colour containers csound-expression-dynamic
csound-expression-opcodes csound-expression-typed data-default
@@ -46876,8 +47966,8 @@ self: {
}:
mkDerivation {
pname = "csound-expression-dynamic";
- version = "0.1.6";
- sha256 = "846b3c456ba92f538b101a682fe796e91352c680070344f6296db99b740a64a2";
+ version = "0.2.0";
+ sha256 = "901b7811a296ab59b2baecf161e69c478da2f4b9a1f8d24d5e0c7063704df475";
libraryHaskellDepends = [
array base Boolean containers data-default data-fix data-fix-cse
hashable transformers wl-pprint
@@ -46909,8 +47999,8 @@ self: {
}:
mkDerivation {
pname = "csound-expression-typed";
- version = "0.0.9.3";
- sha256 = "b63d2a0634f789a851b897755db0d0596c48ba4348bd224c60d450e7c8803a06";
+ version = "0.1.0.0";
+ sha256 = "ecff32336825df2197502e7b464c00b3fd1dc40eaab52f40cd9a585c4180e866";
libraryHaskellDepends = [
base Boolean colour containers csound-expression-dynamic
data-default deepseq ghc-prim hashable temporal-media transformers
@@ -46925,8 +48015,8 @@ self: {
({ mkDerivation, base, csound-expression, transformers }:
mkDerivation {
pname = "csound-sampler";
- version = "0.0.6.5";
- sha256 = "f68d07f9099f4f89395fe60093164a4ac2bbe2bf6aa2aaa3d3eae0fb7b349058";
+ version = "0.0.7.0";
+ sha256 = "deb478e275edcf7dada65f57ace1989d3e9e8f1c2fe2ef81aa1c257f82236870";
libraryHaskellDepends = [ base csound-expression transformers ];
homepage = "https://github.com/anton-k/csound-sampler";
description = "A musical sampler based on Csound";
@@ -46966,6 +48056,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "cspretty" = callPackage
+ ({ mkDerivation, base, containers, pretty }:
+ mkDerivation {
+ pname = "cspretty";
+ version = "1.0";
+ sha256 = "29a77c88684614ca41e88d8ee83b51cbd62ab12f7770701cb6699bc38d0a3909";
+ libraryHaskellDepends = [ base containers pretty ];
+ description = "AST and pretty printer for CSPm";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"css" = callPackage
({ mkDerivation, base, mtl, text }:
mkDerivation {
@@ -47029,8 +48131,8 @@ self: {
}:
mkDerivation {
pname = "csv-conduit";
- version = "0.6.6";
- sha256 = "7329056af16c2f81382ad0cc3437232b80e9910288daf687519a2e2cd2ee5d8b";
+ version = "0.6.7";
+ sha256 = "501e6b0b7c6f0e80ba381b5f18af5ec343eb5e1afb4f5fc4e5e318ce51eeb33d";
libraryHaskellDepends = [
array attoparsec base blaze-builder bytestring conduit
conduit-extra containers data-default ghc-prim mmorph monad-control
@@ -47214,8 +48316,8 @@ self: {
}:
mkDerivation {
pname = "cubicbezier";
- version = "0.4.0.2";
- sha256 = "b3e87a3fa4000f44121b6278d1a0b258acc2c71425fe7bf9d565fa7c36581a17";
+ version = "0.5.0.0";
+ sha256 = "96c2792707bc80a45a428886af97c1b4c7524a2e9ba0be13fa60d7bac879e508";
libraryHaskellDepends = [
base containers integration matrices microlens microlens-mtl
microlens-th mtl vector
@@ -47290,32 +48392,56 @@ self: {
}) {};
"cudd" = callPackage
- ({ mkDerivation, array, base, c2hs, cudd, dddmp, epd, mtl, mtr, st
- , transformers, util
- }:
+ ({ mkDerivation, array, base, c2hs, cudd, mtl, transformers }:
mkDerivation {
pname = "cudd";
- version = "0.1.0.2";
- sha256 = "59008e024553375eeeabfd9dd7c2e8a186b0edd75edb52640e38cc9d31911a7e";
+ version = "0.1.0.3.1";
+ sha256 = "95c05f80bb0caad6bc372ab511a7a74c6cf1c025c54d15105a573b3fec64d730";
libraryHaskellDepends = [ array base mtl transformers ];
- librarySystemDepends = [ cudd dddmp epd mtr st util ];
+ librarySystemDepends = [ cudd ];
libraryToolDepends = [ c2hs ];
homepage = "https://github.com/adamwalker/haskell_cudd";
description = "Bindings to the CUDD binary decision diagrams library";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {cudd = null; dddmp = null; epd = null; inherit (pkgs) mtr;
- inherit (pkgs) st; util = null;};
+ }) {cudd = null;};
+
+ "cue-sheet" = callPackage
+ ({ mkDerivation, base, bytestring, containers, data-default-class
+ , exceptions, hspec, hspec-megaparsec, megaparsec, mtl, QuickCheck
+ , text
+ }:
+ mkDerivation {
+ pname = "cue-sheet";
+ version = "0.1.0";
+ sha256 = "cb4d369b3eb3859b9006dce4f9b45a3b9dafb75370d02bf5f178f06905dd05f1";
+ libraryHaskellDepends = [
+ base bytestring containers data-default-class exceptions megaparsec
+ mtl QuickCheck text
+ ];
+ testHaskellDepends = [
+ base bytestring exceptions hspec hspec-megaparsec QuickCheck text
+ ];
+ homepage = "https://github.com/mrkkrp/cue-sheet";
+ description = "Support for construction, rendering, and parsing of CUE sheets";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
"cufft" = callPackage
- ({ mkDerivation, base, c2hs, cuda }:
+ ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath
+ , template-haskell
+ }:
mkDerivation {
pname = "cufft";
- version = "0.1.2.2";
- sha256 = "7ce52f10a05bd5064466dde644e0663abbc9eb3cfe0026531cfc04c1c8302bec";
+ version = "0.7.5.0";
+ sha256 = "09bd838815a521b21b971c43e1eb0b79dfe54d848a3cf9d0137f3cdb414e1171";
+ setupHaskellDepends = [
+ base Cabal directory filepath template-haskell
+ ];
libraryHaskellDepends = [ base cuda ];
libraryToolDepends = [ c2hs ];
- homepage = "http://github.com/robeverest/cufft";
+ homepage = "https://github.com/robeverest/cufft";
description = "Haskell bindings for the CUFFT library";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -47583,8 +48709,8 @@ self: {
}:
mkDerivation {
pname = "d-bus";
- version = "0.1.4";
- sha256 = "e194ab6f0447adf7954b1b94b1533ded8c79af99a7c8976e316934a22452f5b3";
+ version = "0.1.5";
+ sha256 = "79a28c075e0eac6f3bb50fedd88d8454ed5f8b6737cd484e2f26fd13361b7d06";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -48934,6 +50060,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "data-has" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "data-has";
+ version = "0.2.1.0";
+ sha256 = "c13dd9875174926b41911a826bbf6d616ceabc56d27017a76a39d097e170f890";
+ libraryHaskellDepends = [ base ];
+ homepage = "https://github.com/winterland1989/data-has";
+ description = "Simple extensible product";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"data-hash" = callPackage
({ mkDerivation, array, base, containers, QuickCheck
, test-framework, test-framework-quickcheck2
@@ -49801,6 +50939,24 @@ self: {
license = "GPL";
}) {};
+ "datasets" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, cassava, directory
+ , file-embed, filepath, hashable, microlens, stringsearch, text
+ , time, vector, wreq
+ }:
+ mkDerivation {
+ pname = "datasets";
+ version = "0.2.3";
+ sha256 = "f155d4aea31d03fd14c7050793d9e90685ba8858460ce7c3716919bd00c12ea4";
+ libraryHaskellDepends = [
+ aeson base bytestring cassava directory file-embed filepath
+ hashable microlens stringsearch text time vector wreq
+ ];
+ homepage = "https://github.com/glutamate/datasets";
+ description = "Classical data sets for statistics and machine learning";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"dataurl" = callPackage
({ mkDerivation, attoparsec, base, base64-bytestring, bytestring
, HTF, text
@@ -50591,8 +51747,8 @@ self: {
}:
mkDerivation {
pname = "debian";
- version = "3.91.1";
- sha256 = "0624b718aec8e1d28fdf4d471c1236a66099555ac22858dbe49a7ee00f9b25e6";
+ version = "3.91.2";
+ sha256 = "16b14ad562ef5895462b59790f42d591d977e1433c4c2763a3a6a34e052e0d56";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -50713,6 +51869,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "declarative_0_4_0" = callPackage
+ ({ mkDerivation, base, hasty-hamiltonian, lens, mcmc-types
+ , mighty-metropolis, mwc-probability, pipes, primitive
+ , speedy-slice, transformers
+ }:
+ mkDerivation {
+ pname = "declarative";
+ version = "0.4.0";
+ sha256 = "e771c452cbc7f91b67d078a87349de36182fc5e25a9185f18cff7346941c713c";
+ libraryHaskellDepends = [
+ base hasty-hamiltonian lens mcmc-types mighty-metropolis
+ mwc-probability pipes primitive speedy-slice transformers
+ ];
+ testHaskellDepends = [ base mwc-probability ];
+ homepage = "http://github.com/jtobin/declarative";
+ description = "DIY Markov Chains";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"decode-utf8" = callPackage
({ mkDerivation, api-opentheory-unicode, base, opentheory-unicode
}:
@@ -51565,12 +52741,12 @@ self: {
({ mkDerivation, base, hspec, QuickCheck }:
mkDerivation {
pname = "derive-storable";
- version = "0.1.0.3";
- sha256 = "64e1101e32e58421efc4eeaef4e1da4449b52e525793d6cde3da892c6662729e";
+ version = "0.1.0.6";
+ sha256 = "692a0f29e0959a51d3159f6ca0bb2c9d95fd38cc2ed9d8d26b242f998dd9b012";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base hspec QuickCheck ];
homepage = "https://www.github.com/mkloczko/derive-storable/";
- description = "Derive Storable instances with help of GHC.Generics.";
+ description = "Derive Storable instances with GHC.Generics.";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -51620,20 +52796,20 @@ self: {
"deriving-compat" = callPackage
({ mkDerivation, base, base-compat, base-orphans, containers
- , ghc-boot-th, ghc-prim, hspec, QuickCheck, template-haskell
- , transformers, transformers-compat
+ , ghc-boot-th, ghc-prim, hspec, QuickCheck, tagged
+ , template-haskell, transformers, transformers-compat
}:
mkDerivation {
pname = "deriving-compat";
- version = "0.3.4";
- sha256 = "77c68a5c69be9c4385a163501da2d8dacf590a3d948bb1d01f570ef4abb0bf3d";
+ version = "0.3.5";
+ sha256 = "0a165c8eeb78349ded41cf51750753cdd0e25c139171789f7a4b0c6be4ccd231";
libraryHaskellDepends = [
base containers ghc-boot-th ghc-prim template-haskell transformers
transformers-compat
];
testHaskellDepends = [
- base base-compat base-orphans hspec QuickCheck template-haskell
- transformers transformers-compat
+ base base-compat base-orphans hspec QuickCheck tagged
+ template-haskell transformers transformers-compat
];
homepage = "https://github.com/haskell-compat/deriving-compat";
description = "Backports of GHC deriving extensions";
@@ -51865,6 +53041,32 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "dhall" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
+ , http-client, http-client-tls, microlens, microlens-mtl
+ , neat-interpolation, optparse-generic, parsers, system-fileio
+ , system-filepath, text, text-format, transformers, trifecta
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "dhall";
+ version = "1.0.1";
+ sha256 = "4bc7a6e0de32900ac64b58024ea989c3afaeab0f9a3e1256a04090eb6233b428";
+ revision = "1";
+ editedCabalFile = "a149e10771a65c573ffb2c9ed1c6694f11392590a36d60a9b1c48f02d0e9e77c";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ ansi-wl-pprint base bytestring containers http-client
+ http-client-tls microlens microlens-mtl neat-interpolation parsers
+ system-fileio system-filepath text text-format transformers
+ trifecta unordered-containers vector
+ ];
+ executableHaskellDepends = [ base optparse-generic text trifecta ];
+ description = "A configuration language guaranteed to terminate";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"dia-base" = callPackage
({ mkDerivation, base, deepseq }:
mkDerivation {
@@ -51933,8 +53135,10 @@ self: {
pname = "diagrams-boolean";
version = "0.1.0";
sha256 = "c0b174cc23e6dc461e6ec6a68797a9552933e7d800e3e66ce85ef1ccf151b69e";
+ revision = "2";
+ editedCabalFile = "49fa3d3493471de57b921c41b986c3537a9cd30cf1f42eb7170a13293c70d596";
libraryHaskellDepends = [ base cubicbezier diagrams-lib ];
- description = "boolean operations on Diagrams paths";
+ description = "deprecated, part of diagrams-contrib since 1.4";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -51948,8 +53152,8 @@ self: {
}:
mkDerivation {
pname = "diagrams-builder";
- version = "0.8";
- sha256 = "28633d2a5374ba3c9e56ff798242889986b9a5958e0bd2b35df342b4ac4c5744";
+ version = "0.8.0.1";
+ sha256 = "6e9b0eba4c9aa698ffdd21d55492b4cfd867cd4107ed8ccc591888cba7fe5b1c";
configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
isLibrary = true;
isExecutable = true;
@@ -52079,7 +53283,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "diagrams-contrib_1_4" = callPackage
+ "diagrams-contrib_1_4_0_1" = callPackage
({ mkDerivation, base, circle-packing, colour, containers
, cubicbezier, data-default, data-default-class, diagrams-core
, diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens
@@ -52089,8 +53293,8 @@ self: {
}:
mkDerivation {
pname = "diagrams-contrib";
- version = "1.4";
- sha256 = "1b06f7d5fb4ae77a851ef2c6e6f7193418e679198b757bbd75b81798c6f8dceb";
+ version = "1.4.0.1";
+ sha256 = "1194be9ab13c8660ef1c56c35b3a6578953db51e173de96eb8d49603e855750c";
libraryHaskellDepends = [
base circle-packing colour containers cubicbezier data-default
data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -52198,8 +53402,8 @@ self: {
}:
mkDerivation {
pname = "diagrams-haddock";
- version = "0.4";
- sha256 = "79dbb7fa0b28b04cf0804fb993e04b22f7e1261089c0aa4e7fe06894edcce0b9";
+ version = "0.4.0.1";
+ sha256 = "594ed547bbbdce511f48048bc3626c134bc468133e908fe3512d2fadeb7342f4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -52304,7 +53508,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "diagrams-lib_1_4" = callPackage
+ "diagrams-lib_1_4_0_1" = callPackage
({ mkDerivation, active, adjunctions, array, base, cereal, colour
, containers, data-default-class, deepseq, diagrams-core
, diagrams-solve, directory, distributive, dual-tree, exceptions
@@ -52316,8 +53520,8 @@ self: {
}:
mkDerivation {
pname = "diagrams-lib";
- version = "1.4";
- sha256 = "5aed2074a86e6f6cc030ff062d8a3a743aaf8fa9d7d9cd14c6d7b0b1d32112ad";
+ version = "1.4.0.1";
+ sha256 = "5140b590c83047058d4253842ef1105b2ecf71d8dd72a280123c00b030a32dc6";
libraryHaskellDepends = [
active adjunctions array base cereal colour containers
data-default-class diagrams-core diagrams-solve directory
@@ -52389,6 +53593,8 @@ self: {
pname = "diagrams-pgf";
version = "1.4";
sha256 = "068f1fbc8c3ebdfa37d47e96e060b8040c7425c014aecd8e4f022477a51e6687";
+ revision = "1";
+ editedCabalFile = "831aa29cc0f758091f2a7a288537b305dec5a846d178f8c55e31d37f33bc75b8";
libraryHaskellDepends = [
base bytestring bytestring-builder colour containers diagrams-core
diagrams-lib directory filepath hashable JuicyPixels mtl
@@ -52644,8 +53850,8 @@ self: {
}:
mkDerivation {
pname = "dib";
- version = "0.5.0";
- sha256 = "2f4a58c4a97c55bed558fee3be61886e05d55cd560f13d98f5cdce4d8ddbe294";
+ version = "0.6.1";
+ sha256 = "3465169e4968fb9b6c0bbd5f283e1778e429dd33005494707c3945fc6b9deb78";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -52791,7 +53997,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
@@ -52811,6 +54016,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "diff3_0_3_0" = callPackage
+ ({ mkDerivation, base, Diff, QuickCheck, test-framework
+ , test-framework-quickcheck2
+ }:
+ mkDerivation {
+ pname = "diff3";
+ version = "0.3.0";
+ sha256 = "8dc57a5f7070efe7227d3afaf5cf4d084c134e2cc0426e98421cdb720cacea25";
+ libraryHaskellDepends = [ base Diff ];
+ testHaskellDepends = [
+ base QuickCheck test-framework test-framework-quickcheck2
+ ];
+ homepage = "http://github.com/ocharles/diff3.git";
+ description = "Perform a 3-way difference of documents";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"diffarray" = callPackage
({ mkDerivation, array, base }:
mkDerivation {
@@ -52885,7 +54108,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
@@ -52931,8 +54153,8 @@ self: {
}:
mkDerivation {
pname = "digestive-bootstrap";
- version = "0.1.0.1";
- sha256 = "eb7d7586903f07c4519c4ff862923344e912268f686394cb4f550bd9ef0418f7";
+ version = "0.3.0.0";
+ sha256 = "5898973e9887a18b7763d0412b3b3569426fae506e2033608a9ec4e0c1eeec03";
libraryHaskellDepends = [
base blaze-bootstrap blaze-html digestive-functors
digestive-functors-blaze http-types text
@@ -53204,8 +54426,8 @@ self: {
({ mkDerivation, base, numtype-tf, time }:
mkDerivation {
pname = "dimensional-tf";
- version = "0.3.0.3";
- sha256 = "50081bf621515ee7fbe54f7aac45b0f3df7433dcc6ba681e0ca418f0cd17b110";
+ version = "0.3.0.4";
+ sha256 = "818bed66794f5669ddadb74887542ebe87df474d436f2ae0903b063909574d14";
libraryHaskellDepends = [ base numtype-tf time ];
homepage = "http://dimensional.googlecode.com/";
description = "Statically checked physical dimensions, implemented using type families";
@@ -53424,8 +54646,8 @@ self: {
}:
mkDerivation {
pname = "direct-sqlite";
- version = "2.3.18";
- sha256 = "47311cb4070220012f6a7e3e75c04ba1da6e4c1975cdf823a1e13bee72dc433d";
+ version = "2.3.19";
+ sha256 = "f47e9b99888ddd9e3f3811a575590cbc35f4e41f0897f01f0d0b9b44c2e6eb3c";
libraryHaskellDepends = [ base bytestring text ];
testHaskellDepends = [
base base16-bytestring bytestring directory HUnit temporary text
@@ -53452,12 +54674,12 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "directory_1_2_7_0" = callPackage
+ "directory_1_3_0_0" = callPackage
({ mkDerivation, base, filepath, time, unix }:
mkDerivation {
pname = "directory";
- version = "1.2.7.0";
- sha256 = "4ae59ebd9969f300e579c2b62fb072954a297b2f53fcd5d58bab363535ce7040";
+ version = "1.3.0.0";
+ sha256 = "369cd8212b0167b48ea7ad1f44a4ae7648286af21449bd816492ced03fbdd387";
libraryHaskellDepends = [ base filepath time unix ];
testHaskellDepends = [ base filepath time unix ];
description = "Platform-agnostic library for filesystem operations";
@@ -53514,6 +54736,7 @@ self: {
homepage = "http://brandon.si/code/directory-tree-module-released/";
description = "A simple directory-like tree datatype, with useful IO functions";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"dirfiles" = callPackage
@@ -53733,6 +54956,8 @@ self: {
pname = "distributed-process";
version = "0.6.6";
sha256 = "e881775dabea50ccd3370242c8a3acd87c9b8ce9e47f3d4c2d0a6b2ec7b3b7d0";
+ revision = "1";
+ editedCabalFile = "5958661e4bceb18f38e9eb9828a58d1c811102f84a74376d7b18b88cde8ba1e7";
libraryHaskellDepends = [
base binary bytestring containers data-accessor deepseq
distributed-static exceptions hashable mtl network-transport random
@@ -53857,8 +55082,8 @@ self: {
pname = "distributed-process-execution";
version = "0.1.2.2";
sha256 = "9fbfca6b394e52af462586127a0edc2efc2a160ae8f69a9d34234a71e3dbf7b5";
- revision = "1";
- editedCabalFile = "c7fad93838da34d675ea6484d0697e437ab3453d580e9759fa0c5bd66f86d7bf";
+ revision = "2";
+ editedCabalFile = "cfd179986e0282f924ce5d7977a44fa31cc8de3115a5de842b9151f11b0578a2";
libraryHaskellDepends = [
base binary containers data-accessor deepseq distributed-process
distributed-process-client-server distributed-process-extras
@@ -53892,8 +55117,8 @@ self: {
pname = "distributed-process-extras";
version = "0.2.1.2";
sha256 = "c1a4e1a5e3ec30089251db40fd479b19c5fd74c9dd8ca50f8eb32aaf9747a048";
- revision = "1";
- editedCabalFile = "5f287b8a5c2d4460cc101fd2b96d116fa74876b894f8ae5ab44b925af5f233d6";
+ revision = "2";
+ editedCabalFile = "e487c5799fa82b7e6b88ddf2d58e21d9add876a967b2820f502ac5c5307aec31";
libraryHaskellDepends = [
base binary containers data-accessor deepseq distributed-process
fingertree hashable mtl stm time transformers unordered-containers
@@ -54047,6 +55272,8 @@ self: {
pname = "distributed-process-simplelocalnet";
version = "0.2.3.3";
sha256 = "7b98498f2d6ce185ae0a855ff35e97a9ad1bd1ec7872b2d75aa0bb1f1fb24316";
+ revision = "1";
+ editedCabalFile = "4ccf03a12611141e322511b6370e2f757e215f17e68fc3f68485ec5b48fa8f70";
libraryHaskellDepends = [
base binary bytestring containers data-accessor distributed-process
network network-multicast network-transport network-transport-tcp
@@ -54290,6 +55517,30 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "diversity_0_8_0_2" = callPackage
+ ({ mkDerivation, base, containers, data-ordlist, fasta
+ , math-functions, MonadRandom, optparse-applicative, parsec, pipes
+ , random-shuffle, scientific, semigroups, split
+ }:
+ mkDerivation {
+ pname = "diversity";
+ version = "0.8.0.2";
+ sha256 = "f8bea710958aff9169f150efc112ec871230eccf464315b956dccdd8460c7324";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers data-ordlist fasta math-functions MonadRandom
+ parsec random-shuffle scientific split
+ ];
+ executableHaskellDepends = [
+ base containers fasta optparse-applicative pipes semigroups
+ ];
+ homepage = "https://github.com/GregorySchwartz/diversity";
+ description = "Quantify the diversity of a population";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"dixi" = callPackage
({ mkDerivation, acid-state, aeson, aeson-pretty, attoparsec, base
, base-orphans, blaze-html, blaze-markup, bytestring
@@ -54302,10 +55553,8 @@ self: {
}:
mkDerivation {
pname = "dixi";
- version = "0.6.9.1";
- sha256 = "938923def44d17f193907edc2e928fe63eeca685dd9f5527c791718e3e8e6c6a";
- revision = "1";
- editedCabalFile = "1165d61068ddfdb1f480130f9aefc110505e0514484014fe4f3b69ecdd8e1b61";
+ version = "0.6.9.2";
+ sha256 = "39190af5648c2f39f133d140856d62cceefbe96f02a570bba68d442908dcb6d7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -54430,6 +55679,91 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "dmc" = callPackage
+ ({ mkDerivation, base, hspec, process, QuickCheck }:
+ mkDerivation {
+ pname = "dmc";
+ version = "1.1";
+ sha256 = "76467975ce4b2e65ae67c42e84a78fd995655f39754595e920b903b13009c2ae";
+ revision = "2";
+ editedCabalFile = "a6e8ae3524d68892f9bd71b80c0cb52f4ef0c11ec7212b554f63e25ae65afde6";
+ libraryHaskellDepends = [ base process ];
+ testHaskellDepends = [ base hspec process QuickCheck ];
+ homepage = "https://github.com/ciez/dmc";
+ description = "cmd: run shell commands from code";
+ license = stdenv.lib.licenses.publicDomain;
+ }) {};
+
+ "dmenu" = callPackage
+ ({ mkDerivation, base, containers, directory, lens, mtl, process
+ , transformers
+ }:
+ mkDerivation {
+ pname = "dmenu";
+ version = "0.3.1.0";
+ sha256 = "0c5e0cc0e78ceffcb762e507e083b22ce509e21e87088052597ab1e6dc5bd899";
+ 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;
+ }) {};
+
+ "dmenu-pkill" = callPackage
+ ({ mkDerivation, base, containers, directory, dmenu, lens, mtl
+ , process, transformers
+ }:
+ mkDerivation {
+ pname = "dmenu-pkill";
+ version = "0.1.0.0";
+ sha256 = "5dc7055896945f60231a9eeda11242c1c739d7e9eed316866597305df941fa75";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base containers directory dmenu lens mtl process transformers
+ ];
+ homepage = "https://github.com/m0rphism/haskell-dmenu-pkill";
+ description = "dmenu script for killing applications. Sortable by process id or CPU/MEM usage.";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "dmenu-pmount" = callPackage
+ ({ mkDerivation, base, containers, directory, dmenu, lens, mtl
+ , process, transformers
+ }:
+ mkDerivation {
+ pname = "dmenu-pmount";
+ version = "0.1.0.0";
+ sha256 = "2a7bc00b47554944c5ac3a88897325d47dcf64bdc9f229214ea64474cfb5009c";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base containers directory dmenu lens mtl process transformers
+ ];
+ homepage = "https://github.com/m0rphism/haskell-dmenu-pmount";
+ description = "Mounting and unmounting linux devices as user with dmenu and pmount";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "dmenu-search" = callPackage
+ ({ mkDerivation, base, containers, directory, dmenu, lens, mtl
+ , process, transformers
+ }:
+ mkDerivation {
+ pname = "dmenu-search";
+ version = "0.1.0.0";
+ sha256 = "c3aa52379389c120b2858796baa0b1dc21212573ed2ca4cf2b5b9141196094c6";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base containers directory dmenu lens mtl process transformers
+ ];
+ homepage = "https://github.com/m0rphism/haskell-dmenu-search";
+ description = "dmenu script for searching the web with customizable search engines";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"dns" = callPackage
({ mkDerivation, attoparsec, base, binary, bytestring
, bytestring-builder, conduit, conduit-extra, containers, doctest
@@ -54437,8 +55771,8 @@ self: {
}:
mkDerivation {
pname = "dns";
- version = "2.0.8";
- sha256 = "ca9ba04f3fdc277033a9b16bf39d290e2b2fdc4d79c9c0c9b9aa5b8cf21bd5c9";
+ version = "2.0.10";
+ sha256 = "ba03bc8fe25b58fd066588569eb5707a245cb098181e2d5cca72c239849aa6a3";
libraryHaskellDepends = [
attoparsec base binary bytestring bytestring-builder conduit
conduit-extra containers iproute mtl network random resourcet safe
@@ -54652,18 +55986,18 @@ self: {
"docopt" = callPackage
({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
- , HUnit, parsec, split, template-haskell, th-lift
+ , HUnit, parsec, split, template-haskell, text, th-lift
}:
mkDerivation {
pname = "docopt";
- version = "0.7.0.4";
- sha256 = "3470cd9de7b1731a0b2c0a3fe8b9ea1bfdcfbebeffa5ed77831572f50f01e480";
+ version = "0.7.0.5";
+ sha256 = "15790808a4896bbf0748c1c0f3ab63c07aea4621d95b93a39886813f829d05ee";
libraryHaskellDepends = [
base containers parsec template-haskell th-lift
];
testHaskellDepends = [
aeson ansi-terminal base bytestring containers HUnit parsec split
- template-haskell th-lift
+ template-haskell text th-lift
];
homepage = "https://github.com/docopt/docopt.hs";
description = "A command-line interface parser that will make you smile";
@@ -54817,24 +56151,24 @@ self: {
}) {};
"dom-parser" = callPackage
- ({ mkDerivation, base, data-default, hspec, lens, mtl, semigroups
- , shakespeare, text, transformers, xml-conduit
+ ({ mkDerivation, base, data-default, hspec, lens, mtl, open-union
+ , semigroups, shakespeare, text, transformers, type-fun
+ , xml-conduit, xml-lens
}:
mkDerivation {
pname = "dom-parser";
- version = "0.0.1";
- sha256 = "5ade4315c5e59bfbaf1e078a1171c6f3109d4f3bd3c394d7ef923140e253f86b";
- revision = "1";
- editedCabalFile = "1157c5f603c43f5a4bd0ea7f45da822b989db065324bbecb2e14659473eb766f";
+ version = "0.1.1";
+ sha256 = "e001c486adb3b2c6c6ab18e70205dc759ea018b6db084f8668bb424b623e4e03";
libraryHaskellDepends = [
- base lens mtl semigroups shakespeare text transformers xml-conduit
+ base lens mtl open-union semigroups shakespeare text transformers
+ type-fun xml-conduit xml-lens
];
testHaskellDepends = [
- base data-default hspec shakespeare text xml-conduit
+ base data-default hspec lens semigroups shakespeare text
+ xml-conduit
];
- homepage = "https://github.com/s9gf4ult/dom-parser";
- description = "Simple monad for parsing DOM";
- license = stdenv.lib.licenses.bsd3;
+ description = "Simple monadic DOM parser";
+ license = stdenv.lib.licenses.mit;
}) {};
"dom-selector" = callPackage
@@ -54875,25 +56209,16 @@ self: {
}) {};
"dominion" = callPackage
- ({ mkDerivation, base, hscolour, hspec, lens, mtl, random
- , random-extras, random-fu, transformers
- }:
+ ({ mkDerivation, base, containers, hspec, lens, mtl, random }:
mkDerivation {
pname = "dominion";
- version = "0.1.0.4";
- sha256 = "be25f1fb393288603a619b5fd26b25b05c756726c8f5ee69f447cea61250d78f";
+ version = "0.1.1.0";
+ sha256 = "bea01160caf8636409a3f07f3021c310ee81b67d6037fd62d533993ee746b112";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [
- base hscolour lens mtl random random-extras random-fu transformers
- ];
- executableHaskellDepends = [
- base hscolour lens mtl random random-extras random-fu transformers
- ];
- testHaskellDepends = [
- base hscolour hspec lens mtl random random-extras random-fu
- transformers
- ];
+ libraryHaskellDepends = [ base containers lens mtl random ];
+ executableHaskellDepends = [ base containers lens mtl random ];
+ testHaskellDepends = [ base containers hspec lens mtl random ];
homepage = "http://github.com/egonschiele/dominion";
description = "A simulator for the board game Dominion";
license = stdenv.lib.licenses.bsd3;
@@ -55057,18 +56382,17 @@ self: {
}) {};
"double-conversion" = callPackage
- ({ mkDerivation, base, bytestring, ghc-prim, integer-gmp
- , test-framework, test-framework-quickcheck2, text
+ ({ mkDerivation, base, bytestring, ghc-prim, HUnit, test-framework
+ , test-framework-hunit, test-framework-quickcheck2, text
}:
mkDerivation {
pname = "double-conversion";
- version = "2.0.1.0";
- sha256 = "0072b5b05631081c2eb73cda9dd660e384a7e988d3867b8b05540ef7648a920c";
- libraryHaskellDepends = [
- base bytestring ghc-prim integer-gmp text
- ];
+ version = "2.0.2.0";
+ sha256 = "44cde172395401169e844d6791b6eb0ef2c2e55a08de8dda96551cfe029ba26b";
+ libraryHaskellDepends = [ base bytestring ghc-prim text ];
testHaskellDepends = [
- base bytestring test-framework test-framework-quickcheck2 text
+ base bytestring HUnit test-framework test-framework-hunit
+ test-framework-quickcheck2 text
];
homepage = "https://github.com/bos/double-conversion";
description = "Fast conversion between double precision floating point and text";
@@ -55426,32 +56750,32 @@ self: {
({ mkDerivation, base, containers, hspec, QuickCheck }:
mkDerivation {
pname = "drawille";
- version = "0.1.0.6";
- sha256 = "3282ca7d783580f95349ffd85b6f668f57a354aad74a84c37406fc8ef2636c09";
+ version = "0.1.2.0";
+ sha256 = "b8188ee87a06c168974c9655188450eb86c331c556decb31cf084efa846237df";
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [ base containers hspec QuickCheck ];
- homepage = "https://github.com/yamadapc/haskell-drawille";
+ homepage = "https://github.com/yamadapc/haskell-drawille#readme";
description = "A port of asciimoo's drawille to haskell";
license = stdenv.lib.licenses.gpl3;
}) {};
"dresdner-verkehrsbetriebe" = callPackage
({ mkDerivation, aeson, base, bytestring, HTTP, old-locale
- , optparse-applicative, time, unordered-containers, vector
+ , optparse-applicative, text, time, unordered-containers, vector
}:
mkDerivation {
pname = "dresdner-verkehrsbetriebe";
- version = "0.1.1";
- sha256 = "380af7c7a9181b3d8b3a9e1bce271a71071781d3055a669b31492217f6c8babf";
+ version = "1.0.0";
+ sha256 = "8c23ab7f2f3b8c7c885eb5f6fd9aff7f644656a07ad2a4b0cd13437f9201b20a";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base bytestring HTTP old-locale time unordered-containers
- vector
+ aeson base bytestring HTTP old-locale text time
+ unordered-containers vector
];
executableHaskellDepends = [
- aeson base bytestring HTTP old-locale optparse-applicative time
- unordered-containers vector
+ aeson base bytestring HTTP old-locale optparse-applicative text
+ time unordered-containers vector
];
description = "Library and program for querying DVB (Dresdner Verkehrsbetriebe AG)";
license = stdenv.lib.licenses.mit;
@@ -55497,15 +56821,35 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "drifter-postgresql_0_1_0" = callPackage
+ ({ mkDerivation, base, containers, drifter, either, mtl
+ , postgresql-simple, tasty, tasty-hunit, text, time
+ }:
+ mkDerivation {
+ pname = "drifter-postgresql";
+ version = "0.1.0";
+ sha256 = "10df8309986c23f947949a28f9fb16ec6632f1d509ab0fe010a74f9068b90325";
+ libraryHaskellDepends = [
+ base containers drifter either mtl postgresql-simple time
+ ];
+ testHaskellDepends = [
+ base drifter either postgresql-simple tasty tasty-hunit text
+ ];
+ homepage = "http://github.com/michaelxavier/drifter-postgresql";
+ description = "PostgreSQL support for the drifter schema migration tool";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"drmaa" = callPackage
({ mkDerivation, base, drmaa, inline-c, shelly, text }:
mkDerivation {
pname = "drmaa";
- version = "0.1.0.1";
- sha256 = "5cb530e4c7f8cde9e8b4520ef116a44e9c5cde8191ad7f91964ca270c69ae1e7";
+ version = "0.1.1";
+ sha256 = "66b095d3b94ed531e2a704fba319002e8d3b7b6f9b3f68102a4b4d0f7a048567";
libraryHaskellDepends = [ base inline-c shelly text ];
librarySystemDepends = [ drmaa ];
- description = "A simple Haskell bindings to DRMAA C library";
+ description = "A minimal Haskell bindings to DRMAA C library";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {drmaa = null;};
@@ -56139,21 +57483,24 @@ self: {
"dynamic-plot" = callPackage
({ mkDerivation, base, colour, colour-space, constrained-categories
, containers, data-default, deepseq, diagrams-cairo, diagrams-core
- , diagrams-gtk, diagrams-lib, free-vector-spaces, glib, gtk, lens
- , linearmap-category, manifolds, MemoTrie, MonadRandom, mtl
- , process, random, semigroups, tagged, time, transformers, vector
- , vector-space
+ , diagrams-gtk, diagrams-lib, free-vector-spaces, glib, gtk
+ , JuicyPixels, lens, linearmap-category, manifold-random, manifolds
+ , MemoTrie, mtl, process, random, random-fu, semigroups, tagged
+ , time, transformers, vector, vector-space
}:
mkDerivation {
pname = "dynamic-plot";
- version = "0.2.0.0";
- sha256 = "4a5e2d6105139bd8756d3b1d1d2fbffcf36cb435e02973efa9066123cbd3e528";
+ version = "0.2.1.0";
+ sha256 = "8d75d0d068f801f2da0199738b43261966f265f62f58b3ad9f5b33e7c7158999";
+ revision = "1";
+ editedCabalFile = "d2d367212ca5c730e629b14d04a12eccc8bee0d3bead4f16c7db230507753c4e";
libraryHaskellDepends = [
base colour colour-space constrained-categories containers
data-default deepseq diagrams-cairo diagrams-core diagrams-gtk
- diagrams-lib free-vector-spaces glib gtk lens linearmap-category
- manifolds MemoTrie MonadRandom mtl process random semigroups tagged
- time transformers vector vector-space
+ diagrams-lib free-vector-spaces glib gtk JuicyPixels lens
+ linearmap-category manifold-random manifolds MemoTrie mtl process
+ random random-fu semigroups tagged time transformers vector
+ vector-space
];
homepage = "https://github.com/leftaroundabout/dynamic-plot";
description = "Interactive diagram windows";
@@ -56198,6 +57545,35 @@ self: {
license = stdenv.lib.licenses.gpl2;
}) {};
+ "dynamodb-simple" = callPackage
+ ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb
+ , base, bytestring, conduit, containers, double-conversion
+ , exceptions, generics-sop, hashable, hspec, lens, monad-loops
+ , monad-supply, safe-exceptions, scientific, semigroups, tagged
+ , template-haskell, text, transformers, unordered-containers
+ , vector
+ }:
+ mkDerivation {
+ pname = "dynamodb-simple";
+ version = "0.3.0.0";
+ sha256 = "5a1693cacc9d15727b4d0f71cf6015a71e2e5269b8872c9e50016ff6d0f7265b";
+ libraryHaskellDepends = [
+ aeson amazonka amazonka-core amazonka-dynamodb base bytestring
+ conduit containers double-conversion exceptions generics-sop
+ hashable lens monad-loops monad-supply scientific semigroups tagged
+ template-haskell text transformers unordered-containers vector
+ ];
+ testHaskellDepends = [
+ amazonka amazonka-dynamodb base conduit containers hashable hspec
+ lens safe-exceptions semigroups tagged text transformers
+ unordered-containers
+ ];
+ homepage = "https://github.com/ondrap/dynamodb-simple";
+ description = "Typesafe library for working with DynamoDB database";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"dynobud" = callPackage
({ mkDerivation, aeson, base, binary, casadi-bindings
, casadi-bindings-core, cereal, containers, data-default-class
@@ -56366,6 +57742,9 @@ self: {
pname = "easyrender";
version = "0.1.1.2";
sha256 = "303d5f310105be9afd27382134ff4d7802a899f980192953f46a9602ae2aa616";
+ revision = "1";
+ editedCabalFile = "26ce39b96e803d7176fd787298a8dd123f80bc67165bddda9bbb722dfa4bfd3e";
+ setupHaskellDepends = [ base superdoc ];
libraryHaskellDepends = [
base bytestring containers mtl superdoc zlib
];
@@ -56375,6 +57754,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "easytensor" = callPackage
+ ({ mkDerivation, base, ghc-prim }:
+ mkDerivation {
+ pname = "easytensor";
+ version = "0.1.0.0";
+ sha256 = "7ff2225d2081f0151f64cc53cea036f02188e278ba005b1e561e0d1701f0b031";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base ghc-prim ];
+ executableHaskellDepends = [ base ghc-prim ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/achirkin/easytensor#readme";
+ description = "Initial project template from stack";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"ebeats" = callPackage
({ mkDerivation, base, time }:
mkDerivation {
@@ -56575,8 +57970,8 @@ self: {
}:
mkDerivation {
pname = "ede";
- version = "0.2.8.5";
- sha256 = "899e146093fc5353f6e86130898e2396d39c5365a412e67a8435252e8a4f2fb3";
+ version = "0.2.8.6";
+ sha256 = "6388ce61ebc6153fcae1aeabe426ef4eb07f2080fd5019bb4d441184570cf2a5";
libraryHaskellDepends = [
aeson ansi-wl-pprint base bifunctors bytestring comonad directory
filepath free lens mtl parsers scientific semigroups text
@@ -56912,8 +58307,8 @@ self: {
}:
mkDerivation {
pname = "egison";
- version = "3.6.1";
- sha256 = "937ab976c09bf6c4b4376d9cb30504055814ad4079f15319c9126abf74cdbac9";
+ version = "3.6.3";
+ sha256 = "178eebc1798fb6d1c2fceeb8f68c2b7cd87a25ff35db9274c2115e6b5100e6d5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -56957,8 +58352,8 @@ self: {
}:
mkDerivation {
pname = "egison-tutorial";
- version = "3.5.9";
- sha256 = "9540ca3bcf92594a9b203df1f1b862264ebfe0e36eb49bb04fe10bbae2a9c9ab";
+ version = "3.6.2";
+ sha256 = "b1dc21a80daacb240ad339bfcd895ee7e10f41560b14566766e168ab4606a2c0";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -57183,6 +58578,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
}:
@@ -57293,8 +58705,8 @@ self: {
({ mkDerivation, base, tasty, tasty-quickcheck }:
mkDerivation {
pname = "electrum-mnemonic";
- version = "0.1.2";
- sha256 = "638a29ecaf2e3fb9123e01c959c4299bbcc487dadb3743821123d6280e775cd3";
+ version = "0.1.3";
+ sha256 = "c05e2ddd4b18a0f8202e523032ed8cacd3cd57549c533154fb0bbc604b27aaf6";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base tasty tasty-quickcheck ];
description = "easy to remember mnemonic for a high-entropy value";
@@ -57399,6 +58811,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "elm-bridge_0_4_0" = callPackage
+ ({ mkDerivation, aeson, base, containers, hspec, QuickCheck
+ , template-haskell, text
+ }:
+ mkDerivation {
+ pname = "elm-bridge";
+ version = "0.4.0";
+ sha256 = "45721d5ee406b21c9b9cab180a7a0ee618d8492aecd131080345d772e6b51fd9";
+ libraryHaskellDepends = [ aeson base template-haskell ];
+ testHaskellDepends = [
+ aeson base containers hspec QuickCheck text
+ ];
+ homepage = "https://github.com/agrafix/elm-bridge";
+ description = "Derive Elm types from Haskell types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"elm-build-lib" = callPackage
({ mkDerivation, base, bytestring, containers, elm-compiler
, elm-core-sources, file-embed, template-haskell
@@ -57478,8 +58908,8 @@ self: {
}:
mkDerivation {
pname = "elm-export";
- version = "0.4.1.1";
- sha256 = "91e01639707349bf27a8aa9fffa8f30206fc1f50e269d6220403ec585a54e263";
+ version = "0.5.0.2";
+ sha256 = "13d1542351031f716508fdbe51876aa1cd10791b8b901cb8abdafb23981c14c4";
libraryHaskellDepends = [
base bytestring containers directory formatting mtl text time
];
@@ -57493,6 +58923,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "elm-export-persistent" = callPackage
+ ({ mkDerivation, aeson, base, elm-export, persistent, scientific
+ , text, unordered-containers
+ }:
+ mkDerivation {
+ pname = "elm-export-persistent";
+ version = "0.1.1";
+ sha256 = "a1866db56266261df0d8e99acc0534c32db75c1314b0578c089f02e34cad7ca2";
+ libraryHaskellDepends = [
+ aeson base elm-export persistent scientific text
+ unordered-containers
+ ];
+ homepage = "https://github.com/jb55/elm-export-persistent";
+ description = "elm-export persistent entities";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"elm-get" = callPackage
({ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, base, binary
, bytestring, containers, directory, Elm, filepath, HTTP
@@ -57876,6 +59324,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "emailaddress_0_2_0_0" = callPackage
+ ({ mkDerivation, aeson, base, bifunctors, bytestring, doctest
+ , email-validate, Glob, http-api-data, opaleye, path-pieces
+ , persistent, postgresql-simple, product-profunctors, profunctors
+ , text
+ }:
+ mkDerivation {
+ pname = "emailaddress";
+ version = "0.2.0.0";
+ sha256 = "390b0aaf8fa2d3a694b812ad83fc0f26ed5c7172cc318a7d46c1fc3456d9c15c";
+ libraryHaskellDepends = [
+ aeson base bifunctors bytestring email-validate http-api-data
+ opaleye path-pieces persistent postgresql-simple
+ product-profunctors profunctors text
+ ];
+ testHaskellDepends = [ base doctest Glob ];
+ homepage = "https://github.com/cdepillabout/emailaddress#readme";
+ description = "Wrapper around email-validate library adding instances for common type classes";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"emailparse" = callPackage
({ mkDerivation, attoparsec, base, bytestring, either
, either-unwrap, HUnit, mime, MissingH, mtl, QuickCheck, strptime
@@ -58071,8 +59541,8 @@ self: {
}:
mkDerivation {
pname = "engine-io";
- version = "1.2.13";
- sha256 = "5fc53f8a4a0ba563b9592e7bf3d9475a4a7ce165c66cd63a303567f6a941cf45";
+ version = "1.2.14";
+ sha256 = "f321e826d56d7f14b4e027ddb57be59b2efa34a714e566e23a6bcee192ab6f33";
libraryHaskellDepends = [
aeson async attoparsec base base64-bytestring bytestring either
free monad-loops mwc-random stm stm-delay text transformers
@@ -58892,8 +60362,8 @@ self: {
}:
mkDerivation {
pname = "errors";
- version = "2.1.2";
- sha256 = "5c818778b88b76eca016348a04395c1d4913d7c125c0b9c0a1ccf69accf9d887";
+ version = "2.1.3";
+ sha256 = "201a1d9d2fba16dff734eb79e07f138718ed62f5a0a846cf0cee743828844df1";
libraryHaskellDepends = [
base safe transformers transformers-compat unexceptionalio
];
@@ -59425,8 +60895,8 @@ self: {
}:
mkDerivation {
pname = "eventloop";
- version = "0.8.2.0";
- sha256 = "2d3e90201da379a76f68aed93b0058d76f766ae07e4078c797e5f91c0e315f1b";
+ version = "0.8.2.1";
+ sha256 = "aed31b9515e726ae439323590336295cbdcd9c530aebb95f976a1068fc4c6848";
libraryHaskellDepends = [
aeson base bytestring concurrent-utilities deepseq network stm
suspend text timers websockets
@@ -59484,19 +60954,19 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "eventstore_0_13_1_7" = callPackage
+ "eventstore_0_14_0_0" = callPackage
({ mkDerivation, aeson, array, base, cereal, classy-prelude
- , connection, containers, dns, dotnet-timespan, http-client
+ , connection, containers, dns, dotnet-timespan, http-client, mtl
, protobuf, random, semigroups, stm, tasty, tasty-hunit, text, time
, unordered-containers, uuid
}:
mkDerivation {
pname = "eventstore";
- version = "0.13.1.7";
- sha256 = "a0c6ea5e91f56dc8027bb34825c1382c31cd26ac291c5a7c988bec0681c5e8d8";
+ version = "0.14.0.0";
+ sha256 = "0855c29baa25f14da74804bd324a4e4fb4f51f7609df3d0c6fbb0ef09d81552d";
libraryHaskellDepends = [
aeson array base cereal classy-prelude connection containers dns
- dotnet-timespan http-client protobuf random semigroups stm time
+ dotnet-timespan http-client mtl protobuf random semigroups stm time
unordered-containers uuid
];
testHaskellDepends = [
@@ -59681,8 +61151,8 @@ self: {
}:
mkDerivation {
pname = "exception-transformers";
- version = "0.4.0.4";
- sha256 = "d9b3a527acaeb1c03746db4704d8f64453d02ab4b89d16bd90fb4dbe7b9e7696";
+ version = "0.4.0.5";
+ sha256 = "564caaaac6c2d1759a13d2c2c8a1d7a4b0109035558c4641fa7a8a378961088b";
libraryHaskellDepends = [
base stm transformers transformers-compat
];
@@ -59715,6 +61185,8 @@ self: {
pname = "exceptions";
version = "0.8.3";
sha256 = "4d6ad97e8e3d5dc6ce9ae68a469dc2fd3f66e9d312bc6faa7ab162eddcef87be";
+ revision = "1";
+ editedCabalFile = "fc13261461399b8610d60468757f2fc0a62ed660dee998f4329e33dd76d2191b";
libraryHaskellDepends = [
base mtl stm template-haskell transformers transformers-compat
];
@@ -61164,6 +62636,8 @@ self: {
pname = "fb";
version = "1.0.13";
sha256 = "52af3e05b5721b5d38fea9231e9fde68b0e1987c4cc979acaf6e2f940537935e";
+ revision = "1";
+ editedCabalFile = "ff5a76303ad659f13394147cf6a3bbc3ee25e0ddf2df684d5b9a199c546dc75c";
libraryHaskellDepends = [
aeson attoparsec base base16-bytestring base64-bytestring
bytestring cereal conduit conduit-extra crypto-api cryptohash
@@ -61203,8 +62677,8 @@ self: {
}:
mkDerivation {
pname = "fbmessenger-api";
- version = "0.1.2.0";
- sha256 = "94bba7cff0abeb451ca841d30ef8237c9803331e1e988a9a5f6303eb4797ab2c";
+ version = "0.1.2.1";
+ sha256 = "9df807a7c6ecf9dc374a17cbda52433b2567aa60753797497c7e043ef6837237";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -61296,8 +62770,8 @@ self: {
}:
mkDerivation {
pname = "fclabels";
- version = "2.0.3.1";
- sha256 = "b993e35fd89945669c8b3cd95fa9dee618eb6a5256f8909ccbdc8ec713f75c8b";
+ version = "2.0.3.2";
+ sha256 = "4d5d83ffc3c8bc610e9c42e19c2e07a1ca68666310261de15703c605047182b0";
libraryHaskellDepends = [ base mtl template-haskell transformers ];
testHaskellDepends = [
base HUnit mtl template-haskell transformers
@@ -61409,8 +62883,8 @@ self: {
pname = "feed";
version = "0.3.11.1";
sha256 = "ed04d0fc120a4b1b47c7675d395afbb419506431bc6f8e0f2c382c73a4afc983";
- revision = "3";
- editedCabalFile = "0baffc9bcab66296a904d211d4254f625811dc28eda4f1be0692cc2b219a6bdd";
+ revision = "4";
+ editedCabalFile = "ecce0a16a0d695b1c8ed80af4ea59e33c767ad9c6bdac5898e7cae20bd5da8c6";
libraryHaskellDepends = [
base old-locale old-time time time-locale-compat utf8-string xml
];
@@ -62166,12 +63640,12 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "filepath_1_4_1_0" = callPackage
+ "filepath_1_4_1_1" = callPackage
({ mkDerivation, base, QuickCheck }:
mkDerivation {
pname = "filepath";
- version = "1.4.1.0";
- sha256 = "bd6dbfd1ecba2322ef166b4805d4276cbde1e551bd5c61fbee396782b9923d00";
+ version = "1.4.1.1";
+ sha256 = "52fdbde3bc3a44d920544b8d184bd7241bac3f92d1fc6e299d716e06e99f12b4";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base QuickCheck ];
homepage = "https://github.com/haskell/filepath#readme";
@@ -62371,6 +63845,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "find-source-files" = callPackage
+ ({ mkDerivation, base, Cabal, directory, filepath, mtl }:
+ mkDerivation {
+ pname = "find-source-files";
+ version = "0.1.0.0";
+ sha256 = "2c5307c3221ee9a932a93963d4d730ba1d84cce525c598571a4e4570d1753ec6";
+ libraryHaskellDepends = [ base Cabal directory filepath mtl ];
+ homepage = "https://github.com/oisdk/find-source-files#readme";
+ description = "Initial project template from stack";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"fingertree" = callPackage
({ mkDerivation, base, HUnit, QuickCheck, test-framework
, test-framework-hunit, test-framework-quickcheck2
@@ -62431,12 +63917,14 @@ self: {
}) {};
"finite-typelits" = callPackage
- ({ mkDerivation, base }:
+ ({ mkDerivation, base, deepseq }:
mkDerivation {
pname = "finite-typelits";
- version = "0.1.0.0";
- sha256 = "1729a66604cf852f1370f3575ac7cd74777df17106929c2afa57cf6c8fc78c58";
- libraryHaskellDepends = [ base ];
+ version = "0.1.1.0";
+ sha256 = "40cbe752fa659fdebd5afeb7a15177746b08227cf6add085481b94f53f8c858b";
+ revision = "1";
+ editedCabalFile = "4c5ae66b960dcede29688c32b9fb0d839a4bfb53bcde8e13f6a62b7f4fd55b4f";
+ libraryHaskellDepends = [ base deepseq ];
homepage = "https://github.com/mniip/finite-typelits";
description = "A type inhabited by finitely many values, indexed by type-level naturals";
license = stdenv.lib.licenses.bsd3;
@@ -62778,6 +64266,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "fixed-width" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "fixed-width";
+ version = "0.1.0.0";
+ sha256 = "c7e7a455513626b2ce6ddeb54036fd789d9e00b02ab4f13396b8add0c0e1b53f";
+ libraryHaskellDepends = [ base ];
+ description = "Fixed width subsets of an Int64/Word64";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"fixedprec" = callPackage
({ mkDerivation, base, random }:
mkDerivation {
@@ -62924,8 +64424,8 @@ self: {
}:
mkDerivation {
pname = "flaccuraterip";
- version = "0.3.6";
- sha256 = "7e7904030c86963c8a2a129a5d0f50a7872b80feaf26fea54f1508a0615469da";
+ version = "0.3.7";
+ sha256 = "b0cd908d8fe4cddc01e93cae85748717c41b183be5ce1a620ea6b4c776d4ba8f";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -62996,15 +64496,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "flat-mcmc_1_2_2" = callPackage
+ "flat-mcmc_1_5_0" = callPackage
({ mkDerivation, base, formatting, mcmc-types, monad-par
, monad-par-extras, mwc-probability, pipes, primitive, text
, transformers, vector
}:
mkDerivation {
pname = "flat-mcmc";
- version = "1.2.2";
- sha256 = "c70914ac35058f847e5faf173076403b8feb7bb8c8c96c34ba728aca031f6937";
+ version = "1.5.0";
+ sha256 = "87cea9deac6e2d32d9984741ba222ccb2fb0d5f8c58e843684476bfe7632f1fd";
libraryHaskellDepends = [
base formatting mcmc-types monad-par monad-par-extras
mwc-probability pipes primitive text transformers vector
@@ -63420,8 +64920,8 @@ self: {
}:
mkDerivation {
pname = "fltkhs";
- version = "0.5.0.0";
- sha256 = "95590b3e27edd3b79a33dd872a5c7a3d6f4a436db63eea7fe282066e1319f506";
+ version = "0.5.0.1";
+ sha256 = "440e605c927bbd10b5b6bb17d2b608797747f6780eb7014eb29998519fd3b495";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base bytestring text ];
@@ -63578,6 +65078,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "fmt" = callPackage
+ ({ mkDerivation, base, hspec, text, text-format }:
+ mkDerivation {
+ pname = "fmt";
+ version = "0.0.0.2";
+ sha256 = "8cf2554099987e09090d8b7ac084ff1b389c934e3de1cc99c0f29d754ff0a20a";
+ libraryHaskellDepends = [ base text text-format ];
+ testHaskellDepends = [ base hspec text ];
+ homepage = "http://github.com/aelve/fmt";
+ description = "Nice formatting library";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"fn" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, directory
, filepath, hspec, http-types, text, unordered-containers, wai
@@ -63638,8 +65151,8 @@ self: {
}:
mkDerivation {
pname = "fold-debounce";
- version = "0.2.0.3";
- sha256 = "ca5eaa3ea7eea742c961df63249920021824a949c879053ff34bdeef4fb7a7af";
+ version = "0.2.0.4";
+ sha256 = "429702d10061c9c518a119ece8d3bc890feb124a524a3b6a5cdd31a17bcca67a";
libraryHaskellDepends = [
base data-default-class stm stm-delay time
];
@@ -64019,6 +65532,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "forest" = callPackage
+ ({ mkDerivation, aeson, base, bifunctors, deepseq, hashable
+ , profunctors, semigroupoids
+ }:
+ mkDerivation {
+ pname = "forest";
+ version = "0.1";
+ sha256 = "4de243b4eddddc534881617c6335e0658496ad67c2ebc65ba148b2965fe64460";
+ libraryHaskellDepends = [
+ aeson base bifunctors deepseq hashable profunctors semigroupoids
+ ];
+ homepage = "https://github.com/duairc/forest";
+ description = "Tree and Forest types";
+ license = stdenv.lib.licenses.mpl20;
+ }) {};
+
"forger" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -64130,8 +65659,8 @@ self: {
}:
mkDerivation {
pname = "formatting";
- version = "6.2.3";
- sha256 = "81eaab0d9a6a3a402344c1a97e54eccca2c4efd795e376e87de38f699d1c79bc";
+ version = "6.2.4";
+ sha256 = "432db74037d3bc326ab70e6e033502f818d9694535dbfc4c949cb50f72f33367";
libraryHaskellDepends = [
base clock old-locale scientific text text-format time
];
@@ -64269,8 +65798,8 @@ self: {
}:
mkDerivation {
pname = "foscam-directory";
- version = "0.0.7";
- sha256 = "ae30ec2b2a5f737436d4438ed1071a549a0d37bbf8871014aabe702046382312";
+ version = "0.0.8";
+ sha256 = "0b5ba1bd30d081d5ce32beb92047e10978eb2050489317516d26b3a87061bb66";
libraryHaskellDepends = [
base directory foscam-filename lens pretty trifecta utf8-string
];
@@ -64311,8 +65840,8 @@ self: {
}:
mkDerivation {
pname = "foscam-sort";
- version = "0.0.2";
- sha256 = "a1f76b3c3772098a7d843e955e84e4e6d41d23c197522eed23baa402de724145";
+ version = "0.0.3";
+ sha256 = "dd248dd26bb9ab9da3c8ce88c53a268e869b0118817f1a3ee27a5d7ad7790a52";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -64338,8 +65867,10 @@ self: {
}:
mkDerivation {
pname = "foundation";
- version = "0.0.1";
- sha256 = "d2db56431c37247352d2497e1a782197434f02269767584cfebbb740fde69730";
+ version = "0.0.2";
+ sha256 = "d879240154104273197249b4fbd2bd6d6ad9739166a8a75e9484bf87b6d9388f";
+ revision = "1";
+ editedCabalFile = "171bd233fb790408501779243fdcbc2659911e55e39067efb80254bbcc3781e4";
libraryHaskellDepends = [ base ghc-prim ];
testHaskellDepends = [
base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -64923,8 +66454,8 @@ self: {
}:
mkDerivation {
pname = "freer";
- version = "0.2.3.0";
- sha256 = "e0ef288ad5c8fc5b1ab7a50413e435648251575bb6803d41374d702fc5ad44b8";
+ version = "0.2.4.1";
+ sha256 = "cb01c6609c789d363fbd72df110010cfda57c6b16a8f9d5f1ae02780f764c1d9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base ];
@@ -65048,16 +66579,19 @@ self: {
}) {};
"friday" = callPackage
- ({ mkDerivation, base, convertible, deepseq, primitive, QuickCheck
- , ratio-int, test-framework, test-framework-quickcheck2
+ ({ mkDerivation, base, containers, convertible, deepseq, primitive
+ , QuickCheck, ratio-int, test-framework, test-framework-quickcheck2
, transformers, vector
}:
mkDerivation {
pname = "friday";
- version = "0.2.2.0";
- sha256 = "d9a59b716eec813d6108d535b2a180d51f152cb04103670535a7ade7e1ab8833";
+ version = "0.2.3.1";
+ sha256 = "0827492c1a6116baa5c4866539a4cfa0f6d81bf31f6573616bf5ac4484199613";
+ revision = "1";
+ editedCabalFile = "a8b4d38b593d866bebbdf141273ce70d2af8ca3351af86ea334dd5bce9252e58";
libraryHaskellDepends = [
- base convertible deepseq primitive ratio-int transformers vector
+ base containers convertible deepseq primitive ratio-int
+ transformers vector
];
testHaskellDepends = [
base QuickCheck test-framework test-framework-quickcheck2 vector
@@ -65137,6 +66671,8 @@ self: {
pname = "frisby";
version = "0.2";
sha256 = "a3389559849cfc3284923d9b543897abc924c5c076a383890a6a8f21cf4d5247";
+ revision = "1";
+ editedCabalFile = "12db65dfa550e3fb99cf8924ebf71c9308465391ee91a897741fdbcca65fe1c6";
libraryHaskellDepends = [ array base containers mtl ];
homepage = "http://repetae.net/computer/frisby/";
description = "Linear time composable parser for PEG grammars";
@@ -65147,8 +66683,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";
@@ -65970,8 +67506,8 @@ self: {
({ mkDerivation, base, cmdargs, directory, old-time, process }:
mkDerivation {
pname = "fuzzytime";
- version = "0.7.7";
- sha256 = "f98a572c199ad3c5cc9232e83df33b22bf90fd46c48d264e100fa411e7f7cb9b";
+ version = "0.7.8";
+ sha256 = "805ae4943fb04808e5e582919235a8e0f61ffc0878fbce41cea29d2609822a1c";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base ];
@@ -66032,8 +67568,8 @@ self: {
homepage = "https://github.com/ziocroc/FWGL";
description = "FWGL GHCJS backend";
license = stdenv.lib.licenses.bsd3;
- broken = true;
- }) {ghcjs-base = null;};
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
"g-npm" = callPackage
({ mkDerivation, base, HTTP, json }:
@@ -66854,8 +68390,8 @@ self: {
({ mkDerivation, base, ghc-prim, template-haskell }:
mkDerivation {
pname = "generics-sop";
- version = "0.2.2.0";
- sha256 = "3509e6fd5d9e1337691a88bb7941731f03cf93a42f12a6227dd1a5def9616220";
+ version = "0.2.3.0";
+ sha256 = "2e2c8291de476e103d1978c6ad569be05705fbc178ac89ec68d6a8e20672d377";
libraryHaskellDepends = [ base ghc-prim template-haskell ];
testHaskellDepends = [ base ];
description = "Generic Programming using True Sums of Products";
@@ -66866,10 +68402,8 @@ self: {
({ mkDerivation, base, generics-sop, lens }:
mkDerivation {
pname = "generics-sop-lens";
- version = "0.1.2.0";
- sha256 = "bafd04f0238e19d73da60ae018c1c82cb3e4be49990c61a6049dec2dafff40f6";
- revision = "1";
- editedCabalFile = "6ea2756e5e916c6a7d24f7d261bb0bf27925b8d8dd30332df4a053160596afcc";
+ version = "0.1.2.1";
+ sha256 = "4e49d4cc580d45e25e0abdeee12b1191ae75937af1c7ca03333979584a8a525c";
libraryHaskellDepends = [ base generics-sop lens ];
homepage = "https://github.com/phadej/generics-sop-lens#readme";
description = "Lenses for types in generics-sop";
@@ -66972,8 +68506,8 @@ self: {
({ mkDerivation, base, containers, mtl, template-haskell }:
mkDerivation {
pname = "genifunctors";
- version = "0.3";
- sha256 = "2520632580921ea35be3f5bfb94562abb935f8cc577e0bc8b41886eb5bf15a9a";
+ version = "0.4";
+ sha256 = "2df0f1cfa6861afa3eb5ecb1c87c405e30c07a843f588474902fa1531b848045";
libraryHaskellDepends = [ base containers mtl template-haskell ];
testHaskellDepends = [ base containers mtl template-haskell ];
homepage = "https://github.com/danr/genifunctors";
@@ -67061,6 +68595,8 @@ self: {
pname = "genvalidity";
version = "0.2.0.4";
sha256 = "dca8c978f6bedb08199042fa7001dc94143cc69bb3bfc0d4dc90346a19ca8e57";
+ revision = "2";
+ editedCabalFile = "6865bde6373f043b1411042b9837392bcc3662c1ed78fa1b53f905af3fbb3461";
libraryHaskellDepends = [ base QuickCheck validity ];
testHaskellDepends = [ base hspec QuickCheck ];
homepage = "https://github.com/NorfairKing/validity#readme";
@@ -67093,6 +68629,8 @@ self: {
pname = "genvalidity-hspec";
version = "0.2.0.5";
sha256 = "af4b3a7db29bc9cfe9f10de84256350de91a67d6d3676c8fb269dddf32bce62b";
+ revision = "1";
+ editedCabalFile = "34c42da21c1b3a5120be73a5b01f005d3c9278c8b45bce87b8d10b25d185db46";
libraryHaskellDepends = [
base genvalidity hspec QuickCheck validity
];
@@ -67144,15 +68682,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";
@@ -67945,14 +69483,14 @@ self: {
}:
mkDerivation {
pname = "ghc-prof";
- version = "1.0.0";
- sha256 = "58adf44ad70a30be50397c8ec85390596afa821dca40b92378d46e31e6fb0fe8";
+ version = "1.0.1";
+ sha256 = "3949eb1542f92ed99b38d4f2eb3efb6161fe3250a778b71e638af52463c23de4";
libraryHaskellDepends = [
attoparsec base containers scientific text time
];
testHaskellDepends = [
- attoparsec base directory filepath process tasty tasty-hunit
- temporary text
+ attoparsec base containers directory filepath process tasty
+ tasty-hunit temporary text
];
homepage = "https://github.com/maoe/ghc-prof";
description = "Library for parsing GHC time and allocation profiling reports";
@@ -68303,8 +69841,8 @@ self: {
}:
mkDerivation {
pname = "ghcid";
- version = "0.6.5";
- sha256 = "67f9f5c89d35f0d56d4d26bf72f25dd2f8794a67949449ef61739e84a316923c";
+ version = "0.6.6";
+ sha256 = "62f567852111da733b6feedbfb37ff561889e27af63d16df048f37a4bfeb6ab0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -68352,8 +69890,8 @@ self: {
({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }:
mkDerivation {
pname = "ghcjs-dom";
- version = "0.5.0.2";
- sha256 = "78b95464b0101d3ffe9d23452c738bdb924c7a3737121e2a938fde863627bd8e";
+ version = "0.7.0.4";
+ sha256 = "1c9e57e7de17179c2aca7c6a0417304fa2229b498431f1137dc0a606d8315bac";
libraryHaskellDepends = [
base ghcjs-dom-jsaddle text transformers
];
@@ -68382,8 +69920,8 @@ self: {
({ mkDerivation, jsaddle-dom }:
mkDerivation {
pname = "ghcjs-dom-jsaddle";
- version = "0.5.0.0";
- sha256 = "8886b7ee0f737b23139845d5dd5c56b79e891df15f632378a064f26d404bbda8";
+ version = "0.7.0.3";
+ sha256 = "3ec7c0973dfce18d77df9b6162c29c4af6ea2356da679510c034ae8c31a4c029";
libraryHaskellDepends = [ jsaddle-dom ];
doHaddock = false;
description = "DOM library that supports both GHCJS and GHC using jsaddle";
@@ -68395,8 +69933,8 @@ self: {
({ mkDerivation }:
mkDerivation {
pname = "ghcjs-dom-jsffi";
- version = "0.5.0.2";
- sha256 = "4e7042c09170af65a486a87a134d40519c1cecf663956349f26729490063d878";
+ version = "0.7.0.4";
+ sha256 = "2a44162bf30cb0ebee18b76db5831804add52d3a4bba4c183d0229b975c15619";
isLibrary = false;
isExecutable = false;
description = "DOM library using JSFFI and GHCJS";
@@ -68433,6 +69971,7 @@ self: {
homepage = "https://github.com/agocorona/ghcjs-hplay";
description = "Client-side web EDSL for transient nodes running in the web browser";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ghcjs-perch" = callPackage
@@ -68446,8 +69985,22 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "ghcjs-promise" = callPackage
+ ({ mkDerivation, base, ghcjs-base, protolude }:
+ mkDerivation {
+ pname = "ghcjs-promise";
+ version = "0.1.0.3";
+ sha256 = "2395a17260e27ac252df2a5968de8ee5f0cf55d970c2fbe6fb27b2ccf01af81b";
+ libraryHaskellDepends = [ base ghcjs-base protolude ];
+ homepage = "https://github.com/vwwv/ghcjs-promise";
+ description = "Bidirectional bidings to javascript's promise";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghcjs-websockets" = callPackage
- ({ mkDerivation, base, base64-bytestring, binary, bytestring, text
+ ({ mkDerivation, base, base64-bytestring, binary, bytestring
+ , ghcjs-base, text
}:
mkDerivation {
pname = "ghcjs-websockets";
@@ -68456,7 +70009,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";
@@ -68548,14 +70101,14 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) atk;};
- "gi-atk_2_0_6" = callPackage
+ "gi-atk_2_0_9" = callPackage
({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib
, gi-gobject, haskell-gi, haskell-gi-base, text, transformers
}:
mkDerivation {
pname = "gi-atk";
- version = "2.0.6";
- sha256 = "774a1cdc10424d51c91c37438866a6254bf1af4723a422e96b82fd6b28eeedb2";
+ version = "2.0.9";
+ sha256 = "246b50192e25a6f125cb51b2c57a38cb76702fe02c7b87b89e548851479598bf";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-glib gi-gobject haskell-gi-base text
@@ -68594,15 +70147,15 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;};
- "gi-cairo_1_0_6" = callPackage
+ "gi-cairo_1_0_9" = callPackage
({ mkDerivation, base, bytestring, Cabal, cairo, containers
, gobjectIntrospection, haskell-gi, haskell-gi-base, text
, transformers
}:
mkDerivation {
pname = "gi-cairo";
- version = "1.0.6";
- sha256 = "f47f69ac0a09baad360bc24fab8b46261884566e22c975fad2711ab03b537d77";
+ version = "1.0.9";
+ sha256 = "acdc06c2543aae4462dee525b7fb806fd974e58d3d1b3482167f5bde2eb14a99";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers haskell-gi-base text transformers
@@ -68642,15 +70195,15 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {gtk3 = pkgs.gnome3.gtk;};
- "gi-gdk_3_0_6" = callPackage
+ "gi-gdk_3_0_9" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
, haskell-gi, haskell-gi-base, text, transformers
}:
mkDerivation {
pname = "gi-gdk";
- version = "3.0.6";
- sha256 = "9c3c974dfa90533fda145d86494690e92c103bd18f32c1225a7a47098aaf6278";
+ version = "3.0.9";
+ sha256 = "6a908ed5be0a79c0d25a82ddcad4c910e2e65f756696141aaac970ac853fee22";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
@@ -68690,15 +70243,15 @@ self: {
}) {inherit (pkgs) gdk_pixbuf;
inherit (pkgs) gobjectIntrospection;};
- "gi-gdkpixbuf_2_0_6" = callPackage
+ "gi-gdkpixbuf_2_0_9" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
, gi-gio, gi-glib, gi-gobject, gobjectIntrospection, haskell-gi
, haskell-gi-base, text, transformers
}:
mkDerivation {
pname = "gi-gdkpixbuf";
- version = "2.0.6";
- sha256 = "f6901f27a610d675e2770144a47d549702619da6a6f3be3c79315c706aa6fa91";
+ version = "2.0.9";
+ sha256 = "880089ae75884e8e89b2ebba3d524c9f07864b37f3dc8475fea14ed18a01efb0";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-gio gi-glib gi-gobject
@@ -68738,15 +70291,15 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
- "gi-gio_2_0_6" = callPackage
+ "gi-gio_2_0_9" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
, gi-gobject, glib, gobjectIntrospection, haskell-gi
, haskell-gi-base, text, transformers
}:
mkDerivation {
pname = "gi-gio";
- version = "2.0.6";
- sha256 = "25f5c90a7549f5d0571e749f80b4ae782b3734575cb88dcc355776edf1e99779";
+ version = "2.0.9";
+ sha256 = "fb08fb617f7d845d8e6f50802ad6f30e6063ee71c05dc10da29f581227f16bb8";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-glib gi-gobject haskell-gi-base text
@@ -68768,8 +70321,8 @@ self: {
}:
mkDerivation {
pname = "gi-girepository";
- version = "1.0.6";
- sha256 = "dd9333861386a6dff7ee76d12c9e3faae4231a18abf482db2f24ad1b0ff67068";
+ version = "1.0.9";
+ sha256 = "773fc9bb6d55006f12f68fdb4a68edc25fdc74448549a819ecb4f88a2f0b0efb";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-gobject haskell-gi-base text
@@ -68780,6 +70333,7 @@ self: {
homepage = "https://github.com/haskell-gi/haskell-gi";
description = "GIRepository (gobject-introspection) bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) gobjectIntrospection;};
"gi-glib" = callPackage
@@ -68803,15 +70357,15 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
- "gi-glib_2_0_6" = callPackage
+ "gi-glib_2_0_9" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, glib
, gobjectIntrospection, haskell-gi, haskell-gi-base, text
, transformers
}:
mkDerivation {
pname = "gi-glib";
- version = "2.0.6";
- sha256 = "51d0f914fad2d0f36c19d0a4e39c5908ed106d5d400e9f04ded6ee36a26eabc5";
+ version = "2.0.9";
+ sha256 = "1b295151c9d5f83c13c01204f67c10d071173377a67d6c1d4e8093a253c86555";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers haskell-gi-base text transformers
@@ -68846,15 +70400,15 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
- "gi-gobject_2_0_6" = callPackage
+ "gi-gobject_2_0_9" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
, gobjectIntrospection, haskell-gi, haskell-gi-base, text
, transformers
}:
mkDerivation {
pname = "gi-gobject";
- version = "2.0.6";
- sha256 = "2f2731932c3168e6239b206de266426e5f43a8e2ad2ed78e06fca97b0712e22c";
+ version = "2.0.9";
+ sha256 = "8525c707a7f6569ac57da4c16fc5c2ea174f4282c8436ba789d36d22cdbe7f1a";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-glib haskell-gi-base text
@@ -68876,8 +70430,8 @@ self: {
}:
mkDerivation {
pname = "gi-gst";
- version = "1.0.6";
- sha256 = "5cc2ba47575c854bbc66ea37941c9efc53a962e3a611b9ca31d505ae9e9505ed";
+ version = "1.0.9";
+ sha256 = "4ed3756052c41b4198d7c3cfd5d179f2d0f49d2a43d20f2be320d85c0a61b22e";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-glib gi-gobject haskell-gi-base text
@@ -68898,8 +70452,8 @@ self: {
}:
mkDerivation {
pname = "gi-gstaudio";
- version = "1.0.6";
- sha256 = "470c68fd68c09df37d12efe93ed250024dea0cd0948eac578b8d1f6c6e24996d";
+ version = "1.0.9";
+ sha256 = "c6021390e020c2d5c21b003bffb6340059feca7ea416fcad60d5c6bb0c0841c8";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
@@ -68922,8 +70476,8 @@ self: {
}:
mkDerivation {
pname = "gi-gstbase";
- version = "1.0.6";
- sha256 = "9130496376c4bbaa230b21a230fd3a4decd971328c9e6b6b90d4d9e78ebd97e2";
+ version = "1.0.9";
+ sha256 = "5e86bc44fcc16d4009a5cd881169d29abffbd08e8ff0a07098b9e54729137e5d";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-glib gi-gobject gi-gst
@@ -68946,8 +70500,8 @@ self: {
}:
mkDerivation {
pname = "gi-gstvideo";
- version = "1.0.6";
- sha256 = "9bd777b6f49d516b63f550ff59c0a32768bf92f097ebec903f478ea3652872ae";
+ version = "1.0.9";
+ sha256 = "1d36e8f907c6ece57c1db76b9a3ebf866b2ce57f9312c0153ab2e1259356c6ab";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
@@ -68986,15 +70540,15 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {gtk3 = pkgs.gnome3.gtk;};
- "gi-gtk_3_0_6" = callPackage
+ "gi-gtk_3_0_9" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
, gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
, gi-pango, gtk3, haskell-gi, haskell-gi-base, text, transformers
}:
mkDerivation {
pname = "gi-gtk";
- version = "3.0.6";
- sha256 = "85a001a538a0657b548a5729c2b17ea2265d39b83af718069874eef77202574c";
+ version = "3.0.9";
+ sha256 = "5b7b6d064b97066c058288a366e37dffa0b330a4a1d15f3018ed46d2b3a877f3";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
@@ -69017,8 +70571,8 @@ self: {
}:
mkDerivation {
pname = "gi-gtk-hs";
- version = "0.3.1.0";
- sha256 = "9dbf08bcecc1dfc3cee64073632410a6ece816ffa51fb6326b2c8c7c1ca44742";
+ version = "0.3.4.0";
+ sha256 = "2e7ce60dded6d70a4598001469894d1f415bc28d600e5a6ac9f4558c624200e4";
libraryHaskellDepends = [
base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject
gi-gtk haskell-gi-base mtl text transformers
@@ -69036,8 +70590,8 @@ self: {
}:
mkDerivation {
pname = "gi-gtkosxapplication";
- version = "2.0.6";
- sha256 = "e9ad5632649a9b3bb6452116a110e4aef2a332b9091bce411f9c169ade9b5141";
+ version = "2.0.9";
+ sha256 = "d4661ae492916d4fc16f34b234e6c22917f3fc8bf37aef0ae6f2dd17123b7834";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-gdkpixbuf gi-gobject gi-gtk
@@ -69059,8 +70613,8 @@ self: {
}:
mkDerivation {
pname = "gi-gtksource";
- version = "3.0.6";
- sha256 = "3d97242b370c3937ec34a969548ad968c9b8cc3176a665347adb5014bf2a87b7";
+ version = "3.0.9";
+ sha256 = "3ba4e8d8b446c4c37248748535951e31803140a69cf53a69bdb0e68e254b5090";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
@@ -69096,14 +70650,14 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {javascriptcoregtk = null; inherit (pkgs) webkitgtk;};
- "gi-javascriptcore_4_0_6" = callPackage
+ "gi-javascriptcore_4_0_9" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
, haskell-gi-base, javascriptcoregtk, text, transformers, webkitgtk
}:
mkDerivation {
pname = "gi-javascriptcore";
- version = "4.0.6";
- sha256 = "50e289b13b10d4a7d1724a8bc5cab500611a0453d55743ec7decb91099c24146";
+ version = "4.0.9";
+ sha256 = "9acd59b75799a572919c3a65541de73296b6f33f54572902c91eeb93ee7a5375";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers haskell-gi-base text transformers
@@ -69124,8 +70678,8 @@ self: {
}:
mkDerivation {
pname = "gi-notify";
- version = "0.7.6";
- sha256 = "285151350c4354d466c31cff6479913583803913d153d276c0dc76681d66656c";
+ version = "0.7.9";
+ sha256 = "7c87c5003d96303398ccca3c2e256d409c8853a7007158e052469ac650aa0221";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-gdkpixbuf gi-glib gi-gobject
@@ -69166,15 +70720,15 @@ self: {
}) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;
inherit (pkgs.gnome2) pango;};
- "gi-pango_1_0_6" = callPackage
+ "gi-pango_1_0_9" = callPackage
({ mkDerivation, base, bytestring, Cabal, cairo, containers
, gi-glib, gi-gobject, gobjectIntrospection, haskell-gi
, haskell-gi-base, pango, text, transformers
}:
mkDerivation {
pname = "gi-pango";
- version = "1.0.6";
- sha256 = "662c5e9df26fbe0e8238d033be49101fc78a0c6c802434f2de23f7c0c3d97c02";
+ version = "1.0.9";
+ sha256 = "2410b013c336f70b0711aa52b2ff9145945b5fd4b246b09703adac86ca00df1b";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-glib gi-gobject haskell-gi-base text
@@ -69201,8 +70755,8 @@ self: {
}:
mkDerivation {
pname = "gi-pangocairo";
- version = "1.0.6";
- sha256 = "41409f273ad2a43e2965ee572814c1586c6f9fd25d8f41597ad4a8ff275d238d";
+ version = "1.0.9";
+ sha256 = "7c9e3c78703852ab5e879f8b3ecbb3e6898389d10d1458e3b6341ada252464a4";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-cairo gi-glib gi-gobject gi-pango
@@ -69223,8 +70777,8 @@ self: {
}:
mkDerivation {
pname = "gi-poppler";
- version = "0.18.6";
- sha256 = "9c803e86d513a49dbcc70841c52bd0bc1f2c283f7d953c5b563e1ec04f20ae71";
+ version = "0.18.9";
+ sha256 = "6566f9698ff21dc0eac6b8fb79db191ad48044b424a8d7a2b931ca69a1d517a8";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-cairo gi-gio gi-glib gi-gobject
@@ -69258,15 +70812,15 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs.gnome2) libsoup;};
- "gi-soup_2_4_6" = callPackage
+ "gi-soup_2_4_9" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
, gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsoup, text
, transformers
}:
mkDerivation {
pname = "gi-soup";
- version = "2.4.6";
- sha256 = "ecca7b24c9f45b0446a5f2aa43d1424c9e9c05fbb93d57e74d486729c4052dcd";
+ version = "2.4.9";
+ sha256 = "e4e45ac1d877e1334ee6b57154422dad87e3e03c2f453f34c05e75aafb7a5daa";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-gio gi-glib gi-gobject
@@ -69287,8 +70841,8 @@ self: {
}:
mkDerivation {
pname = "gi-vte";
- version = "2.91.7";
- sha256 = "72d63ab29583c73c9978515ff840061f138da27799ffe9e2f7c981380317ce86";
+ version = "2.91.10";
+ sha256 = "8da2e88e7b00ac3f7ab1523836415a53cb92f3c6da576d48fc9fd363f88b3bf0";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject
@@ -69325,7 +70879,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {webkit = null;};
- "gi-webkit_3_0_6" = callPackage
+ "gi-webkit_3_0_9" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
, gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
, gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
@@ -69333,8 +70887,8 @@ self: {
}:
mkDerivation {
pname = "gi-webkit";
- version = "3.0.6";
- sha256 = "b6f97ee8164291fadb69e8aa1e087e9d07250a6d9ed5614629448f96b7044610";
+ version = "3.0.9";
+ sha256 = "5cd7b6d244b3aeb9eba3f437d40e3b3fbc2fcb253d84d1d5e1e105e7deefc976";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
@@ -69357,8 +70911,8 @@ self: {
}:
mkDerivation {
pname = "gi-webkit2";
- version = "4.0.6";
- sha256 = "6aa7e0c02ce4ff6686ee71ea956f5fd040d459a5a99957a066b49d938d00f9da";
+ version = "4.0.9";
+ sha256 = "982635e1c9f7f726100ed980eb12f7bee523d4b8aae14889c10024409f112be5";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib
@@ -69377,24 +70931,25 @@ self: {
"gi-webkit2webextension" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject
, gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
- , text, transformers, webkit2gtk-web-extension
+ , text, transformers, webkit2gtk-web-extension, webkitgtk
}:
mkDerivation {
pname = "gi-webkit2webextension";
- version = "4.0.6";
- sha256 = "c3ad70065775cb53c8164a4b9a573a8dfee535e5d0552e91c3cbc93e4b691076";
+ version = "4.0.9";
+ sha256 = "df4bac3557c8b29c1fd6b8e7da859a394eef2df5bed12dab5491a57b585835ac";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-gobject gi-gtk gi-javascriptcore
gi-soup haskell-gi-base text transformers
];
- libraryPkgconfigDepends = [ webkit2gtk-web-extension ];
+ libraryPkgconfigDepends = [ webkit2gtk-web-extension webkitgtk ];
doHaddock = false;
+ preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0'';
homepage = "https://github.com/haskell-gi/haskell-gi";
description = "WebKit2-WebExtension bindings";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {webkit2gtk-web-extension = null;};
+ }) {webkit2gtk-web-extension = null; inherit (pkgs) webkitgtk;};
"giak" = callPackage
({ mkDerivation, async, base, bytestring, Cabal, containers
@@ -69437,8 +70992,8 @@ self: {
}:
mkDerivation {
pname = "ginger";
- version = "0.3.5.3";
- sha256 = "2999e909ccd45cee6ce517a74fa2ad8f3f06611ec9945c1c0b04f114ed6cbf26";
+ version = "0.3.9.1";
+ sha256 = "28f26b37cd2daedd841516f0e538877f84932a9813096a34e8c820de44c0323c";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -69535,6 +71090,8 @@ self: {
pname = "giphy-api";
version = "0.4.0.0";
sha256 = "bb2952f54232cead3e66350b514ca31aac511bf172be45115b98dd8777859876";
+ revision = "2";
+ editedCabalFile = "bf615e33d6be695e26434f8cb6747bb91be136093e0181eb85efe415c689d9f5";
libraryHaskellDepends = [
aeson base containers http-api-data http-client http-client-tls
microlens microlens-th mtl network-uri servant servant-client text
@@ -69550,7 +71107,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "giphy-api_0_5_0_0" = callPackage
+ "giphy-api_0_5_2_0" = callPackage
({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
, directory, hspec, http-api-data, http-client, http-client-tls
, lens, microlens, microlens-th, mtl, network-uri, servant
@@ -69558,8 +71115,8 @@ self: {
}:
mkDerivation {
pname = "giphy-api";
- version = "0.5.0.0";
- sha256 = "12ad1a1080348dfd4033d4c97e5b2a7c3d3da8d342c78c520a5d51396474b16e";
+ version = "0.5.2.0";
+ sha256 = "447111d3fa32a76ffc50b26fbec59d9e9a097d7e2facb04a7a272cb9abd97ce9";
libraryHaskellDepends = [
aeson base containers http-api-data http-client http-client-tls
microlens microlens-th mtl network-uri servant servant-client text
@@ -69644,7 +71201,7 @@ self: {
, clientsession, concurrent-output, conduit, conduit-extra
, containers, crypto-api, cryptonite, curl, data-default, DAV, dbus
, directory, disk-free-space, dlist, dns, edit-distance, esqueleto
- , exceptions, fdo-notify, feed, filepath, git, gnupg, gnutls
+ , exceptions, fdo-notify, feed, filepath, free, git, gnupg, gnutls
, hinotify, hslogger, http-client, http-conduit, http-types, IfElse
, lsof, magic, MissingH, monad-control, monad-logger, mountpoints
, mtl, network, network-info, network-multicast
@@ -69652,16 +71209,17 @@ self: {
, optparse-applicative, path-pieces, perl, persistent
, persistent-sqlite, persistent-template, process, QuickCheck
, random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi
- , securemem, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck
- , tasty-rerun, template-haskell, text, time, torrent, transformers
- , unix, unix-compat, unordered-containers, utf8-string, uuid, wai
- , wai-extra, warp, warp-tls, wget, which, xml-types, yesod
- , yesod-core, yesod-default, yesod-form, yesod-static
+ , securemem, shakespeare, socks, stm, stm-chans, tasty, tasty-hunit
+ , tasty-quickcheck, tasty-rerun, template-haskell, text, time
+ , torrent, transformers, unix, unix-compat, unordered-containers
+ , utf8-string, uuid, wai, wai-extra, warp, warp-tls, wget, which
+ , xml-types, yesod, yesod-core, yesod-default, yesod-form
+ , yesod-static
}:
mkDerivation {
pname = "git-annex";
- version = "6.20161031";
- sha256 = "6de3751f361d730e4a69106443b747a45e27aaeabf51ea999c41bd92fd2c71ce";
+ version = "6.20161210";
+ sha256 = "b568cceda32908e7cd66b34181811d4da3d3197d71009eac20c1c4c4379f6381";
configureFlags = [
"-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
"-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -69679,17 +71237,17 @@ self: {
case-insensitive clientsession concurrent-output conduit
conduit-extra containers crypto-api cryptonite data-default DAV
dbus directory disk-free-space dlist dns edit-distance esqueleto
- exceptions fdo-notify feed filepath gnutls hinotify hslogger
+ exceptions fdo-notify feed filepath free gnutls hinotify hslogger
http-client http-conduit http-types IfElse magic MissingH
monad-control monad-logger mountpoints mtl network network-info
network-multicast network-protocol-xmpp network-uri old-locale
optparse-applicative path-pieces persistent persistent-sqlite
persistent-template process QuickCheck random regex-tdfa resourcet
- SafeSemaphore sandi securemem shakespeare stm tasty tasty-hunit
- tasty-quickcheck tasty-rerun template-haskell text time torrent
- transformers unix unix-compat unordered-containers utf8-string uuid
- wai wai-extra warp warp-tls xml-types yesod yesod-core
- yesod-default yesod-form yesod-static
+ SafeSemaphore sandi securemem shakespeare socks stm stm-chans tasty
+ tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time
+ torrent transformers unix unix-compat unordered-containers
+ utf8-string uuid wai wai-extra warp warp-tls xml-types yesod
+ yesod-core yesod-default yesod-form yesod-static
];
executableSystemDepends = [
bup curl git gnupg lsof openssh perl rsync wget which
@@ -69846,6 +71404,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "git-mediate" = callPackage
+ ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory
+ , filepath, mtl, optparse-applicative, process, unix
+ }:
+ mkDerivation {
+ pname = "git-mediate";
+ version = "1.0";
+ sha256 = "0ec4f74b30997f05059ac4dc1433a3618cd40240bbb93b6ec434d90f40390790";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ ansi-terminal base base-compat Diff directory filepath mtl
+ optparse-applicative process unix
+ ];
+ homepage = "https://github.com/ElastiLotem/git-mediate";
+ description = "Remove trivial conflict markers in a git repository";
+ license = stdenv.lib.licenses.gpl2;
+ }) {};
+
"git-monitor" = callPackage
({ mkDerivation, base, bytestring, containers, directory, filepath
, gitlib, gitlib-libgit2, lifted-async, logging, old-locale
@@ -69887,17 +71464,22 @@ self: {
}) {};
"git-repair" = callPackage
- ({ mkDerivation, async, base, bytestring, containers, directory
- , exceptions, filepath, hslogger, IfElse, MissingH, mtl, network
- , network-uri, optparse-applicative, process, QuickCheck, text
- , time, transformers, unix, unix-compat, utf8-string
+ ({ mkDerivation, async, base, bytestring, Cabal, containers
+ , data-default, directory, exceptions, filepath, hslogger, IfElse
+ , MissingH, mtl, network, network-uri, optparse-applicative
+ , process, QuickCheck, text, time, transformers, unix, unix-compat
+ , utf8-string
}:
mkDerivation {
pname = "git-repair";
- version = "1.20151215";
- sha256 = "e1e5756f7ffba86a36abcdc296e0730b2a74e0f5e7711b0b6b89a09eb6f10463";
+ version = "1.20161118";
+ sha256 = "d24c576c4a033f051d1f7a76a0e203ba00c9844bad1236d86974a136ebd25a6e";
isLibrary = false;
isExecutable = true;
+ setupHaskellDepends = [
+ base bytestring Cabal data-default directory exceptions filepath
+ hslogger IfElse MissingH mtl process unix unix-compat
+ ];
executableHaskellDepends = [
async base bytestring containers directory exceptions filepath
hslogger IfElse MissingH mtl network network-uri
@@ -70054,7 +71636,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
@@ -70062,11 +71644,14 @@ self: {
}:
mkDerivation {
pname = "github-backup";
- version = "1.20160922";
- sha256 = "ea8036c3d9e40057bcf6c26fe925606bce8769277f0d2cfa394fd23a73df4242";
+ 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
@@ -70104,8 +71689,8 @@ self: {
}:
mkDerivation {
pname = "github-release";
- version = "0.1.9";
- sha256 = "df10ca8f6c8dd97e3dbf6f173a63498a674f7564d727c5647782ec029bd4d1ef";
+ version = "0.2.0";
+ sha256 = "847d33683b290360fdaa1a42dcbe5767920392e86abc357973d1e1afd2fac6c8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -70119,6 +71704,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "github-tools" = callPackage
+ ({ mkDerivation, base, bytestring, containers, exceptions, github
+ , groom, html, http-client, http-client-tls, monad-parallel
+ , tabular, tagsoup, text, time, vector
+ }:
+ mkDerivation {
+ pname = "github-tools";
+ version = "0.1.1";
+ sha256 = "d6aa2c877079bf89188d8bbbb006df135e481ce047ba26be4c8f7566d44257ad";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bytestring containers exceptions github groom html http-client
+ http-client-tls monad-parallel tabular tagsoup text time vector
+ ];
+ homepage = "https://toktok.github.io/";
+ description = "Various Github helper utilities";
+ license = stdenv.lib.licenses.agpl3;
+ }) {};
+
"github-types" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, hspec, hspec-smallcheck
, http-conduit, smallcheck, text, time, unordered-containers
@@ -70214,8 +71819,8 @@ self: {
}:
mkDerivation {
pname = "gitit";
- version = "0.12.1.1";
- sha256 = "c95f78a9d3060c6695c0d8f3f6e2cc01f64d0b535d8c6c3e591a9fd802d534a5";
+ version = "0.12.2";
+ sha256 = "160a928d992847823ab11982fa6465a4d80e59ce2a45e54e8a5e1838aba22b78";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -70544,15 +72149,39 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "glabrous_0_2_0_1" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+ , cereal, cereal-text, directory, either, hspec, text
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "glabrous";
+ version = "0.2.0.1";
+ sha256 = "cb2f9a9f60395f0abc062311a7cbea8505ecd546f1cb71e51b01291aea323327";
+ libraryHaskellDepends = [
+ aeson aeson-pretty attoparsec base bytestring cereal cereal-text
+ either text unordered-containers
+ ];
+ testHaskellDepends = [
+ base directory either hspec text unordered-containers
+ ];
+ homepage = "https://github.com/MichelBoucey/glabrous";
+ description = "A template DSL library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"glade" = callPackage
- ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, libglade }:
+ ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools
+ , libglade
+ }:
mkDerivation {
pname = "glade";
- version = "0.12.5.0";
- sha256 = "79eea09019429ba552b49ae11cf287577937234bd54713aa82ecf3968b3f7435";
+ version = "0.13.1";
+ sha256 = "6bb9c72052085c83c1810f1389875d260b9d65f1ea4c4e64022270291ae9be45";
+ setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
libraryHaskellDepends = [ base glib gtk ];
libraryPkgconfigDepends = [ libglade ];
- libraryToolDepends = [ gtk2hs-buildtools ];
homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the glade library";
license = stdenv.lib.licenses.lgpl21;
@@ -70690,24 +72319,24 @@ self: {
}) {};
"glirc" = callPackage
- ({ mkDerivation, async, attoparsec, base, bytestring, Cabal
- , config-value, containers, data-default-class, directory, filepath
- , gitrev, hashable, hookup, HsOpenSSL, HUnit, irc-core
- , kan-extensions, lens, memory, network, process, regex-tdfa, socks
- , split, stm, text, time, transformers, unix, unordered-containers
- , vector, vty
+ ({ mkDerivation, async, attoparsec, base, base64-bytestring
+ , bytestring, Cabal, config-value, containers, data-default-class
+ , directory, filepath, gitrev, hashable, hookup, HsOpenSSL, HUnit
+ , irc-core, kan-extensions, lens, network, process, regex-tdfa
+ , socks, split, stm, text, time, transformers, unix
+ , unordered-containers, vector, vty
}:
mkDerivation {
pname = "glirc";
- version = "2.20.1.1";
- sha256 = "63f0f8d82ea8d2f90103faf9ccd9fa301275b9400bbf1c3db62f8c51cbfa40fe";
+ version = "2.20.2";
+ sha256 = "acefc316a6075dbeb2fa95bf1ee99a8e4c3097eaf5be9273d676719d07a94b00";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath ];
libraryHaskellDepends = [
- async attoparsec base bytestring config-value containers
- data-default-class directory filepath gitrev hashable hookup
- HsOpenSSL irc-core kan-extensions lens memory network process
+ async attoparsec base base64-bytestring bytestring config-value
+ containers data-default-class directory filepath gitrev hashable
+ hookup HsOpenSSL irc-core kan-extensions lens network process
regex-tdfa socks split stm text time transformers unix
unordered-containers vector vty
];
@@ -70932,20 +72561,19 @@ self: {
}) {};
"gloss-examples" = callPackage
- ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim
- , GLFW-b, gloss, gloss-algorithms, gloss-raster, gloss-rendering
- , random, repa, repa-algorithms, repa-io, vector
+ ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim, gloss
+ , gloss-algorithms, gloss-raster, random, repa, repa-algorithms
+ , repa-io, vector
}:
mkDerivation {
pname = "gloss-examples";
- version = "1.10.2.3";
- sha256 = "0d25bd4a7ae5f69f68175476647d7d2dbfa987ebe33419166ff312b88c527df3";
+ version = "1.10.2.4";
+ sha256 = "ef1adf43066757d82adc16b4bde4f19a73653b837112ca41713ad16e230cac62";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base bmp bytestring containers ghc-prim GLFW-b gloss
- gloss-algorithms gloss-raster gloss-rendering random repa
- repa-algorithms repa-io vector
+ base bmp bytestring containers ghc-prim gloss gloss-algorithms
+ gloss-raster random repa repa-algorithms repa-io vector
];
homepage = "http://gloss.ouroborus.net";
description = "Examples using the gloss library";
@@ -70990,8 +72618,8 @@ self: {
}:
mkDerivation {
pname = "gloss-raster";
- version = "1.10.2.3";
- sha256 = "28485da7f90e37c778acba0232f3bba47a796dc62ed9cc02ebc43c7ddd7875b1";
+ version = "1.10.2.4";
+ sha256 = "f9875344822a1bbb4b937605e1b1483b25559c186db94033c97117f6148cdef5";
libraryHaskellDepends = [
base containers ghc-prim gloss gloss-rendering repa
];
@@ -71020,8 +72648,8 @@ self: {
({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }:
mkDerivation {
pname = "gloss-rendering";
- version = "1.10.3.3";
- sha256 = "ca559268107524c8ac73f7bd4ea164e26fe5426bff49b457276ff04fce872567";
+ version = "1.10.3.5";
+ sha256 = "00c68518b2eb62f086257238034a18065faa7939369a5b2986c2f461e6a80d73";
libraryHaskellDepends = [
base bmp bytestring containers GLUT OpenGL
];
@@ -71281,18 +72909,18 @@ self: {
"gnss-converters" = callPackage
({ mkDerivation, base, basic-prelude, binary-conduit, bytestring
, conduit, conduit-extra, exceptions, extra, HUnit-approx, lens
- , monad-control, mtl, random, resourcet, rtcm, sbp, tasty
- , tasty-hunit, time, transformers-base, unordered-containers
+ , monad-control, mtl, resourcet, rtcm, sbp, tasty, tasty-hunit
+ , time, transformers-base, unordered-containers
}:
mkDerivation {
pname = "gnss-converters";
- version = "0.1.18";
- sha256 = "4c86a04bef399c6d73217b6ea4953d8c90224d844b65453b8a18e3749ee1f86a";
+ version = "0.2.1";
+ sha256 = "47732c64bb1091ac79386d142ba790cf809b4390244c710d3a5c246feb24e4c2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base basic-prelude conduit-extra exceptions extra lens
- monad-control mtl random resourcet rtcm sbp time transformers-base
+ monad-control mtl resourcet rtcm sbp time transformers-base
unordered-containers
];
executableHaskellDepends = [
@@ -72318,6 +73946,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Cloud Container Builder SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-core" = callPackage
@@ -72679,6 +74308,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
@@ -72991,6 +74621,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
@@ -73178,6 +74809,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Cloud Machine Learning SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-monitoring" = callPackage
@@ -73590,6 +75222,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Cloud RuntimeConfig SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-safebrowsing" = callPackage
@@ -73602,6 +75235,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Safe Browsing APIs SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-script" = callPackage
@@ -73639,6 +75273,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Service Control SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-servicemanagement" = callPackage
@@ -73651,6 +75286,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Service Management SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-sheets" = callPackage
@@ -74185,8 +75821,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
];
@@ -74308,8 +75944,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
@@ -74327,8 +75963,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
@@ -74346,8 +75982,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
@@ -74371,8 +76007,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 = [
@@ -74394,8 +76030,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
@@ -74405,6 +76041,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
@@ -74412,8 +76066,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
@@ -74434,8 +76088,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
@@ -74455,8 +76109,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
@@ -74470,19 +76124,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";
@@ -75730,8 +77382,8 @@ self: {
}:
mkDerivation {
pname = "gruff";
- version = "0.3.4";
- sha256 = "10ec0d3c842911815c204025a98642dc70e26d5dcb5c07c143277baad45d4947";
+ version = "0.4";
+ sha256 = "ae08f3b01988d5a7c3761ad43df355c5148b3511693eb86a83ab7879ccbcba0b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base ruff ];
@@ -75750,8 +77402,8 @@ self: {
}:
mkDerivation {
pname = "gruff-examples";
- version = "0.3.1";
- sha256 = "e7fda6673da47266fcf7f37ecddc6b643e6bd5fbfefac4df2b6ec6fe115acf0b";
+ version = "0.4";
+ sha256 = "65c48c95c591f8fbda19e0dd19c74af1caaea979ecbdd5a4d8f793eba4d65482";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -75832,6 +77484,40 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "gssapi" = callPackage
+ ({ mkDerivation, base, bytestring, gssapi_krb5, krb5, resourcet
+ , transformers
+ }:
+ mkDerivation {
+ pname = "gssapi";
+ version = "0.1.0.0";
+ sha256 = "72b7c687414bb370ff6a857ddbcfe00a804d3f2e4ca563c0783a68f6f875b0fd";
+ libraryHaskellDepends = [ base bytestring resourcet transformers ];
+ librarySystemDepends = [ gssapi_krb5 krb5 ];
+ 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
+ ({ mkDerivation, base, base64-bytestring, bytestring
+ , case-insensitive, gssapi, http-types, vault, wai, wai-extra
+ }:
+ mkDerivation {
+ pname = "gssapi-wai";
+ version = "0.1.0.0";
+ sha256 = "1a2b844a611f4615d948baa7253099f5acab01529005d522b46db839833f371f";
+ libraryHaskellDepends = [
+ base base64-bytestring bytestring case-insensitive gssapi
+ http-types vault wai wai-extra
+ ];
+ 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
({ mkDerivation, array, base, bytestring, Cabal, directory, glib
, gst_plugins_base, gstreamer, gtk2hs-buildtools, mtl
@@ -76435,6 +78121,31 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "h-reversi" = callPackage
+ ({ mkDerivation, base, blank-canvas, containers, hspec, QuickCheck
+ , split, stm, text
+ }:
+ mkDerivation {
+ pname = "h-reversi";
+ version = "0.1.0.3";
+ sha256 = "919633a7c253004c166b06a1b390581519f3164a2e9ca83ac4cbffe178392ee2";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base blank-canvas containers split stm text
+ ];
+ executableHaskellDepends = [
+ base blank-canvas containers split stm text
+ ];
+ testHaskellDepends = [
+ base containers hspec QuickCheck split text
+ ];
+ homepage = "https://github.com/apoorvingle/h-reversi";
+ description = "Reversi game in haskell/blank-canvas";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"h2048" = callPackage
({ mkDerivation, base, HUnit, MonadRandom, mtl, text, transformers
, vty, vty-ui
@@ -76878,6 +78589,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hable" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "hable";
+ version = "0.3.1";
+ sha256 = "836a85271112fe458f75084144d871c5562a0590c11d9ab52ed248312852091e";
+ libraryHaskellDepends = [ base ];
+ homepage = "https://github.com/mekeor/hable";
+ description = "customizable pretty printer library for tables";
+ license = stdenv.lib.licenses.publicDomain;
+ }) {};
+
"hablog" = callPackage
({ mkDerivation, base, bifunctors, blaze-html, blaze-markup
, bytestring, containers, directory, filepath, markdown, mime-types
@@ -77707,25 +79430,27 @@ self: {
}) {};
"hackport" = callPackage
- ({ mkDerivation, array, base, base64-bytestring, binary, bytestring
- , containers, cryptohash, deepseq, directory, ed25519
- , extensible-exceptions, filepath, ghc-prim, hashable, HTTP, HUnit
- , MissingH, mtl, network, network-uri, old-locale, old-time, parsec
- , pretty, process, random, regex-compat, split, stm, tar
- , template-haskell, time, transformers, unix, xml, zlib
+ ({ mkDerivation, array, async, base, base16-bytestring
+ , base64-bytestring, binary, bytestring, containers, cryptohash
+ , deepseq, directory, ed25519, extensible-exceptions, filepath
+ , ghc-prim, hashable, HTTP, HUnit, MissingH, mtl, network
+ , network-uri, old-locale, old-time, parsec, pretty, process
+ , random, regex-compat, split, stm, tar, template-haskell, time
+ , transformers, unix, xml, zlib
}:
mkDerivation {
pname = "hackport";
- version = "0.5";
- sha256 = "90594dc1ff022a8fd2779548835555576df134feaf875cadca24378ece7fd97f";
+ version = "0.5.1";
+ sha256 = "667af1dc76c2833dd1fec935c5e61cc331be3c7b20c77ff68206177f70eccdad";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- array base base64-bytestring binary bytestring containers
- cryptohash deepseq directory ed25519 extensible-exceptions filepath
- ghc-prim hashable HTTP MissingH mtl network network-uri old-locale
- old-time parsec pretty process random regex-compat split stm tar
- template-haskell time transformers unix xml zlib
+ array async base base16-bytestring base64-bytestring binary
+ bytestring containers cryptohash deepseq directory ed25519
+ extensible-exceptions filepath ghc-prim hashable HTTP MissingH mtl
+ network network-uri old-locale old-time parsec pretty process
+ random regex-compat split stm tar template-haskell time
+ transformers unix xml zlib
];
testHaskellDepends = [
base binary bytestring containers deepseq directory
@@ -78156,6 +79881,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hailgun-simple" = callPackage
+ ({ mkDerivation, base, email-validate, hailgun, mtl, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "hailgun-simple";
+ version = "0.1.0.0";
+ sha256 = "30526e6b7ec6083b090e880ef6fe942cc8425d3b2700bac565e4fc6629ec2954";
+ libraryHaskellDepends = [
+ base email-validate hailgun mtl text transformers
+ ];
+ homepage = "https://github.com/cdepillabout/hailgun-simple";
+ description = "Easy-to-use wrapper for the hailgun package";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hails" = callPackage
({ mkDerivation, authenticate, base, base64-bytestring, binary
, blaze-builder, bson, bytestring, conduit, conduit-extra
@@ -78333,8 +80074,8 @@ self: {
}:
mkDerivation {
pname = "hakyll";
- version = "4.9.1.0";
- sha256 = "47f5b2eb038be6cf8a2fbb0eb3fa012b687ed06104b59169c39bf4662c87bf84";
+ version = "4.9.2.0";
+ sha256 = "20f1e5be71290445626ccf716e6b312bf3f5ebf780ce9481d574a83681ef2e3f";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -78539,8 +80280,8 @@ self: {
}:
mkDerivation {
pname = "hakyll-filestore";
- version = "0.1.4";
- sha256 = "4f4a4ff6312fd8a226357329c19b7da9ad0547b3683679ce033a1b82dd7d4bb9";
+ version = "0.1.5";
+ sha256 = "f013b519a8fd552f21ca5b487ea01436e3c649cdc34fe907035a46ff74e83e3a";
libraryHaskellDepends = [
base filestore hakyll time time-locale-compat
];
@@ -78590,6 +80331,7 @@ self: {
homepage = "https://github.com/oisdk/hakyll-series";
description = "Adds series functionality to hakyll";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hakyll-shakespeare" = callPackage
@@ -78785,6 +80527,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hamilton" = callPackage
+ ({ mkDerivation, ad, ansi-wl-pprint, base, comonad, containers
+ , free, hmatrix, hmatrix-gsl, optparse-applicative
+ , typelits-witnesses, vector, vector-sized, vty
+ }:
+ mkDerivation {
+ pname = "hamilton";
+ version = "0.1.0.0";
+ sha256 = "2c8653d3272e7fa59bfef888771ebafb8e265ba10ee03cdb8b73b5bc3bcf98d7";
+ revision = "2";
+ editedCabalFile = "f0a9099cd8474b2fff95c7f027c10b6a3cc43cce1be1a7bebf6914b4a2c2a49d";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ ad base comonad free hmatrix hmatrix-gsl typelits-witnesses
+ vector-sized
+ ];
+ executableHaskellDepends = [
+ ansi-wl-pprint base containers hmatrix optparse-applicative vector
+ vector-sized vty
+ ];
+ homepage = "https://github.com/mstksg/hamilton";
+ description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hamlet" = callPackage
({ mkDerivation, base, shakespeare }:
mkDerivation {
@@ -79100,8 +80869,10 @@ self: {
}:
mkDerivation {
pname = "haphviz";
- version = "0.2.0.0";
- sha256 = "352fd5f9b696341f33ef262a15df817d3831f0bea09de1d5babb34d4388e238d";
+ version = "0.2.0.1";
+ sha256 = "3271b7fa3364dd3d41ad186c886107827ec733a792f9b0f383c09b9dc5796103";
+ revision = "1";
+ editedCabalFile = "1da984c52a02dbea9a2add72cf90555e5b2d72cb4557064dc2ac630809b3edf2";
libraryHaskellDepends = [ base mtl text ];
testHaskellDepends = [
base checkers hspec QuickCheck quickcheck-text text
@@ -80122,6 +81893,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hasbolt" = callPackage
+ ({ mkDerivation, base, binary, bytestring, containers
+ , data-binary-ieee754, data-default, hex, hspec, network
+ , network-simple, QuickCheck, text, transformers
+ }:
+ mkDerivation {
+ pname = "hasbolt";
+ version = "0.1.0.2";
+ sha256 = "0ef9006c38adb2d4caf4de88c1ac9b3ad26175fc2c4c54ac70ac5e4750062462";
+ libraryHaskellDepends = [
+ base binary bytestring containers data-binary-ieee754 data-default
+ hex network network-simple text transformers
+ ];
+ testHaskellDepends = [
+ base bytestring containers hex hspec QuickCheck text
+ ];
+ homepage = "https://github.com/zmactep/hasbolt#readme";
+ description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hascal" = callPackage
({ mkDerivation, base, HUnit, numbers }:
mkDerivation {
@@ -80169,20 +81962,22 @@ self: {
"hascas" = callPackage
({ mkDerivation, base, binary, bytestring, containers
- , data-binary-ieee754, hspec, mtl, network, stm, template-haskell
- , uuid
+ , data-binary-ieee754, hspec, mtl, network, safe-exceptions, stm
+ , template-haskell, uuid
}:
mkDerivation {
pname = "hascas";
- version = "0.1.0.0";
- sha256 = "25dc79e9e8798d35932b1f8729330a1863fe93278778e4a3265c9a0dba504ccd";
+ version = "1.0.0";
+ sha256 = "004dba51e8cfa2b2e41fd9b51d8bdfb877a4ce19c46b412862327d567c64ccea";
+ revision = "1";
+ editedCabalFile = "dd3a3609ef9afd3507fc7c0a425683e2900da0b70512a5ef4342f39548c8d1a2";
libraryHaskellDepends = [
base binary bytestring containers data-binary-ieee754 mtl network
- stm template-haskell uuid
+ safe-exceptions stm template-haskell uuid
];
testHaskellDepends = [
base binary bytestring containers data-binary-ieee754 hspec mtl
- network stm template-haskell uuid
+ network safe-exceptions stm template-haskell uuid
];
homepage = "https://github.com/eklavya/hascas#readme";
description = "Cassandra driver for haskell";
@@ -80363,8 +82158,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
@@ -80433,8 +82230,8 @@ self: {
({ mkDerivation, base, containers, deepseq, hashable }:
mkDerivation {
pname = "hashmap";
- version = "1.3.1.1";
- sha256 = "a4c2d96c89b0a3fbf1ca06c6f8174c2fd996f3813017653a676ca075d8a07da7";
+ version = "1.3.2";
+ sha256 = "01409d423e27f529602b376cfb506afe7a47f73b2ca1e362638c4fccfbba5796";
libraryHaskellDepends = [ base containers deepseq hashable ];
homepage = "https://github.com/foxik/hashmap";
description = "Persistent containers Map and Set based on hashing";
@@ -80560,24 +82357,29 @@ self: {
}) {};
"haskakafka" = callPackage
- ({ mkDerivation, base, bytestring, c2hs, containers, either-unwrap
- , hspec, rdkafka, regex-posix, temporary, unix
+ ({ mkDerivation, base, bytestring, c2hs, cmdargs, containers
+ , either-unwrap, hspec, pretty-show, rdkafka, regex-posix
+ , temporary, unix
}:
mkDerivation {
pname = "haskakafka";
- version = "1.0.0";
- sha256 = "67426843d25b9f16d6cea9a62859b2052d3a965810c0c19b7f215d1a428c3b48";
+ version = "1.2.0";
+ sha256 = "eb4b010f0662f15b987bec00fa093c75726af94131e039fda63436ed87bc1c22";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
base bytestring containers temporary unix
];
- librarySystemDepends = [ rdkafka ];
+ libraryPkgconfigDepends = [ rdkafka ];
libraryToolDepends = [ c2hs ];
+ executableHaskellDepends = [ base bytestring cmdargs pretty-show ];
testHaskellDepends = [
base bytestring containers either-unwrap hspec regex-posix
];
homepage = "http://github.com/cosbynator/haskakafka";
description = "Kafka bindings for Haskell";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) rdkafka;};
"haskanoid" = callPackage
@@ -80737,6 +82539,20 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "haskelisp" = callPackage
+ ({ mkDerivation, base, containers, mtl, protolude, text }:
+ mkDerivation {
+ pname = "haskelisp";
+ version = "0.1.1.0";
+ sha256 = "1a5e1901451ecf5a3152a77686c7c625ea934f11f5cef22ffa38b5ae28ead372";
+ revision = "1";
+ editedCabalFile = "a1b283345ab2aa1553f6293a7b261e973bcb546a0eaecbfd76a9fd5978052041";
+ 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
@@ -81055,6 +82871,33 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
+ "haskell-gi_0_20" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, directory
+ , filepath, glib, gobjectIntrospection, haskell-gi-base, mtl
+ , pretty-show, process, regex-tdfa, safe, text, transformers
+ , xdg-basedir, xml-conduit
+ }:
+ mkDerivation {
+ pname = "haskell-gi";
+ version = "0.20";
+ sha256 = "9eec8bad2539b01d833f31cde7dbbe3cc911ab7ba89b68b20d4b2dfc0716d6f6";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring Cabal containers directory filepath haskell-gi-base
+ mtl pretty-show process regex-tdfa safe text transformers
+ xdg-basedir xml-conduit
+ ];
+ libraryPkgconfigDepends = [ glib gobjectIntrospection ];
+ executableHaskellDepends = [
+ base containers directory filepath haskell-gi-base pretty-show text
+ ];
+ homepage = "https://github.com/haskell-gi/haskell-gi";
+ description = "Generate Haskell bindings for GObject Introspection capable libraries";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
+
"haskell-gi-base" = callPackage
({ mkDerivation, base, bytestring, containers, glib, text }:
mkDerivation {
@@ -81068,6 +82911,20 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) glib;};
+ "haskell-gi-base_0_20" = callPackage
+ ({ mkDerivation, base, bytestring, containers, glib, text }:
+ mkDerivation {
+ pname = "haskell-gi-base";
+ version = "0.20";
+ sha256 = "d62e8b11d67441974e7cb52b0a30e7a1efe6051ddde62c48fe276185c670b80a";
+ libraryHaskellDepends = [ base bytestring containers text ];
+ libraryPkgconfigDepends = [ glib ];
+ homepage = "https://github.com/haskell-gi/haskell-gi-base";
+ description = "Foundation for libraries generated by haskell-gi";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) glib;};
+
"haskell-google-trends" = callPackage
({ mkDerivation, base, bytestring, haskell-fake-user-agent, lens
, regex-base, regex-posix, tagsoup, text, wreq
@@ -81149,25 +83006,17 @@ self: {
"haskell-kubernetes" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, either
, http-api-data, http-types, lens, network-uri, QuickCheck
- , quickcheck-instances, scientific, servant, servant-client
- , servant-server, split, text, transformers, unordered-containers
- , vector, wai
+ , quickcheck-instances, scientific, servant, servant-client, split
+ , text, unordered-containers, vector, wai
}:
mkDerivation {
pname = "haskell-kubernetes";
- version = "0.4.0";
- sha256 = "38cc46fc4540be0c3b3eb0dab282d549f91d45f64856b7f8b9e32dbf7c51b6c0";
- isLibrary = true;
- isExecutable = true;
+ version = "0.5.0";
+ sha256 = "f81d4713d2588d95c276768e7845f505b7d5c44b8febf2a34e373a35945ba52d";
libraryHaskellDepends = [
aeson base bytestring containers either http-api-data http-types
lens network-uri QuickCheck quickcheck-instances scientific servant
- servant-client servant-server split text unordered-containers
- vector wai
- ];
- executableHaskellDepends = [
- base either network-uri QuickCheck servant servant-client split
- transformers
+ servant-client split text unordered-containers vector wai
];
homepage = "https://github.com/soundcloud/haskell-kubernetes";
description = "Haskell bindings to the Kubernetes API (via swagger-codegen)";
@@ -81186,6 +83035,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "haskell-menu" = callPackage
+ ({ mkDerivation, base, containers }:
+ mkDerivation {
+ pname = "haskell-menu";
+ version = "0.2.1";
+ sha256 = "c43b6ba537425f02a52e7065224de0a399eadd1e2436f3553d8bc0b1057a48a3";
+ libraryHaskellDepends = [ base containers ];
+ homepage = "https://github.com/jlamothe/haskell-menu";
+ description = "A simple menu system for Haskell programs";
+ license = stdenv.lib.licenses.lgpl3;
+ }) {};
+
"haskell-modbus" = callPackage
({ mkDerivation, array, base, bytestring, cereal, hspec }:
mkDerivation {
@@ -81606,15 +83467,15 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "haskell-src-exts_1_19_0" = callPackage
+ "haskell-src-exts_1_19_1" = callPackage
({ mkDerivation, array, base, containers, cpphs, directory
, filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck
, tasty, tasty-golden, tasty-smallcheck
}:
mkDerivation {
pname = "haskell-src-exts";
- version = "1.19.0";
- sha256 = "da2b747a26e5b8ba9d41f5b6e1d821ed184f0f002c120f88af1f3e9e51e6ac47";
+ version = "1.19.1";
+ sha256 = "f0f5b2867673d654c7cce8a5fcc69222ea09af460c29a819c23cccf6311ba971";
libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
libraryToolDepends = [ happy ];
testHaskellDepends = [
@@ -81663,8 +83524,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";
@@ -81751,8 +83612,8 @@ self: {
}:
mkDerivation {
pname = "haskell-tools-ast";
- version = "0.3.0.1";
- sha256 = "5eab56307a8f415114da1c891e1753ccfe7febe8fe04c0280a8eb5b4e20c8728";
+ version = "0.4.0.0";
+ sha256 = "467845d216b9f4799c0ab681b2046df5cd410a170b9e6b78cf351b047f5bb70b";
libraryHaskellDepends = [
base ghc mtl references template-haskell uniplate
];
@@ -81823,8 +83684,8 @@ self: {
}:
mkDerivation {
pname = "haskell-tools-backend-ghc";
- version = "0.3.0.1";
- sha256 = "a63cd589f21a534bd0e68f27307a791f2257ab6e8eca7c76832a26e2b17868a3";
+ version = "0.4.0.0";
+ sha256 = "72755148f8866075be70a3b244d451b3f0755e53cc14b94401d7cd3c80dfd279";
libraryHaskellDepends = [
base bytestring containers ghc haskell-tools-ast mtl references
safe split template-haskell transformers uniplate
@@ -81832,51 +83693,89 @@ 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
- ({ mkDerivation, base, containers, directory, filepath, ghc
- , ghc-paths, haskell-tools-ast, haskell-tools-prettyprint
- , haskell-tools-refactor, HUnit, mtl, references, split
+ ({ mkDerivation, base, bytestring, containers, directory, filepath
+ , ghc, ghc-paths, haskell-tools-ast, haskell-tools-prettyprint
+ , haskell-tools-refactor, knob, mtl, references, split, tasty
+ , tasty-hunit
}:
mkDerivation {
pname = "haskell-tools-cli";
- version = "0.3.0.1";
- sha256 = "0e60a276383fff8b9cceda6fe82d45001156db5d3888b1914b16b04280f697b2";
+ version = "0.4.0.0";
+ sha256 = "0bc38f0d805b3d7bb0f643a83e217d7ff6139bc561c15ad4d8b45e208da9de37";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base containers directory ghc ghc-paths haskell-tools-ast
+ base containers directory filepath ghc ghc-paths haskell-tools-ast
haskell-tools-prettyprint haskell-tools-refactor mtl references
split
];
executableHaskellDepends = [ base ];
- testHaskellDepends = [ base directory filepath HUnit ];
+ testHaskellDepends = [
+ base bytestring directory filepath knob tasty tasty-hunit
+ ];
homepage = "https://github.com/haskell-tools/haskell-tools";
description = "Command-line frontend for Haskell-tools Refact";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "haskell-tools-daemon" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, directory
+ , filepath, ghc, ghc-paths, haskell-tools-ast
+ , haskell-tools-prettyprint, haskell-tools-refactor, HUnit, mtl
+ , network, references, split, tasty, tasty-hunit
+ }:
+ mkDerivation {
+ pname = "haskell-tools-daemon";
+ version = "0.4.0.0";
+ sha256 = "a339059dcdcaf2af3d622d61c64c3467e849748d27525d6d66c8e135ed5b5aeb";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring containers directory filepath ghc ghc-paths
+ haskell-tools-ast haskell-tools-prettyprint haskell-tools-refactor
+ mtl network references split
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ aeson base bytestring directory filepath HUnit network tasty
+ tasty-hunit
+ ];
+ homepage = "https://github.com/haskell-tools/haskell-tools";
+ description = "Background process for Haskell-tools refactor that editors can connect to";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"haskell-tools-demo" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, directory
, filepath, ghc, ghc-paths, haskell-tools-ast
, haskell-tools-backend-ghc, haskell-tools-prettyprint
- , haskell-tools-refactor, http-types, mtl, references, transformers
- , wai, wai-websockets, warp, websockets
+ , haskell-tools-refactor, http-types, HUnit, mtl, network
+ , references, tasty, tasty-hunit, transformers, wai, wai-websockets
+ , warp, websockets
}:
mkDerivation {
pname = "haskell-tools-demo";
- version = "0.3.0.1";
- sha256 = "9c85cd53b3cb18a1f6355b1d7f9c9f702ad82cead9f6b2e2d20d4ff1de5ca744";
- isLibrary = false;
+ version = "0.4.0.0";
+ sha256 = "1e52d8e1408323d75fd8f15344328c1f7ea194f7662d632cbb28e384fca05451";
+ isLibrary = true;
isExecutable = true;
- executableHaskellDepends = [
+ libraryHaskellDepends = [
aeson base bytestring containers directory filepath ghc ghc-paths
haskell-tools-ast haskell-tools-backend-ghc
haskell-tools-prettyprint haskell-tools-refactor http-types mtl
references transformers wai wai-websockets warp websockets
];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ aeson base bytestring directory filepath HUnit network tasty
+ tasty-hunit websockets
+ ];
homepage = "https://github.com/haskell-tools/haskell-tools";
description = "A web-based demo for Haskell-tools Refactor";
license = stdenv.lib.licenses.bsd3;
@@ -81889,8 +83788,8 @@ self: {
}:
mkDerivation {
pname = "haskell-tools-prettyprint";
- version = "0.3.0.1";
- sha256 = "13356a19d14a0d0c6a95b0ec56600fd4166dcee23ddef80fe0913b5d734ade5c";
+ version = "0.4.0.0";
+ sha256 = "408fca758679e050c8a984e635853d356b9f1c5141add998e3fbf67e24fafbaf";
libraryHaskellDepends = [
base containers ghc haskell-tools-ast mtl references split uniplate
];
@@ -81904,13 +83803,14 @@ self: {
({ mkDerivation, base, Cabal, containers, directory, either
, filepath, ghc, ghc-paths, haskell-tools-ast
, haskell-tools-backend-ghc, haskell-tools-prettyprint
- , haskell-tools-rewrite, HUnit, mtl, old-time, polyparse
- , references, split, template-haskell, time, transformers, uniplate
+ , haskell-tools-rewrite, mtl, old-time, polyparse, references
+ , split, tasty, tasty-hunit, template-haskell, time, transformers
+ , uniplate
}:
mkDerivation {
pname = "haskell-tools-refactor";
- version = "0.3.0.1";
- sha256 = "0fc7d41b05d130f57681f90a571ad9e112186a3fe5395c6ecc4575814aa8b2f5";
+ version = "0.4.0.0";
+ sha256 = "066cc62a3d553ff7510f64acd4627baa154e65e4d941ac74402aa7b978394c93";
libraryHaskellDepends = [
base Cabal containers directory filepath ghc ghc-paths
haskell-tools-ast haskell-tools-backend-ghc
@@ -81920,9 +83820,9 @@ self: {
testHaskellDepends = [
base Cabal containers directory either filepath ghc ghc-paths
haskell-tools-ast haskell-tools-backend-ghc
- haskell-tools-prettyprint haskell-tools-rewrite HUnit mtl old-time
- polyparse references split template-haskell time transformers
- uniplate
+ haskell-tools-prettyprint haskell-tools-rewrite mtl old-time
+ polyparse references split tasty tasty-hunit template-haskell time
+ transformers uniplate
];
homepage = "https://github.com/haskell-tools/haskell-tools";
description = "Refactoring Tool for Haskell";
@@ -81931,20 +83831,26 @@ self: {
}) {};
"haskell-tools-rewrite" = callPackage
- ({ mkDerivation, base, containers, ghc, haskell-tools-ast
- , haskell-tools-prettyprint, mtl, references
+ ({ mkDerivation, base, containers, directory, filepath, ghc
+ , haskell-tools-ast, haskell-tools-prettyprint, mtl, references
+ , tasty, tasty-hunit
}:
mkDerivation {
pname = "haskell-tools-rewrite";
- version = "0.3.0.1";
- sha256 = "190e3aaa5a2a77e4106dd7ae243605b5036b82848197d0ab747c91b89a6b3aa6";
+ version = "0.4.0.0";
+ sha256 = "a47604c77b77a5ca1ca5ce0c5c517a68d7cdc33d9b056f7fd5f98d3756af61a2";
libraryHaskellDepends = [
base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl
references
];
+ testHaskellDepends = [
+ base directory filepath haskell-tools-ast haskell-tools-prettyprint
+ tasty tasty-hunit
+ ];
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
@@ -83200,8 +85106,8 @@ self: {
}:
mkDerivation {
pname = "hasql-class";
- version = "0.0.0.1";
- sha256 = "90db8a197d6755401f0431fa9586aa3f1744d411fe714ec8bfd2b51f5540c9de";
+ version = "0.0.1.0";
+ sha256 = "f46dc9cd83ba0f121f8c67c10cf25d199218b4d303aed008084655fdb60aa681";
libraryHaskellDepends = [
base bytestring contravariant data-default-class generics-eot hasql
text time vector
@@ -83260,14 +85166,55 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hasql-generic" = callPackage
+ ({ mkDerivation, aeson, base, binary-parser, bytestring, containers
+ , contravariant, generics-sop, hasql, postgresql-binary, scientific
+ , text, time, uuid, vector
+ }:
+ mkDerivation {
+ pname = "hasql-generic";
+ version = "0.1.0.4";
+ sha256 = "d60dbe2e88395a878c7e920e49a5a7d8b3aae63b5c63bf73659d120cdc14fa82";
+ libraryHaskellDepends = [
+ aeson base binary-parser bytestring containers contravariant
+ generics-sop hasql postgresql-binary scientific text time uuid
+ vector
+ ];
+ homepage = "https://github.com/chris-kahn/hasql-generic#readme";
+ description = "Generic encoder and decoder deriving for Hasql";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "hasql-migration" = callPackage
+ ({ mkDerivation, base, base64-bytestring, bytestring, contravariant
+ , cryptohash, data-default-class, directory, hasql
+ , hasql-transaction, hspec, text, time, transformers
+ }:
+ mkDerivation {
+ pname = "hasql-migration";
+ version = "0.1.1";
+ sha256 = "0cb83fffe9ebda4632fd426a97506c9c5f803c42a01d0987e7752240aceff595";
+ libraryHaskellDepends = [
+ base base64-bytestring bytestring contravariant cryptohash
+ data-default-class directory hasql hasql-transaction text time
+ ];
+ testHaskellDepends = [
+ base bytestring hasql hasql-transaction hspec transformers
+ ];
+ homepage = "https://github.com/tvh/hasql-migration";
+ description = "PostgreSQL Schema Migrations";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hasql-optparse-applicative" = callPackage
({ mkDerivation, base-prelude, hasql, hasql-pool
, optparse-applicative
}:
mkDerivation {
pname = "hasql-optparse-applicative";
- version = "0.1.1";
- sha256 = "8d0e6601a5353d4cd5bd6fd7f713d79ecf8bfbe3458163c0b0e0f10a90ed80fd";
+ version = "0.2";
+ sha256 = "c006e033547c82b4986e8bbc09997f73bb5bb75a7e08e10fb29ba06117aaa42b";
libraryHaskellDepends = [
base-prelude hasql hasql-pool optparse-applicative
];
@@ -83437,8 +85384,8 @@ self: {
}:
mkDerivation {
pname = "haste-compiler";
- version = "0.5.5.0";
- sha256 = "9e6d526193f73ae90e863b9fff0dcf8b3e028f430d3157ee3eb1a9a46fae250c";
+ version = "0.5.5.1";
+ sha256 = "c93d1dce0f0024ecae56019b1c7a5b68ca37cf32ba7a8ee7b2f248981af4865c";
configureFlags = [ "-fportable" ];
libraryHaskellDepends = [
base binary bytestring containers data-binary-ieee754 directory
@@ -83519,6 +85466,7 @@ self: {
homepage = "http://bitbucket.org/sras/hastily";
description = "A program to download subtitle files";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hasty-hamiltonian" = callPackage
@@ -83527,8 +85475,8 @@ self: {
}:
mkDerivation {
pname = "hasty-hamiltonian";
- version = "1.1.4";
- sha256 = "595b3cde3461f81df391c9d5335695fbf64a80187fb52036b75b495da74a92ed";
+ version = "1.1.5";
+ sha256 = "d3a62d1933ca6ebc2b53a7a620922809297350d33986904e69072c1e8bfa3fa6";
libraryHaskellDepends = [
base lens mcmc-types mwc-probability pipes primitive transformers
];
@@ -83538,6 +85486,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hasty-hamiltonian_1_2_0" = callPackage
+ ({ mkDerivation, ad, base, lens, mcmc-types, mwc-probability, pipes
+ , primitive, transformers
+ }:
+ mkDerivation {
+ pname = "hasty-hamiltonian";
+ version = "1.2.0";
+ sha256 = "602e6bff253cae2151b6c4eb8c81a19dc0a2525bf63bdbd5b12396358548cdda";
+ libraryHaskellDepends = [
+ base lens mcmc-types mwc-probability pipes primitive transformers
+ ];
+ testHaskellDepends = [ ad base mwc-probability ];
+ homepage = "http://github.com/jtobin/hasty-hamiltonian";
+ description = "Speedy traversal through parameter space";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hat" = callPackage
({ mkDerivation, base, bytestring, containers, directory, filepath
, haskeline, haskell-src-exts, old-locale, old-time, polyparse
@@ -83710,8 +85676,8 @@ self: {
}:
mkDerivation {
pname = "haxl";
- version = "0.4.0.1";
- sha256 = "15bc6c2ed641b3c1f1e8f8cfc377fe5ae8ec3e1f4a8eb03be8e154f981cfd6a3";
+ version = "0.4.0.2";
+ sha256 = "272b50d432da234803d7a590530ae87266de1f3f75b6d98bdbc53262183fd634";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -84045,27 +86011,29 @@ self: {
}) {};
"hbro" = callPackage
- ({ mkDerivation, base, bytestring, classy-prelude, cond, containers
- , data-default-class, directory, dyre, errors, exceptions
- , fast-logger, filepath, glib, gtk3, lens, lifted-async
- , lifted-base, monad-control, monad-logger, mtl, network-uri
- , optparse-applicative, pango, parsec, process, random, resourcet
- , safe, semigroups, stm-chans, text, time, transformers
+ ({ mkDerivation, base, bytestring, chunked-data, cond, containers
+ , data-default-class, directory, dyre, errors, fast-logger
+ , filepath, glib, gtk3, lifted-async, lifted-base
+ , microlens-platform, monad-control, monad-logger, monadIO
+ , mono-traversable, mtl, network-uri, optparse-applicative, pango
+ , parsec, process, random, resourcet, safe, safe-exceptions
+ , semigroups, stm-chans, template-haskell, text, time, transformers
, transformers-base, unix, uuid, webkitgtk3, zeromq4-haskell
}:
mkDerivation {
pname = "hbro";
- version = "1.5.0.0";
- sha256 = "8f66263f288dba0e90cce6d6b9d2682b71acc46c2790128cba78b984c7990d6f";
+ version = "1.7.0.0";
+ sha256 = "f00f064cfe00d662b32d93ab3ae4fca204ae0cab44f115b6ef0be0f44e02a36f";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring classy-prelude cond containers data-default-class
- directory dyre errors exceptions fast-logger filepath glib gtk3
- lens lifted-async lifted-base monad-control monad-logger mtl
- network-uri optparse-applicative pango parsec process random
- resourcet safe semigroups stm-chans text time transformers
- transformers-base unix uuid webkitgtk3 zeromq4-haskell
+ base bytestring chunked-data cond containers data-default-class
+ directory dyre errors fast-logger filepath glib gtk3 lifted-async
+ lifted-base microlens-platform monad-control monad-logger monadIO
+ mono-traversable mtl network-uri optparse-applicative pango parsec
+ process random resourcet safe safe-exceptions semigroups stm-chans
+ template-haskell text time transformers transformers-base unix uuid
+ webkitgtk3 zeromq4-haskell
];
executableHaskellDepends = [ base ];
homepage = "https://github.com/k0ral/hbro";
@@ -84076,19 +86044,28 @@ self: {
"hbro-contrib" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring
- , classy-prelude, containers, directory, glib, gtk3, hbro, lens
- , monad-control, mtl, network-uri, pango, parsec, process
- , resourcet, safe, text, time, transformers-base, unix, webkitgtk3
+ , chunked-data, containers, directory, filepath, glib, gtk3, hbro
+ , microlens, monad-control, mono-traversable, mtl, network-uri
+ , pango, parsec, process, resourcet, safe, safe-exceptions, text
+ , time, transformers-base, unix, webkitgtk3
}:
mkDerivation {
pname = "hbro-contrib";
- version = "1.5.0.0";
- sha256 = "0331c2024f52cfbefba781095e8309fd20cd32082a9a8887c3fcb4f52fc76fbc";
+ version = "1.7.0.0";
+ sha256 = "55398cdfcc3b0437d57798765fd5b04253d7d20e05b4c4f56a7d670832659508";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
- aeson aeson-pretty base bytestring classy-prelude containers
- directory glib gtk3 hbro lens monad-control mtl network-uri pango
- parsec process resourcet safe text time transformers-base unix
- webkitgtk3
+ aeson aeson-pretty base bytestring chunked-data containers
+ directory filepath glib gtk3 hbro microlens monad-control
+ mono-traversable mtl network-uri pango parsec process resourcet
+ safe safe-exceptions text time transformers-base unix webkitgtk3
+ ];
+ executableHaskellDepends = [
+ aeson aeson-pretty base bytestring chunked-data containers
+ directory filepath glib gtk3 hbro microlens monad-control
+ mono-traversable mtl network-uri pango parsec process resourcet
+ safe safe-exceptions text time transformers-base unix webkitgtk3
];
homepage = "https://github.com/k0ral/hbro-contrib";
description = "Third-party extensions to hbro";
@@ -84800,19 +86777,19 @@ self: {
}) {};
"heckle" = callPackage
- ({ mkDerivation, base, blaze-html, dates, directory, filepath
+ ({ mkDerivation, base, blaze-html, directory, filepath
, optparse-applicative, optparse-generic, pandoc, pandoc-types
- , process, split, tagsoup
+ , process, split, tagsoup, time
}:
mkDerivation {
pname = "heckle";
- version = "2.0.1.1";
- sha256 = "ba4defee459e282b1308ee66ed9148ea9bd936eae41136f82c6ffbb71981dd14";
+ version = "2.0.1.9";
+ sha256 = "b8a14e8e80dfc0190088e8f05baf9b47c46ac72e6b8ec5f36be244087b0469ba";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base blaze-html dates directory filepath pandoc pandoc-types
- process split tagsoup
+ base blaze-html directory filepath pandoc pandoc-types process
+ split tagsoup time
];
executableHaskellDepends = [
base directory filepath optparse-applicative optparse-generic
@@ -84832,8 +86809,8 @@ self: {
}:
mkDerivation {
pname = "hedis";
- version = "0.9.4";
- sha256 = "15935228da585669041395cac32c8e570ea4efa122b0ae9f71fa1a0c129f70d1";
+ version = "0.9.5";
+ sha256 = "fe9d461f8a24f134947c89832472463d65150c37b53cf53ea89fd199ef8d1b71";
libraryHaskellDepends = [
async base bytestring bytestring-lexing deepseq mtl network
resource-pool scanner stm text time unordered-containers vector
@@ -85008,6 +86985,8 @@ self: {
pname = "heist";
version = "1.0.1.0";
sha256 = "fd4ff3c1bfc1473feb9e913a5cdecaf56bc9db022abc27a76768cb6345c68bcb";
+ revision = "1";
+ editedCabalFile = "35cc7972ed625260f5f5885852551b9151cea0fad1c9855af09c5d82e20ae830";
libraryHaskellDepends = [
aeson attoparsec base blaze-builder blaze-html bytestring
containers directory directory-tree dlist filepath hashable
@@ -85494,10 +87473,8 @@ self: {
}:
mkDerivation {
pname = "heredocs";
- version = "0.1.3.1";
- sha256 = "51c7b375ef2e5d34da7533a2b919e7908e94c89fcbc087fb559fa89dd5e0ddb6";
- revision = "2";
- editedCabalFile = "f46b25d4890df9e9da69c0a491580c32d2b9519903e795efe6385b0d11c3a796";
+ version = "0.1.4";
+ sha256 = "3f879b0e2f34d98f670e6a210f1bc61d9c4a9505c147c7ec93576f54fe69c56f";
libraryHaskellDepends = [
base bytestring doctest parsec template-haskell text
];
@@ -85735,6 +87712,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "heterocephalus" = callPackage
+ ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist
+ , doctest, Glob, parsec, shakespeare, template-haskell, text
+ }:
+ mkDerivation {
+ pname = "heterocephalus";
+ version = "1.0.2.0";
+ sha256 = "d0ec193259c06ae95d5e05c17cd42087465e876d04248212d58dc4ccd72004f3";
+ libraryHaskellDepends = [
+ base blaze-html blaze-markup containers dlist parsec shakespeare
+ template-haskell text
+ ];
+ testHaskellDepends = [ base doctest Glob ];
+ homepage = "https://github.com/arowM/heterocephalus#readme";
+ description = "A type-safe template engine for working with popular front end development tools";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"hetris" = callPackage
({ mkDerivation, array, base, hscurses, ncurses, old-time, random
}:
@@ -85837,6 +87832,19 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hexml" = callPackage
+ ({ mkDerivation, base, bytestring, extra }:
+ mkDerivation {
+ pname = "hexml";
+ version = "0.2";
+ sha256 = "4c14883bc7fd5e059e05a24d5daabacec295ee71fcf91e3fdd066e7993085a2a";
+ libraryHaskellDepends = [ base bytestring extra ];
+ testHaskellDepends = [ base bytestring ];
+ homepage = "https://github.com/ndmitchell/hexml#readme";
+ description = "XML subset DOM parser";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hexpat" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, List, text
, transformers, utf8-string
@@ -86974,32 +88982,6 @@ self: {
}) {};
"hindent" = callPackage
- ({ mkDerivation, base, containers, descriptive, directory, ghc-prim
- , haskell-src-exts, hspec, monad-loops, mtl, text, transformers
- }:
- mkDerivation {
- pname = "hindent";
- version = "4.6.4";
- sha256 = "26fc1498705b8a64b03eb5b699ba6229955273d91a49a01c3c2b58436c8e4dcf";
- revision = "3";
- editedCabalFile = "86ebc305942be9a659bdd7a9f66771d74e72825816c6ba1f0dd29a65ce8eef35";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base containers haskell-src-exts monad-loops mtl text transformers
- ];
- executableHaskellDepends = [
- base descriptive directory ghc-prim haskell-src-exts text
- ];
- testHaskellDepends = [
- base directory haskell-src-exts hspec monad-loops mtl text
- ];
- homepage = "http://www.github.com/chrisdone/hindent";
- description = "Extensible Haskell pretty printer";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "hindent_5_2_1" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, descriptive
, Diff, directory, exceptions, ghc-prim, haskell-src-exts, hspec
, monad-loops, mtl, path, path-io, text, transformers, unix-compat
@@ -87027,7 +89009,6 @@ self: {
homepage = "http://www.github.com/chrisdone/hindent";
description = "Extensible Haskell pretty printer";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hindley-milner" = callPackage
@@ -87120,12 +89101,12 @@ self: {
}) {};
"hinotify" = callPackage
- ({ mkDerivation, base, containers, directory, unix }:
+ ({ mkDerivation, async, base, containers, directory, unix }:
mkDerivation {
pname = "hinotify";
- version = "0.3.8.1";
- sha256 = "37d46e32c362ff1e2d9c8d79a553e0d2e59e009d46708163fb05a07e1a71810d";
- libraryHaskellDepends = [ base containers directory unix ];
+ version = "0.3.9";
+ sha256 = "f2480e4c08a516831c2221eebc6a9d3242e892932d9315c34cbe92a101c5df99";
+ libraryHaskellDepends = [ async base containers directory unix ];
testHaskellDepends = [ base directory ];
homepage = "https://github.com/kolmodin/hinotify.git";
description = "Haskell binding to inotify";
@@ -87214,8 +89195,8 @@ self: {
}:
mkDerivation {
pname = "hint-server";
- version = "1.4.2";
- sha256 = "c579a71d68272dc463ba9625027615bd323fdbbe8780bd462d05694c375866e7";
+ version = "1.4.3";
+ sha256 = "fecb7fd63ff216054ba1a6569b85757ae6227ce6aa2b0b55ea1c35a54a45ffdd";
libraryHaskellDepends = [
base eprocess exceptions hint monad-loops mtl
];
@@ -87224,6 +89205,32 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hinterface" = callPackage
+ ({ mkDerivation, array, async, base, binary, bytestring, containers
+ , cryptonite, exceptions, hspec, lifted-async, lifted-base, memory
+ , monad-control, monad-logger, mtl, network, QuickCheck, random
+ , resourcet, safe-exceptions, stm, text, transformers
+ , transformers-base, vector
+ }:
+ mkDerivation {
+ pname = "hinterface";
+ version = "0.5.0.1";
+ sha256 = "0c25984c5713318e00990d0a787fb3d788fe0211273d1f7901a8d590b4d3a700";
+ libraryHaskellDepends = [
+ array async base binary bytestring containers cryptonite exceptions
+ lifted-async lifted-base memory monad-control monad-logger mtl
+ network QuickCheck random resourcet safe-exceptions stm text
+ transformers transformers-base vector
+ ];
+ testHaskellDepends = [
+ async base binary bytestring hspec monad-logger QuickCheck
+ transformers
+ ];
+ homepage = "https://github.com/LTI2000/hinterface";
+ description = "Haskell / Erlang interoperability library";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hinvaders" = callPackage
({ mkDerivation, base, haskell98, random }:
mkDerivation {
@@ -87253,18 +89260,39 @@ self: {
}) {};
"hip" = callPackage
- ({ mkDerivation, base, bytestring, Chart, Chart-cairo, colour
- , deepseq, filepath, JuicyPixels, netpbm, primitive, process, repa
- , temporary, vector
+ ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour
+ , deepseq, directory, filepath, hspec, JuicyPixels, netpbm
+ , primitive, process, QuickCheck, repa, temporary, vector
}:
mkDerivation {
pname = "hip";
- version = "1.0.1.2";
- sha256 = "3fff4507cf53a979630d8e94d3dec05b18139007bc7e24ec122ce35d38292484";
+ version = "1.2.0.0";
+ sha256 = "d72879134b56197e0abf21abd09b0198581cb0302574711ffbcfff6da17dd083";
libraryHaskellDepends = [
- base bytestring Chart Chart-cairo colour deepseq filepath
- JuicyPixels netpbm primitive process repa temporary vector
+ base bytestring Chart Chart-diagrams colour deepseq directory
+ filepath JuicyPixels netpbm primitive process repa temporary vector
];
+ testHaskellDepends = [ base hspec QuickCheck ];
+ homepage = "https://github.com/lehins/hip";
+ description = "Haskell Image Processing (HIP) Library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "hip_1_3_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour
+ , deepseq, directory, filepath, hspec, JuicyPixels, netpbm
+ , primitive, process, QuickCheck, repa, temporary, vector
+ }:
+ mkDerivation {
+ pname = "hip";
+ version = "1.3.0.0";
+ sha256 = "ee4e288bcb2ab1937d3eaa5bcf8017bff07debc8aeda3e768fe542923696b9bf";
+ libraryHaskellDepends = [
+ base bytestring Chart Chart-diagrams colour deepseq directory
+ filepath JuicyPixels netpbm primitive process repa temporary vector
+ ];
+ testHaskellDepends = [ base hspec QuickCheck ];
homepage = "https://github.com/lehins/hip";
description = "Haskell Image Processing (HIP) Library";
license = stdenv.lib.licenses.bsd3;
@@ -87920,6 +89948,7 @@ self: {
homepage = "http://hledger.org";
description = "Command-line interface for the hledger accounting tool";
license = "GPL";
+ maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
"hledger-api" = callPackage
@@ -87942,6 +89971,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
@@ -87961,6 +89991,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
@@ -87975,7 +90006,40 @@ self: {
homepage = "https://github.com/gebner/hledger-diff";
description = "Compares the transactions in two ledger files";
license = stdenv.lib.licenses.gpl3;
- maintainers = with stdenv.lib.maintainers; [ gebner ];
+ maintainers = with stdenv.lib.maintainers; [ gebner peti ];
+ }) {};
+
+ "hledger-iadd" = callPackage
+ ({ mkDerivation, base, brick, containers, directory, free
+ , hledger-lib, hspec, megaparsec, microlens, optparse-applicative
+ , QuickCheck, text, text-format, text-zipper, time, transformers
+ , unordered-containers, vector, vty, xdg-basedir
+ }:
+ mkDerivation {
+ pname = "hledger-iadd";
+ version = "1.1.1";
+ sha256 = "89a1d0846caccdd7a7272821cef105ec6fb405d4b3390b0e335fc036e25c8386";
+ revision = "1";
+ editedCabalFile = "518e975bfd1de87c7cfbbaaa0f710d450e3f5e344725510377cb64abcf11baee";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base brick containers directory free hledger-lib megaparsec
+ microlens optparse-applicative text text-format text-zipper time
+ transformers unordered-containers vector vty xdg-basedir
+ ];
+ executableHaskellDepends = [
+ base brick directory free hledger-lib megaparsec microlens
+ optparse-applicative text text-format text-zipper time transformers
+ unordered-containers vector vty xdg-basedir
+ ];
+ testHaskellDepends = [
+ base free hledger-lib hspec megaparsec QuickCheck text text-format
+ time transformers vector
+ ];
+ homepage = "https://github.com/hpdeifel/hledger-iadd#readme";
+ description = "A terminal UI as drop-in replacement for hledger add";
+ license = stdenv.lib.licenses.bsd3;
}) {};
"hledger-interest" = callPackage
@@ -87983,8 +90047,8 @@ self: {
}:
mkDerivation {
pname = "hledger-interest";
- version = "1.5";
- sha256 = "77fb04190160de91eb791f2326691133e1be26c0984fabf30581ba1f0af3fab1";
+ version = "1.5.1";
+ sha256 = "0a02354f4e8d53e75817e05b140c4760220ac4e414fbf9772abe4f20a9f90da6";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -88011,6 +90075,7 @@ self: {
];
description = "computes the internal rate of return of an investment";
license = stdenv.lib.licenses.bsd3;
+ maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
"hledger-lib" = callPackage
@@ -88051,8 +90116,10 @@ self: {
}:
mkDerivation {
pname = "hledger-ui";
- version = "1.0.4";
- sha256 = "f45d4afe158924f59691885bb87e52816fe80525252400d2840761a2e0d4e64d";
+ version = "1.0.5";
+ sha256 = "ba859b4c1f8199413c30ddc0db2a7e11206d79ae235e6d9005de6d6cc1b98875";
+ revision = "2";
+ editedCabalFile = "6ef7d005fa20fd8c0001944f37f618305af941d1a8bdb91c6a4f2422fa23b69f";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -88064,6 +90131,7 @@ self: {
homepage = "http://hledger.org";
description = "Curses-style user interface for the hledger accounting tool";
license = "GPL";
+ maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
"hledger-vty" = callPackage
@@ -88082,6 +90150,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
@@ -88126,6 +90195,7 @@ self: {
homepage = "http://hledger.org";
description = "Web interface for the hledger accounting tool";
license = "GPL";
+ maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
"hlibBladeRF" = callPackage
@@ -88222,15 +90292,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hlint_1_9_37" = callPackage
+ "hlint_1_9_39" = callPackage
({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
, directory, extra, filepath, haskell-src-exts, hscolour, process
, refact, transformers, uniplate
}:
mkDerivation {
pname = "hlint";
- version = "1.9.37";
- sha256 = "a208466a837b58159d6a4bbd4c360ae918da306fb38630eae52ba5ef0c88c415";
+ version = "1.9.39";
+ sha256 = "66cffc12e38c0dfbbab61219381c0af6b41a48462a71e3810612ff2bbdc0b38f";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -88427,6 +90497,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
@@ -88479,6 +90550,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) gsl;};
+ "hmatrix-gsl-stats_0_4_1_6" = callPackage
+ ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex
+ , vector
+ }:
+ mkDerivation {
+ pname = "hmatrix-gsl-stats";
+ version = "0.4.1.6";
+ sha256 = "1bf5bb87312525256868872a5d51e43d851b75ef549a8834052263171b91cd71";
+ libraryHaskellDepends = [
+ base binary hmatrix storable-complex vector
+ ];
+ libraryPkgconfigDepends = [ gsl ];
+ homepage = "http://code.haskell.org/hmatrix-gsl-stats";
+ description = "GSL Statistics interface";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) gsl;};
+
"hmatrix-mmap" = callPackage
({ mkDerivation, base, hmatrix, mmap }:
mkDerivation {
@@ -88606,6 +90695,7 @@ self: {
homepage = "https://github.com/albertoruiz/hmatrix";
description = "Tests for hmatrix";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hmeap" = callPackage
@@ -88836,25 +90926,24 @@ self: {
"hnetcdf" = callPackage
({ mkDerivation, base, c2hs, containers, directory, either, errors
- , filepath, hmatrix, HUnit, netcdf, QuickCheck, repa
- , test-framework, test-framework-hunit, test-framework-quickcheck2
- , transformers, vector
+ , filepath, HUnit, netcdf, QuickCheck, repa, test-framework
+ , test-framework-hunit, test-framework-quickcheck2, transformers
+ , vector
}:
mkDerivation {
pname = "hnetcdf";
- version = "0.3.0.0";
- sha256 = "3a8c5c30a9210e4a7af213a0d0967515f692876f23c78582f7896559d69f098c";
+ version = "0.4.0.0";
+ sha256 = "70ea9ddc84b29848fc000d9eaaea5d7d6273597662437591354a8b5c12b2d795";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base containers either errors filepath hmatrix repa transformers
- vector
+ base containers either errors filepath repa transformers vector
];
librarySystemDepends = [ netcdf ];
libraryToolDepends = [ c2hs ];
- executableHaskellDepends = [ base containers hmatrix repa vector ];
+ executableHaskellDepends = [ base containers repa vector ];
testHaskellDepends = [
- base containers directory errors hmatrix HUnit QuickCheck repa
+ base containers directory errors HUnit QuickCheck repa
test-framework test-framework-hunit test-framework-quickcheck2
vector
];
@@ -88972,14 +91061,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hoauth2_0_5_6_0" = callPackage
+ "hoauth2_0_5_7" = callPackage
({ mkDerivation, aeson, base, bytestring, http-conduit, http-types
, text, unordered-containers
}:
mkDerivation {
pname = "hoauth2";
- version = "0.5.6.0";
- sha256 = "e678e9d0029b354f255b9796dddac5de0c9894261e54591b0435685a787e2dad";
+ version = "0.5.7";
+ sha256 = "7b196e4b70b8207c4beb3479f5ab4476c17d9c0ec7d8f1fcb658590641e9b9ec";
libraryHaskellDepends = [
aeson base bytestring http-conduit http-types text
unordered-containers
@@ -89693,8 +91782,8 @@ self: {
}:
mkDerivation {
pname = "hoogle";
- version = "5.0.4";
- sha256 = "7ae3b649d435afa178241ade97f3eef3d8519ddd86f4a97d23b7aa5a88c9a665";
+ version = "5.0.6";
+ sha256 = "fd151310dcdb4fc8c317aabe0faf0b9563ccd59471de12ea3f10136c6f134712";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -89824,7 +91913,7 @@ self: {
description = "Haskell binding to libopencc";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {opencc = null;};
+ }) {inherit (pkgs) opencc;};
"hopencl" = callPackage
({ mkDerivation, base, bytestring, c2hs, HUnit, OpenCL, QuickCheck
@@ -89968,8 +92057,8 @@ self: {
}:
mkDerivation {
pname = "hoppy-docs";
- version = "0.2.1";
- sha256 = "213baa6a2a53f9b0efec11affcdf0ddb24e86a462a333f7a9d81df829f4d55a0";
+ version = "0.3.0";
+ sha256 = "e6663e8654fe93daa5a4628219eea03e2b6f31d7894a9f7c4180f43f92921d8f";
libraryHaskellDepends = [
base haskell-src hoppy-generator hoppy-runtime
];
@@ -89985,8 +92074,8 @@ self: {
}:
mkDerivation {
pname = "hoppy-generator";
- version = "0.2.1";
- sha256 = "b03dacf5d0b85b859d01c8cb29045092ad64cb983ec162d37f87ecabc9d052ba";
+ version = "0.3.0";
+ sha256 = "48d8e8c41c1204ced517a337d454a1dc87bd6a5ef3697f09756fac22e4d374ef";
libraryHaskellDepends = [
base containers directory filepath haskell-src mtl
];
@@ -89997,12 +92086,12 @@ self: {
}) {};
"hoppy-runtime" = callPackage
- ({ mkDerivation, base }:
+ ({ mkDerivation, base, containers }:
mkDerivation {
pname = "hoppy-runtime";
- version = "0.2.1";
- sha256 = "f4969d7cd352399d2f76739cf4ab75e23b1ff491437400ca2e3bc4bbe4505392";
- libraryHaskellDepends = [ base ];
+ version = "0.3.0";
+ sha256 = "44463a38c42a61789f723a538a5c3df0eac312c08dbac81a10642a8bffaba9d9";
+ libraryHaskellDepends = [ base containers ];
homepage = "http://khumba.net/projects/hoppy";
description = "C++ FFI generator - Runtime support";
license = stdenv.lib.licenses.asl20;
@@ -90013,8 +92102,8 @@ self: {
({ mkDerivation, base, filepath, haskell-src, hoppy-generator }:
mkDerivation {
pname = "hoppy-std";
- version = "0.2.1";
- sha256 = "13eee9e5d2f993d8486f2c9125c109d89ba5d6ec13b3165e7f733b04e8c677cc";
+ version = "0.3.0";
+ sha256 = "4bf6cbf4456ac92517bb19a044863e509e20ca7965f1a8324bcd4848f5c4fb65";
libraryHaskellDepends = [
base filepath haskell-src hoppy-generator
];
@@ -90072,6 +92161,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hora" = callPackage
+ ({ mkDerivation, base, binary, hspec, QuickCheck, time
+ , timezone-olson, timezone-series
+ }:
+ mkDerivation {
+ pname = "hora";
+ version = "2.0.2";
+ sha256 = "a2d9eb1f89bf71f7060768e715fddd1e9478af192b353977c14c5524f2daba27";
+ revision = "1";
+ editedCabalFile = "ba7e38c8bb60d028a6869e1d7ecd07354e783b2c8b5da6f135c4ef740ccf41a1";
+ libraryHaskellDepends = [ base binary time timezone-series ];
+ testHaskellDepends = [
+ base binary hspec QuickCheck time timezone-olson timezone-series
+ ];
+ homepage = "https://github.com/ciez/hora";
+ description = "date time";
+ license = stdenv.lib.licenses.publicDomain;
+ }) {};
+
"horizon" = callPackage
({ mkDerivation, AC-Angle, base, time }:
mkDerivation {
@@ -90085,6 +92193,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "horname" = callPackage
+ ({ mkDerivation, base, containers, megaparsec, optparse-applicative
+ , text, these, uniplate, wl-pprint-text
+ }:
+ mkDerivation {
+ pname = "horname";
+ version = "0.1.3.0";
+ sha256 = "e9a6cfb0ba87f063f04a7273d476b200905625ce60b00d87c8995332b1b7f218";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers megaparsec text these uniplate wl-pprint-text
+ ];
+ executableHaskellDepends = [ base optparse-applicative text ];
+ homepage = "https://github.com/cocreature/horname#readme";
+ description = "Rename function definitions returned by SMT solvers";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hosc" = callPackage
({ mkDerivation, base, binary, blaze-builder, bytestring
, data-binary-ieee754, network, QuickCheck, test-framework
@@ -90373,37 +92500,6 @@ self: {
}) {};
"hpack" = callPackage
- ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers
- , deepseq, directory, filepath, Glob, hspec, interpolate, mockery
- , QuickCheck, temporary, text, unordered-containers, yaml
- }:
- mkDerivation {
- pname = "hpack";
- version = "0.14.1";
- sha256 = "a930e8719c52f42826efab92f33252e3dfbf664296ce8075334b48e38bc51280";
- revision = "1";
- editedCabalFile = "59a63c997869623189c5e2bb3df8b1da09dda3a2258cbef43a87cbb4a40addc5";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base base-compat containers deepseq directory filepath Glob
- text unordered-containers yaml
- ];
- executableHaskellDepends = [
- aeson base base-compat containers deepseq directory filepath Glob
- text unordered-containers yaml
- ];
- testHaskellDepends = [
- aeson aeson-qq base base-compat containers deepseq directory
- filepath Glob hspec interpolate mockery QuickCheck temporary text
- unordered-containers yaml
- ];
- homepage = "https://github.com/sol/hpack#readme";
- description = "An alternative format for Haskell packages";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "hpack_0_15_0" = callPackage
({ mkDerivation, aeson, aeson-qq, base, base-compat, containers
, deepseq, directory, filepath, Glob, hspec, interpolate, mockery
, QuickCheck, temporary, text, unordered-containers, yaml
@@ -90430,7 +92526,6 @@ self: {
homepage = "https://github.com/sol/hpack#readme";
description = "An alternative format for Haskell packages";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hpack-convert" = callPackage
@@ -90649,6 +92744,7 @@ self: {
homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
description = "Coveralls.io support for Haskell.";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hpc-strobe" = callPackage
@@ -90784,15 +92880,18 @@ self: {
}) {};
"hpp" = callPackage
- ({ mkDerivation, base, directory, filepath, time, transformers }:
+ ({ mkDerivation, base, bytestring, bytestring-trie, directory
+ , filepath, ghc-prim, time, transformers
+ }:
mkDerivation {
pname = "hpp";
- version = "0.3.1.0";
- sha256 = "1ec268eee4adc227768a22e601fe8ca1f90170705b44186e9522f791172842ee";
+ version = "0.4.0";
+ sha256 = "05923e6dacc0549f50ff342a3eb2b6782fe3cdc4c6190eea0e4cabc17f429f5d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base directory filepath time transformers
+ base bytestring bytestring-trie directory filepath ghc-prim time
+ transformers
];
executableHaskellDepends = [ base directory filepath time ];
homepage = "https://github.com/acowley/hpp";
@@ -90811,6 +92910,8 @@ self: {
pname = "hpqtypes";
version = "1.5.1.1";
sha256 = "b99c214d7cc83573f5bf295837b42a13a4057dc9cab701b25798086f0d54795a";
+ revision = "1";
+ editedCabalFile = "6915ef5e4cd5c22aee26cf85b2d6b86947ada1b0c39d39b6cadcc6bf572e454c";
libraryHaskellDepends = [
aeson base bytestring containers data-default-class exceptions
lifted-base monad-control mtl resource-pool text text-show time
@@ -91017,8 +93118,8 @@ self: {
}:
mkDerivation {
pname = "hquantlib";
- version = "0.0.3.2";
- sha256 = "b26666d1d95a4895ff3e0773d8234e67c692c7f2fe740466b653face4bfb9af3";
+ version = "0.0.3.3";
+ sha256 = "208839f68a4af5f3b0e09214623c8e166f768a46b6cdc7369937ab73e8d78c28";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -91087,13 +93188,36 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hreader_1_1_0" = callPackage
+ ({ mkDerivation, base, exceptions, hset, mmorph, monad-control, mtl
+ , tagged, transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "hreader";
+ version = "1.1.0";
+ sha256 = "2a2b02c059b343ab7ff0d340b6545a003b0d563fb8a1ad2d53d6c2f4759a7d3a";
+ libraryHaskellDepends = [
+ base exceptions hset mmorph monad-control mtl tagged transformers
+ transformers-base
+ ];
+ testHaskellDepends = [ base hset transformers-base ];
+ homepage = "https://bitbucket.org/s9gf4ult/hreader";
+ description = "Generalization of MonadReader and ReaderT using hset";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hreader-lens" = callPackage
- ({ mkDerivation, base, hreader, hset, lens, profunctors }:
+ ({ mkDerivation, base, comonad, hreader, hset, lens, lens-action
+ , profunctors
+ }:
mkDerivation {
pname = "hreader-lens";
- version = "0.1.1.0";
- sha256 = "3b4cef769b0589e042c65876ebd343eb3a00d5ed449b8c6678604ac8b755d647";
- libraryHaskellDepends = [ base hreader hset lens profunctors ];
+ version = "0.1.2.0";
+ sha256 = "4d44e22ce21015f02007168bf07ae27d589e2e265a019b02410ba4b176d87728";
+ libraryHaskellDepends = [
+ base comonad hreader hset lens lens-action profunctors
+ ];
homepage = "http://github.com/dredozubov/hreader-lens";
description = "Optics for hreader package";
license = stdenv.lib.licenses.mit;
@@ -91495,7 +93619,7 @@ self: {
];
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {mesos = null; inherit (pkgs) protobuf;};
+ }) {inherit (pkgs) mesos; inherit (pkgs) protobuf;};
"hs-nombre-generator" = callPackage
({ mkDerivation, base, HandsomeSoup, hxt, random }:
@@ -91867,6 +93991,19 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hsbc" = callPackage
+ ({ mkDerivation, attoparsec, base, text, vector }:
+ mkDerivation {
+ pname = "hsbc";
+ version = "0.1.0.3";
+ sha256 = "20795b5c41fee21afa91c9d5ae4675a8954898f54e7e3a23222d3ebddbe1369a";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [ attoparsec base text vector ];
+ description = "Command Line Calculator";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"hsbencher" = callPackage
({ mkDerivation, async, base, bytestring, containers, data-default
, directory, filepath, GenericPretty, HUnit, io-streams, mtl
@@ -91937,8 +94074,8 @@ self: {
({ mkDerivation, base, containers, directory, filepath, process }:
mkDerivation {
pname = "hsc2hs";
- version = "0.68";
- sha256 = "13834608a7a768e4aeeefee0a79660b2fc7c91bb83e036f0c1cb7b0543c61fda";
+ version = "0.68.1";
+ sha256 = "507bf174c7ab14667d452efb6b539798a944f2a5fd4cd45120a1afb8551ebe75";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -92283,8 +94420,8 @@ self: {
}:
mkDerivation {
pname = "hscaffold";
- version = "0.4.4.0";
- sha256 = "f56776610c0a64fe5bf396a3d0d1fff5e2e22ad8996f1f95fa1336d7d25285df";
+ version = "0.4.5.0";
+ sha256 = "8f94525878efbe2f6c8ce80717027596d9e004a5b3ca86f1c3db8bcb2cbd365e";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -92408,21 +94545,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
@@ -92489,6 +94622,8 @@ self: {
pname = "hsdev";
version = "0.2.1.0";
sha256 = "8d89f4cf2e67c2e55a94068538818e297efa07429a26b4009eff5d04724e7794";
+ revision = "1";
+ editedCabalFile = "2ed64491515bb9af5b43ee11a203925987797d5492a3c143a37ad6eae8a7c8f6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -92847,6 +94982,28 @@ self: {
}) {inherit (pkgs) blas; inherit (pkgs) gsl;
inherit (pkgs) liblapack;};
+ "hsignal_0_2_7_5" = callPackage
+ ({ mkDerivation, array, base, binary, blas, bytestring, gsl
+ , hmatrix, hmatrix-gsl, hmatrix-gsl-stats, hstatistics, liblapack
+ , mtl, storable-complex, vector
+ }:
+ mkDerivation {
+ pname = "hsignal";
+ version = "0.2.7.5";
+ sha256 = "0f61f820556c431c3811643cc40e49a6d6c68075da1be0b39298a41c1c7119ac";
+ libraryHaskellDepends = [
+ array base binary bytestring hmatrix hmatrix-gsl hmatrix-gsl-stats
+ hstatistics mtl storable-complex vector
+ ];
+ librarySystemDepends = [ blas liblapack ];
+ libraryPkgconfigDepends = [ gsl ];
+ homepage = "http://code.haskell.org/hsignal";
+ description = "Signal processing and EEG data analysis";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) blas; inherit (pkgs) gsl;
+ inherit (pkgs) liblapack;};
+
"hsilop" = callPackage
({ mkDerivation, base, directory, filepath, haskeline, xdg-basedir
}:
@@ -93292,6 +95449,43 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hsoz" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+ , base64-bytestring, byteable, bytestring, case-insensitive
+ , containers, cryptonite, data-default, either, errors, http-client
+ , http-conduit, http-types, HUnit, lens, lucid, memory, mtl
+ , network, QuickCheck, scientific, scotty, securemem, tasty
+ , tasty-golden, tasty-hunit, tasty-quickcheck, text, time
+ , transformers, uri-bytestring, vault, wai, warp, wreq
+ }:
+ mkDerivation {
+ pname = "hsoz";
+ version = "0.0.0.3";
+ sha256 = "5aa1d06f0fe3f2f38354d12af1f6205c15894d74e5a32ed743a4ce6602573781";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson attoparsec base base16-bytestring base64-bytestring byteable
+ bytestring case-insensitive containers cryptonite data-default
+ either errors http-client http-types lens memory mtl network
+ scientific scotty securemem text time transformers uri-bytestring
+ vault wai warp
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring case-insensitive containers cryptonite
+ data-default http-client http-conduit http-types lens lucid scotty
+ text transformers uri-bytestring wai warp wreq
+ ];
+ testHaskellDepends = [
+ aeson base bytestring data-default http-client http-types HUnit
+ QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck text
+ time wai
+ ];
+ homepage = "https://github.com/rvl/hsoz";
+ description = "Iron, Hawk, Oz: Web auth protocols";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hsp" = callPackage
({ mkDerivation, base, mtl, text }:
mkDerivation {
@@ -93337,8 +95531,8 @@ self: {
}:
mkDerivation {
pname = "hsparql";
- version = "0.2.9";
- sha256 = "283e50db41018e115147f533024d874cb878f42b466f59e1f97ce3735bfd13f0";
+ version = "0.3.0";
+ sha256 = "a9b1e3ce4e7ad04634a4eec62249f877d8a2203bdd38192dee9a57714c779fe1";
libraryHaskellDepends = [
base bytestring HTTP MissingH mtl network network-uri rdf4h text
xml
@@ -93599,6 +95793,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
@@ -94118,6 +96313,7 @@ self: {
homepage = "https://bitbucket.org/wuzzeb/webdriver-utils";
description = "Write end2end web application tests using webdriver and hspec";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hspec2" = callPackage
@@ -94545,8 +96741,8 @@ self: {
}:
mkDerivation {
pname = "hstatistics";
- version = "0.2.5.3";
- sha256 = "d8a8bf9dcf6bd25ac5ca695ec1c4fc198310411cc87ab2a23ffe1d9116812a2d";
+ version = "0.2.5.4";
+ sha256 = "e657ac9bb672b502d5dec0e8920679a5833be5bfe0a8a981b7eccc0a99a0e47b";
libraryHaskellDepends = [
array base hmatrix hmatrix-gsl-stats random vector
];
@@ -94771,6 +96967,7 @@ self: {
];
description = "Synthesizable Verilog DSL supporting for multiple clock and reset";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hswip" = callPackage
@@ -95128,8 +97325,8 @@ self: {
({ mkDerivation, attoparsec, base, deepseq, text }:
mkDerivation {
pname = "html-parse";
- version = "0.1.0.0";
- sha256 = "077760e09e7ea180b786d6379b725419f9e892579a53d7469d1c09e48d7af000";
+ version = "0.2.0.0";
+ sha256 = "9c9f8401dc86ea3a9612bfc0d430a03b7e9130183f0b8dc1fa100cd0bbb84a92";
libraryHaskellDepends = [ attoparsec base deepseq text ];
homepage = "http://github.com/bgamari/html-parse";
description = "A high-performance HTML tokenizer";
@@ -95215,6 +97412,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "htn" = callPackage
+ ({ mkDerivation, base, containers, hspec }:
+ mkDerivation {
+ pname = "htn";
+ version = "0.1.0.0";
+ sha256 = "13f49c161f754d3bac7a08227b949c7a34c7658f22476fcc99f26c0d8e673ce5";
+ libraryHaskellDepends = [ base containers ];
+ testHaskellDepends = [ base containers hspec ];
+ homepage = "https://github.com/y-kamiya/htn-haskell#readme";
+ description = "resolver using htn algorithm";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"htodo" = callPackage
({ mkDerivation, base, HDBC, HDBC-sqlite3 }:
mkDerivation {
@@ -95230,34 +97440,6 @@ self: {
}) {};
"htoml" = callPackage
- ({ mkDerivation, aeson, base, bytestring, containers, file-embed
- , old-locale, parsec, tasty, tasty-hspec, tasty-hunit, text, time
- , unordered-containers, vector
- }:
- mkDerivation {
- pname = "htoml";
- version = "1.0.0.1";
- sha256 = "11145f645768abaa51c6ffda70f1c6fe7bb99163877efb13058a16d2d0bd592b";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base containers old-locale parsec text time
- unordered-containers vector
- ];
- executableHaskellDepends = [
- aeson base bytestring containers file-embed parsec tasty
- tasty-hspec tasty-hunit text time unordered-containers vector
- ];
- testHaskellDepends = [
- aeson base bytestring containers file-embed parsec tasty
- tasty-hspec tasty-hunit text time unordered-containers vector
- ];
- homepage = "https://github.com/cies/htoml";
- description = "Parser for TOML files";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "htoml_1_0_0_3" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, file-embed
, old-locale, parsec, tasty, tasty-hspec, tasty-hunit, text, time
, unordered-containers, vector
@@ -95277,7 +97459,6 @@ self: {
homepage = "https://github.com/cies/htoml";
description = "Parser for TOML files";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"htrace" = callPackage
@@ -95402,7 +97583,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "http-api-data_0_3_2" = callPackage
+ "http-api-data_0_3_3" = callPackage
({ mkDerivation, base, bytestring, containers, directory, doctest
, filepath, hashable, hspec, HUnit, QuickCheck
, quickcheck-instances, text, time, time-locale-compat
@@ -95410,8 +97591,8 @@ self: {
}:
mkDerivation {
pname = "http-api-data";
- version = "0.3.2";
- sha256 = "015fb4167f807c31af465cd8991454c3ed72ad5935ff0839993f4fcb038958f2";
+ version = "0.3.3";
+ sha256 = "cb3d7ef8a924a6b03481b7c5e26a580df72cbf89f2e8247e825f43f4b3ba8449";
libraryHaskellDepends = [
base bytestring containers hashable text time time-locale-compat
unordered-containers uri-bytestring uuid-types
@@ -95449,8 +97630,8 @@ self: {
}:
mkDerivation {
pname = "http-client";
- version = "0.4.31.1";
- sha256 = "7032cd356bc5ddd5786b315271174ed510e1a190c4210bd65abe16201b86ce0c";
+ version = "0.4.31.2";
+ sha256 = "16410148a9705677cdd89510192caf1abd3460db2a17ce0c2fafd7bd0c15d88b";
libraryHaskellDepends = [
array base base64-bytestring blaze-builder bytestring
case-insensitive containers cookie data-default-class deepseq
@@ -95469,7 +97650,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "http-client_0_5_3_4" = callPackage
+ "http-client_0_5_4" = callPackage
({ mkDerivation, array, async, base, base64-bytestring
, blaze-builder, bytestring, case-insensitive, containers, cookie
, deepseq, directory, exceptions, filepath, ghc-prim, hspec
@@ -95478,8 +97659,8 @@ self: {
}:
mkDerivation {
pname = "http-client";
- version = "0.5.3.4";
- sha256 = "34e9fee9939668a056dc0f8193cfd1906209a51a31853e7ee57f5a7548dd2689";
+ version = "0.5.4";
+ sha256 = "f226b9dd4b7a6b5ef3becddd02baeabe3429b88584a42609ca3733c84bfe7300";
libraryHaskellDepends = [
array base base64-bytestring blaze-builder bytestring
case-insensitive containers cookie deepseq exceptions filepath
@@ -95823,8 +98004,8 @@ self: {
}:
mkDerivation {
pname = "http-dispatch";
- version = "0.5.0.2";
- sha256 = "1aee418e5b2a6798036a3b93272bbd577998274f1f00fc87012db80353f83b2f";
+ version = "0.6.2.0";
+ sha256 = "8838082ba44fe02bda80830c74552e6f28093617ad75c6614e199168ea7677d3";
libraryHaskellDepends = [
base base64-bytestring bytestring case-insensitive http-client
http-client-tls http-types
@@ -95833,6 +98014,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
@@ -95922,15 +98104,15 @@ self: {
"http-link-header" = callPackage
({ mkDerivation, attoparsec, base, bytestring
, bytestring-conversion, errors, hspec, hspec-attoparsec
- , network-uri, QuickCheck, text
+ , http-api-data, network-uri, QuickCheck, text
}:
mkDerivation {
pname = "http-link-header";
- version = "1.0.2";
- sha256 = "618b33aa9518cfae4d63e3d79689642bde5eecfa33c83ea1d1e3aa33420f8685";
+ version = "1.0.3";
+ sha256 = "59bd2db4e7d14b6f7ce86848af5e38b4bd2e9963e9ffe5068c7b1a710dbdd7fe";
libraryHaskellDepends = [
- attoparsec base bytestring bytestring-conversion errors network-uri
- text
+ attoparsec base bytestring bytestring-conversion errors
+ http-api-data network-uri text
];
testHaskellDepends = [
base hspec hspec-attoparsec QuickCheck text
@@ -96081,8 +98263,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
@@ -99025,6 +101207,50 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) gmp;};
+ "idris_0_99" = callPackage
+ ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal
+ , ansi-wl-pprint, array, async, base, base64-bytestring, binary
+ , blaze-html, blaze-markup, bytestring, cheapskate, containers
+ , deepseq, directory, filepath, fingertree, fsnotify, gmp
+ , haskeline, ieee754, libffi, mtl, network, optparse-applicative
+ , parsers, pretty, process, regex-tdfa, safe, split, tagged, tasty
+ , tasty-golden, tasty-rerun, terminal-size, text, time
+ , transformers, transformers-compat, trifecta, uniplate, unix
+ , unordered-containers, utf8-string, vector
+ , vector-binary-instances, zip-archive
+ }:
+ mkDerivation {
+ pname = "idris";
+ version = "0.99";
+ sha256 = "f124c22a56d3547f878fdcfcddb36884bf69279411a724bb18b7829e8bdfa4e9";
+ configureFlags = [ "-fcurses" "-fffi" "-fgmp" ];
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async
+ base base64-bytestring binary blaze-html blaze-markup bytestring
+ cheapskate containers deepseq directory filepath fingertree
+ fsnotify haskeline ieee754 libffi mtl network optparse-applicative
+ parsers pretty process regex-tdfa safe split terminal-size text
+ time transformers transformers-compat trifecta uniplate unix
+ unordered-containers utf8-string vector vector-binary-instances
+ zip-archive
+ ];
+ librarySystemDepends = [ gmp ];
+ executableHaskellDepends = [
+ base directory filepath haskeline transformers
+ ];
+ testHaskellDepends = [
+ base bytestring containers directory filepath haskeline
+ optparse-applicative process tagged tasty tasty-golden tasty-rerun
+ time transformers
+ ];
+ homepage = "http://www.idris-lang.org/";
+ description = "Functional Programming Language with Dependent Types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) gmp;};
+
"ieee" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -99064,8 +101290,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "ieee754";
- version = "0.7.8";
- sha256 = "de4aefce42d903a3016cba4c7ebfc70d4fa0a76f8c04014c7eb3545b9ab56eff";
+ version = "0.7.9";
+ sha256 = "dc1860c545d7143ea8c7e53509ac535ca2932495f0f89b2801c960295cfcdd15";
libraryHaskellDepends = [ base ];
homepage = "http://github.com/patperry/hs-ieee754";
description = "Utilities for dealing with IEEE floating point numbers";
@@ -99082,6 +101308,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
@@ -99841,6 +102079,8 @@ self: {
pname = "imperative-edsl";
version = "0.7";
sha256 = "1a207736fb6b84e5316bbbe95593b464fe7f155db65e89fbac78b59d0e05f5f7";
+ revision = "1";
+ editedCabalFile = "c7ce36becbcecf66151a8b850abb7a19752aa0dfd68922198dd53ed95470b57c";
libraryHaskellDepends = [
array base BoundedChan containers data-default-class deepseq
directory exception-transformers ghc-prim language-c-quote
@@ -99876,27 +102116,35 @@ self: {
"implicit" = callPackage
({ mkDerivation, base, blaze-builder, blaze-markup, blaze-svg
- , bytestring, containers, deepseq, directory, filepath, JuicyPixels
- , mtl, NumInstances, optparse-applicative, parallel, parsec
- , storable-endian, text, unordered-containers, vector-space
+ , bytestring, containers, criterion, deepseq, directory, download
+ , filepath, hspec, JuicyPixels, monads-tf, mtl, NumInstances
+ , optparse-applicative, parallel, parsec, silently, snap-core
+ , snap-server, storable-endian, text, transformers
+ , unordered-containers, vector-space
}:
mkDerivation {
pname = "implicit";
- version = "0.0.5";
- sha256 = "aa5a5de53ad25517a9ce044c21572f42262e537c848a81fd2be5b32c88d2fc9e";
- revision = "1";
- editedCabalFile = "9f5c887aaa0c834171243bf2acdc5e6234e124c3ee3f55c8c10ce37a7690500a";
+ version = "0.1.0";
+ sha256 = "f3120deca5f140e91ebf1af9ff035ca0a469024bd4e8855132aa24781f65d09b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base blaze-builder blaze-markup blaze-svg bytestring containers
- deepseq directory filepath JuicyPixels mtl NumInstances
- optparse-applicative parallel parsec storable-endian text
- unordered-containers vector-space
+ criterion deepseq directory download filepath JuicyPixels monads-tf
+ NumInstances parallel parsec silently snap-core snap-server
+ storable-endian text transformers unordered-containers vector-space
];
- homepage = "https://github.com/colah/ImplicitCAD";
+ executableHaskellDepends = [
+ base blaze-builder blaze-markup blaze-svg bytestring containers
+ criterion deepseq directory filepath JuicyPixels monads-tf
+ optparse-applicative parallel parsec silently snap-core snap-server
+ storable-endian text transformers vector-space
+ ];
+ testHaskellDepends = [ base containers hspec mtl parsec ];
+ homepage = "http://kalli1.faikvm.com/ImplicitCAD/Stable";
description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export..";
- license = "GPL";
+ license = stdenv.lib.licenses.agpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"implicit-logging" = callPackage
@@ -100650,22 +102898,24 @@ self: {
}) {};
"inline-java" = callPackage
- ({ mkDerivation, base, binary, bytestring, containers
- , distributed-closure, filepath, ghc-heap-view, hspec, inline-c
- , jni, jvm, language-java, monad-loops, process, singletons, syb
+ ({ mkDerivation, base, binary, bytestring, Cabal, containers
+ , directory, distributed-closure, filepath, ghc-heap-view, hspec
+ , inline-c, jni, jvm, language-java, process, singletons, syb
, template-haskell, temporary, text, thread-local-storage, vector
}:
mkDerivation {
pname = "inline-java";
- version = "0.5.1";
- sha256 = "b134f3a7904da62a23118bffe7f42bee1ea0c6fa4b84216679609520faeea098";
+ version = "0.6";
+ sha256 = "364c14c0003b6bdbb6338c017ff706ca2bd57dde828c801a1b588356ce15a4c1";
libraryHaskellDepends = [
- base binary bytestring containers distributed-closure filepath
- ghc-heap-view inline-c jni jvm language-java monad-loops process
- singletons syb template-haskell temporary text thread-local-storage
- vector
+ base binary bytestring Cabal containers directory
+ distributed-closure filepath ghc-heap-view inline-c jni jvm
+ language-java process singletons syb template-haskell temporary
+ text thread-local-storage vector
+ ];
+ testHaskellDepends = [
+ base bytestring hspec jni jvm singletons text
];
- testHaskellDepends = [ base bytestring hspec jvm singletons text ];
homepage = "http://github.com/tweag/inline-java#readme";
description = "Java interop via inline Java code in Haskell modules";
license = stdenv.lib.licenses.bsd3;
@@ -100702,6 +102952,7 @@ self: {
homepage = "https://tweag.github.io/HaskellR";
description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) R;};
"inquire" = callPackage
@@ -100975,6 +103226,8 @@ self: {
pname = "integer-gmp";
version = "1.0.0.1";
sha256 = "ef11daab7d7007b6be61846350a947173c46475c833623bcac45aa532ec3c121";
+ revision = "1";
+ editedCabalFile = "616d1775344a82a0ae1db1791fba719f4682a1ace908582ac4026db14231d4d5";
libraryHaskellDepends = [ ghc-prim ];
description = "Integer library based on GMP";
license = stdenv.lib.licenses.bsd3;
@@ -101104,14 +103357,14 @@ self: {
}:
mkDerivation {
pname = "interlude-l";
- version = "0.1.0.7";
- sha256 = "0cef80ef63038b398438f8e3ab60760ef17fab380f5d8534d595237a07cb0bb7";
+ version = "0.1.0.8";
+ sha256 = "5eb16c248a0528543702ae17452c8cdb31d525f1bc95b4e9ea146682fab93100";
libraryHaskellDepends = [
aeson base exceptions lens monad-control MonadRandom mtl protolude
string-conv text transformers witherable
];
description = "Prelude replacement based on protolude";
- license = stdenv.lib.licenses.bsd3;
+ license = stdenv.lib.licenses.mit;
}) {};
"intern" = callPackage
@@ -101156,8 +103409,8 @@ self: {
}:
mkDerivation {
pname = "intero";
- version = "0.1.19";
- sha256 = "77dbd2811296b7b6a57a2d90d59580ea6d0d13f7611528233e020978408521ad";
+ version = "0.1.20";
+ sha256 = "e93fd2df3a3cd1c6a0203420a94b0329c08b51a51ef8d5ec5a38efe61469da77";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -102034,16 +104287,16 @@ self: {
}) {};
"irc-core" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, hashable, HUnit
- , memory, primitive, text, time, vector
+ ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring
+ , hashable, HUnit, primitive, text, time, vector
}:
mkDerivation {
pname = "irc-core";
- version = "2.2.0.0";
- sha256 = "2e491a8a9d3c0dbb3413c8bebc1e37d0636d2cb8367f4b257141f891107b4834";
+ version = "2.2.0.1";
+ sha256 = "6c160d1073ee40b12d294f1e4dbb4691aedb73150eebf027475db05ce1efa20a";
libraryHaskellDepends = [
- attoparsec base bytestring hashable memory primitive text time
- vector
+ attoparsec base base64-bytestring bytestring hashable primitive
+ text time vector
];
testHaskellDepends = [ base hashable HUnit text ];
homepage = "https://github.com/glguy/irc-core";
@@ -102221,8 +104474,8 @@ self: {
}:
mkDerivation {
pname = "iridium";
- version = "0.1.5.5";
- sha256 = "161d533ebde52dd4854a8d8e46f1d4c506178a94672a61948f1f70ed6db1b726";
+ version = "0.1.5.6";
+ sha256 = "18a0ee5f08996a263dcf484bb48749d6a3df502729a7c386b5b7133b80f23577";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -102235,7 +104488,7 @@ self: {
base extra multistate text transformers unordered-containers yaml
];
homepage = "https://github.com/lspitzner/iridium";
- description = "Automated Local Testing and Package Uploading";
+ description = "Automated Local Cabal Package Testing and Uploading";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -102416,24 +104669,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
@@ -102502,6 +104757,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "itemfield" = callPackage
+ ({ mkDerivation, base, brick, data-default, HUnit, microlens
+ , microlens-th, QuickCheck, random, test-framework
+ , test-framework-hunit, test-framework-quickcheck2, text, vty
+ }:
+ mkDerivation {
+ pname = "itemfield";
+ version = "1.2.2.1";
+ sha256 = "fe8bfe62a98a286f86f80f65cd3d5c09097fcc75eafda4281e8c19f999233b90";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base brick microlens text vty ];
+ executableHaskellDepends = [
+ base brick data-default microlens microlens-th random text vty
+ ];
+ testHaskellDepends = [
+ base brick data-default HUnit microlens microlens-th QuickCheck
+ test-framework test-framework-hunit test-framework-quickcheck2 text
+ vty
+ ];
+ description = "A brick Widget for selectable summary of many elements on a terminal";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"iter-stats" = callPackage
({ mkDerivation, base, heap, HUnit, iteratee, ListLike, mtl
, statistics, test-framework, test-framework-hunit
@@ -102699,8 +104979,10 @@ self: {
}:
mkDerivation {
pname = "ivory";
- version = "0.1.0.4";
- sha256 = "96a056e1f3d766223d93dcd3aaedd6619aa1806f31903c3f46e30a058705583f";
+ version = "0.1.0.5";
+ sha256 = "437d5bc2fa69037e6fa5beb7d0a7b27f4d7e92404531b698be5a84946294a158";
+ revision = "1";
+ editedCabalFile = "0fa37aeb8c009a31030e0fe7fbb278907c41909c0f06d74b9942adbf58fc446f";
libraryHaskellDepends = [
array base base-compat containers dlist filepath monadLib pretty
template-haskell text th-lift
@@ -102718,8 +105000,8 @@ self: {
}:
mkDerivation {
pname = "ivory-artifact";
- version = "0.1.0.4";
- sha256 = "a2aa0b21fa58c5f87d5001f74fcbfda439a6dbfb56577214447c75f3b204ce8c";
+ version = "0.1.0.5";
+ sha256 = "7a2bac5f9abebc2edbad78b010056a6a75722681ec0c636951bc044774ee7934";
libraryHaskellDepends = [
base directory filepath HStringTemplate text utf8-string
];
@@ -102736,8 +105018,10 @@ self: {
}:
mkDerivation {
pname = "ivory-backend-c";
- version = "0.1.0.4";
- sha256 = "1515d217549af8189b83a5963ddfd6d202b58cdb9f98644a41988e7b67884caf";
+ version = "0.1.0.5";
+ sha256 = "e07d69634f6b50145f51886b87b7556bd6eb01e21bcd6476f849071a1120e535";
+ revision = "1";
+ editedCabalFile = "d628f3ab8d4d61816af6f9ff9fb34bf8cbcf28d2ff75246aa86303a59c457d1a";
libraryHaskellDepends = [
base base-compat bytestring containers directory filepath ivory
ivory-artifact ivory-opts language-c-quote mainland-pretty monadLib
@@ -102775,8 +105059,8 @@ self: {
}:
mkDerivation {
pname = "ivory-eval";
- version = "0.1.0.4";
- sha256 = "dd4f92558eea73265d680963bfad48112c782ed144726ee001f547216368e020";
+ version = "0.1.0.5";
+ sha256 = "059811a8cfe1f77c4bb5c21690999a3a1544dd30fd56f89d7957c71e5534f662";
libraryHaskellDepends = [
base base-compat containers ivory monadLib
];
@@ -102796,10 +105080,10 @@ self: {
}:
mkDerivation {
pname = "ivory-examples";
- version = "0.1.0.4";
- sha256 = "d61091b079166b06537feb0a719d7e4e09718732df3f1f264167af800f72900a";
- revision = "2";
- editedCabalFile = "7b0f9b186a1356c9210ecfe4ae198b1fa3056f1c78188126b83fbd39c09e253f";
+ version = "0.1.0.5";
+ sha256 = "539b65b7068f7dbcb128401ac4ec8c08ee2a0db074087cd923bbf38daf530356";
+ revision = "1";
+ editedCabalFile = "a83f6151b08ade845ef527ad07fcee41ac20bc02ba02fc8ee3786c278685da39";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -102816,8 +105100,8 @@ self: {
({ mkDerivation, base, filepath, ivory, ivory-artifact }:
mkDerivation {
pname = "ivory-hw";
- version = "0.1.0.4";
- sha256 = "d441e06d61ffaada4719d6b274d090308accba9e71f49bd3d31be608f26193dc";
+ version = "0.1.0.5";
+ sha256 = "9379da7f7e30587f79d8de501725d9c8b0eeb7105db2362a5889d82163ca4140";
libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
homepage = "http://ivorylang.org";
description = "Ivory hardware model (STM32F4)";
@@ -102831,8 +105115,8 @@ self: {
}:
mkDerivation {
pname = "ivory-opts";
- version = "0.1.0.4";
- sha256 = "14c1337cdd8f4a06ff6e99e050fb5d9bd98ec221c77de510368cb8aa4f7b7019";
+ version = "0.1.0.5";
+ sha256 = "36bbf696b1f711885a2493233d09a304686572ff32d0e7e8f30c0a8ebc139340";
libraryHaskellDepends = [
base base-compat containers data-reify dlist fgl filepath ivory
monadLib pretty
@@ -102850,8 +105134,8 @@ self: {
}:
mkDerivation {
pname = "ivory-quickcheck";
- version = "0.2.0.4";
- sha256 = "c7c3e1dcf2c3bbf21612445155f1e869576e5dcd9099b7d4eea0694b327d63a5";
+ version = "0.2.0.5";
+ sha256 = "9a93f90f18b2a9e508ef4f25d980cdb39e2ac3a11061878cbb9028c40fb953f0";
libraryHaskellDepends = [
base base-compat ivory ivory-backend-c ivory-eval monadLib
QuickCheck random
@@ -102872,8 +105156,8 @@ self: {
}:
mkDerivation {
pname = "ivory-serialize";
- version = "0.1.0.4";
- sha256 = "bf73dccdcac406b7adc8981e01d9b363df6411ce7e7bb70daf2f6065f17abc12";
+ version = "0.1.0.5";
+ sha256 = "4ef3bcafba676e83cff6c4ede3b931124069d3baad87568e641cefccb2db1a9a";
libraryHaskellDepends = [
base base-compat filepath ivory ivory-artifact monadLib
];
@@ -102886,8 +105170,8 @@ self: {
({ mkDerivation, base, filepath, ivory, ivory-artifact }:
mkDerivation {
pname = "ivory-stdlib";
- version = "0.1.0.4";
- sha256 = "912b78ed7b5143ff54517f3c483dd73dab9401cfce2c0a4f43fcdc9ca7413c5b";
+ version = "0.1.0.5";
+ sha256 = "af6ed58d447a770deb83c854c4a611bd0fee36efb59feb5afc0729ac8be7abe9";
libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
homepage = "http://ivorylang.org";
description = "Ivory standard library";
@@ -103043,8 +105327,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
@@ -103208,6 +105492,42 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "jason" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, text
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "jason";
+ version = "0.1.0.1";
+ sha256 = "a36a5f9cf93da0c03ede25407ce724c0b8f8e13285074f8bea57e50ea4e49d04";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base containers text unordered-containers vector
+ ];
+ executableHaskellDepends = [ aeson base bytestring text ];
+ testHaskellDepends = [ aeson base bytestring text ];
+ 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-adt" = callPackage
+ ({ mkDerivation, alex, array, base, happy, pretty }:
+ mkDerivation {
+ pname = "java-adt";
+ version = "0.2016.11.28";
+ sha256 = "874de697e2bee902ba89b4527459eabbd8b6f6b3d63df1946ea22dfdad2092dc";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [ array base pretty ];
+ executableToolDepends = [ alex happy ];
+ homepage = "http://github.com/andreasabel/java-adt";
+ description = "Create immutable algebraic data structures for Java";
+ license = "unknown";
+ }) {};
+
"java-bridge" = callPackage
({ mkDerivation, base, bimap, containers, cpphs, directory
, filepath, hinduce-missingh, hint, mtl, multimap, named-records
@@ -103492,7 +105812,7 @@ self: {
}) {};
"jni" = callPackage
- ({ mkDerivation, base, bytestring, containers, inline-c, jvm
+ ({ mkDerivation, base, bytestring, containers, inline-c, jdk
, singletons, thread-local-storage
}:
mkDerivation {
@@ -103502,12 +105822,12 @@ self: {
libraryHaskellDepends = [
base bytestring containers inline-c singletons thread-local-storage
];
- librarySystemDepends = [ jvm ];
+ librarySystemDepends = [ jdk ];
homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme";
description = "Complete JNI raw bindings";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {jvm = null;};
+ }) {inherit (pkgs) jdk;};
"jobqueue" = callPackage
({ mkDerivation, aeson, async, attoparsec, base, bytestring
@@ -103623,7 +105943,7 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
- "jose_0_5_0_0" = callPackage
+ "jose_0_5_0_2" = callPackage
({ mkDerivation, aeson, attoparsec, base, base64-bytestring
, byteable, bytestring, containers, cryptonite, hspec, lens, memory
, monad-time, mtl, network-uri, QuickCheck, quickcheck-instances
@@ -103632,8 +105952,8 @@ self: {
}:
mkDerivation {
pname = "jose";
- version = "0.5.0.0";
- sha256 = "cb2da4049b288be97e1a7530fbf0ff86cf98a3277b13cd84ba352519741b36ce";
+ version = "0.5.0.2";
+ sha256 = "25958a11561f56363bb7dcdcd1ebbc97bf231ee68ed393b117c90fff0cf07abc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -103730,23 +106050,19 @@ self: {
}) {};
"jsaddle" = callPackage
- ({ mkDerivation, aeson, base, bytestring, containers, doctest
- , filepath, http-types, lens, primitive, process, QuickCheck
- , ref-tf, stm, template-haskell, text, time, transformers, vector
- , wai, wai-app-static, wai-websockets, warp, websockets
+ ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+ , bytestring, containers, deepseq, filepath, ghc-prim, http-types
+ , lens, primitive, process, ref-tf, scientific, stm, text, time
+ , transformers, unordered-containers, vector
}:
mkDerivation {
pname = "jsaddle";
- version = "0.5.2.0";
- sha256 = "216fe089de60352956df2aa3abcb1e28861e81d1943ae1a17ac7947aad18a4fb";
+ version = "0.8.0.1";
+ sha256 = "de68f74a6a546b91ce0a1a74512db7d1a7a583a4455d0de5ef9d300cf179cb3b";
libraryHaskellDepends = [
- aeson base bytestring containers filepath http-types lens primitive
- process ref-tf stm template-haskell text time transformers wai
- wai-app-static wai-websockets warp websockets
- ];
- testHaskellDepends = [
- base bytestring doctest filepath http-types process QuickCheck text
- vector wai wai-app-static wai-websockets warp websockets
+ aeson attoparsec base base64-bytestring bytestring containers
+ deepseq filepath ghc-prim http-types lens primitive process ref-tf
+ scientific stm text time transformers unordered-containers vector
];
description = "Interface for JavaScript that works with GHCJS and GHC";
license = stdenv.lib.licenses.mit;
@@ -103759,8 +106075,8 @@ self: {
}:
mkDerivation {
pname = "jsaddle-dom";
- version = "0.5.0.1";
- sha256 = "fb64e3a7924c6191e39f61845fec44acc14502b5d70e6ec3b8fd12dbadb9904a";
+ version = "0.7.0.3";
+ sha256 = "3ee57a6d2640833a511ac1b0aadbfa46bd0be09efabde9bb5e32ddb6d330a2df";
libraryHaskellDepends = [
base base-compat jsaddle lens text transformers
];
@@ -103784,6 +106100,79 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "jsaddle-warp" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, deepseq
+ , doctest, filepath, ghc-prim, http-types, jsaddle, lens, primitive
+ , process, QuickCheck, ref-tf, stm, text, time, transformers, wai
+ , wai-websockets, warp, websockets
+ }:
+ mkDerivation {
+ pname = "jsaddle-warp";
+ version = "0.8.0.0";
+ sha256 = "468f4748bdbeb8cf86054ef61260152ce0ef41c23cd2f10d9bb50dbe8732ba50";
+ libraryHaskellDepends = [
+ aeson base containers http-types jsaddle stm text time transformers
+ wai wai-websockets warp websockets
+ ];
+ testHaskellDepends = [
+ base bytestring deepseq doctest filepath ghc-prim jsaddle lens
+ primitive process QuickCheck ref-tf
+ ];
+ description = "Interface for JavaScript that works with GHCJS and GHC";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "jsaddle-webkit2gtk" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, directory, gi-gio
+ , gi-glib, gi-gtk, gi-javascriptcore, gi-webkit2, haskell-gi-base
+ , jsaddle, text, unix, webkit2gtk3-javascriptcore
+ }:
+ mkDerivation {
+ pname = "jsaddle-webkit2gtk";
+ version = "0.8.1.0";
+ sha256 = "f21e613da36ad510fce1d609eef6a966e11da97a35bdf81ce7924bca56729da6";
+ libraryHaskellDepends = [
+ aeson base bytestring directory gi-gio gi-glib gi-gtk
+ gi-javascriptcore gi-webkit2 haskell-gi-base jsaddle text unix
+ webkit2gtk3-javascriptcore
+ ];
+ description = "Interface for JavaScript that works with GHCJS and GHC";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "jsaddle-webkitgtk" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, directory, gi-glib
+ , gi-gtk, gi-javascriptcore, gi-webkit, haskell-gi-base, jsaddle
+ , text, unix, webkitgtk3-javascriptcore
+ }:
+ mkDerivation {
+ pname = "jsaddle-webkitgtk";
+ version = "0.8.1.0";
+ sha256 = "baa5ecd99c21046cbe5fe2126d4b072a12419aaf03eb1adf8b97b620c7760437";
+ libraryHaskellDepends = [
+ aeson base bytestring directory gi-glib gi-gtk gi-javascriptcore
+ gi-webkit haskell-gi-base jsaddle text unix
+ webkitgtk3-javascriptcore
+ ];
+ description = "Interface for JavaScript that works with GHCJS and GHC";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "jsaddle-wkwebview" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, jsaddle }:
+ mkDerivation {
+ pname = "jsaddle-wkwebview";
+ version = "0.8.0.0";
+ sha256 = "8770e3f9a452502d62025a142aaabc95ac759625fd56f4600217fc8d9ac69dd1";
+ 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
({ mkDerivation, base, jmacro, lens, template-haskell, text
, transformers, webkitgtk3, webkitgtk3-javascriptcore
@@ -103857,8 +106246,8 @@ self: {
}:
mkDerivation {
pname = "json-assertions";
- version = "1.0.7";
- sha256 = "0a2b071178b27b8ab295040c22b712c17278986b6829b2a085819b85fdd7e3f4";
+ version = "1.0.8";
+ sha256 = "d4e060ec54e264581e47d409e303dc3165c311dcfcd6127278c99b7a876ae259";
libraryHaskellDepends = [
aeson base indexed indexed-free lens lens-aeson text
];
@@ -103922,12 +106311,12 @@ self: {
({ mkDerivation, aeson, base, bytestring, containers, directory
, filepath, GenericPretty, hashable, hflags, lens, mmap, mtl
, pretty, process, QuickCheck, scientific, smallcheck, text
- , uniplate, unordered-containers, vector
+ , uniplate, unordered-containers, vector, yaml
}:
mkDerivation {
pname = "json-autotype";
- version = "1.0.14";
- sha256 = "37536fd9cd18ae8fa9527359cbfb8c69dc5bed51abdd7c7931ac0d12642fd2f4";
+ version = "1.0.15";
+ sha256 = "4552e903a49953d48a5f60fb8532b51c40f3061c39cc842d6282ab42f6bbe045";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -103938,7 +106327,7 @@ self: {
executableHaskellDepends = [
aeson base bytestring containers filepath GenericPretty hashable
hflags lens mtl pretty process scientific text uniplate
- unordered-containers vector
+ unordered-containers vector yaml
];
testHaskellDepends = [
aeson base bytestring containers directory filepath GenericPretty
@@ -103997,8 +106386,8 @@ self: {
}:
mkDerivation {
pname = "json-bytes-builder";
- version = "0.4";
- sha256 = "f4f6084ee679640c97a62e0bf108fc7526fab7d69e786c881281c94e416e2e97";
+ version = "0.5";
+ sha256 = "b2c1114ef0a164fdf6b5c0899790fd5c91fa98b66b4a65475ba82829a5efa3ad";
libraryHaskellDepends = [
base base-prelude bytestring scientific semigroups text
];
@@ -104050,10 +106439,8 @@ self: {
}:
mkDerivation {
pname = "json-extra";
- version = "0.1.0.1";
- sha256 = "7a3a70ea9e1f4c9538a91563446ec0bcdfe6c10967b116fbe9b1ca99173216f3";
- revision = "1";
- editedCabalFile = "76113c3d47cb5d8087ffe18e1b09eaa22cc8dcd07010537739c7f1e4dc6b0741";
+ version = "0.2.0.0";
+ sha256 = "f8d8c1721f148ff2c3ed02a55944804cf050fcec3587935a0e076fc61c608a93";
libraryHaskellDepends = [
aeson base bytestring data-default template-haskell
unordered-containers yaml
@@ -104143,8 +106530,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
];
@@ -104363,8 +106750,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
];
@@ -104672,8 +107059,8 @@ self: {
}:
mkDerivation {
pname = "jukebox";
- version = "0.2.9";
- sha256 = "1f551eb113d97545ec3343a2e1e23dbf8ae1dfadef8d864d82e32cb664b54854";
+ version = "0.2.10";
+ sha256 = "24f5eb0e48f6f05fe8ef41400891f3fd3ce2a7d4ac59822454c610a79a4ffad8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -104787,6 +107174,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
@@ -104845,6 +107234,128 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "kafka-device" = callPackage
+ ({ mkDerivation, aeson, base, binary, bytestring, cereal, milena
+ , mtl
+ }:
+ mkDerivation {
+ pname = "kafka-device";
+ version = "0.1.5.0";
+ sha256 = "e43b2e3ed49285745bf3dde7b870f61b87dc4f5ef8fdc31bda56c5ee22c18004";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base binary bytestring cereal milena mtl
+ ];
+ executableHaskellDepends = [
+ aeson base binary bytestring cereal milena mtl
+ ];
+ homepage = "https://bitbucket.org/functionally/kafka-device";
+ description = "UI device events via a Kafka message broker";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "kafka-device-glut" = callPackage
+ ({ mkDerivation, base, GLUT, kafka-device, milena, OpenGL }:
+ mkDerivation {
+ pname = "kafka-device-glut";
+ version = "0.1.3.0";
+ sha256 = "c06c42b23f1fcec14fad72e690b2360942e56a6b5d3f7d7496c379dd22887f8f";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base GLUT kafka-device milena OpenGL ];
+ executableHaskellDepends = [
+ base GLUT kafka-device milena OpenGL
+ ];
+ homepage = "https://bitbucket.org/functionally/kafka-device-glut";
+ description = "GLUT events via a Kafka message broker";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "kafka-device-joystick" = callPackage
+ ({ mkDerivation, aeson, base, binary, bytestring, cereal
+ , kafka-device, milena
+ }:
+ mkDerivation {
+ pname = "kafka-device-joystick";
+ version = "0.1.5.0";
+ sha256 = "ec7cdb06a7ddc8aa54238cf3b762721ce81ff22021daa16f559abf75350798cd";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base binary bytestring cereal kafka-device milena
+ ];
+ executableHaskellDepends = [
+ aeson base binary bytestring cereal kafka-device milena
+ ];
+ homepage = "https://bitbucket.org/functionally/kafka-device-joystick";
+ description = "Linux joystick events via a Kafka message broker";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "kafka-device-leap" = callPackage
+ ({ mkDerivation, aeson, base, hleap, kafka-device, milena
+ , websockets
+ }:
+ mkDerivation {
+ pname = "kafka-device-leap";
+ version = "0.1.3.0";
+ sha256 = "d9440f6991d230caed95c81940569c77d7911616c2d598a8cb5e770e41cada3a";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base hleap kafka-device milena websockets
+ ];
+ executableHaskellDepends = [
+ aeson base hleap kafka-device milena websockets
+ ];
+ homepage = "https://bitbucket.org/functionally/kafka-device-leap";
+ description = "Leap Motion events via a Kafka message broker";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "kafka-device-spacenav" = callPackage
+ ({ mkDerivation, aeson, base, binary, bytestring, cereal
+ , kafka-device, milena
+ }:
+ mkDerivation {
+ pname = "kafka-device-spacenav";
+ version = "0.1.5.0";
+ sha256 = "c501b38ef88ac3d8e870f6ce698a299508cbabb2088c472c8163bcca5d53cf7d";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base binary bytestring cereal kafka-device milena
+ ];
+ executableHaskellDepends = [
+ aeson base binary bytestring cereal kafka-device milena
+ ];
+ homepage = "https://bitbucket.org/functionally/kafka-device-spacenav";
+ description = "Linux SpaceNavigator events via a Kafka message broker";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "kafka-device-vrpn" = callPackage
+ ({ mkDerivation, base, kafka-device, milena, vrpn }:
+ mkDerivation {
+ pname = "kafka-device-vrpn";
+ version = "0.1.5.0";
+ sha256 = "27df692620b7fbd293520108c236406cad95aed665c4807afc15d8efc9c006bb";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base kafka-device milena vrpn ];
+ executableHaskellDepends = [ base kafka-device milena vrpn ];
+ homepage = "https://bitbucket.org/functionally/kafka-device-vrpn";
+ description = "VRPN events via a Kafka message broker";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"kaleidoscope" = callPackage
({ mkDerivation, base, containers, haskeline, llvm-general
, llvm-general-pure, mtl, parsec, transformers
@@ -104869,6 +107380,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "kalman" = callPackage
+ ({ mkDerivation, base, Chart, Chart-cairo, Chart-diagrams, hmatrix
+ , random-fu, random-fu-multivariate, vector
+ }:
+ mkDerivation {
+ pname = "kalman";
+ version = "1.0.0.2";
+ sha256 = "817cc80d31a8c06864978991b7c16fb11c5910f113d7f2157fff45504c4e3c07";
+ libraryHaskellDepends = [
+ base hmatrix random-fu random-fu-multivariate vector
+ ];
+ testHaskellDepends = [
+ base Chart Chart-cairo Chart-diagrams hmatrix random-fu
+ random-fu-multivariate
+ ];
+ homepage = "https://github.com/idontgetoutmuch/Kalman";
+ description = "Kalman and particle filters and smoothers";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"kan-extensions" = callPackage
({ mkDerivation, adjunctions, array, base, comonad, containers
, contravariant, distributive, free, mtl, semigroupoids, tagged
@@ -105045,14 +107577,14 @@ self: {
, directory, either, exceptions, hostname, microlens, microlens-th
, monad-control, mtl, old-locale, quickcheck-instances, regex-tdfa
, resourcet, semigroups, string-conv, tasty, tasty-golden
- , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text
- , time, time-locale-compat, transformers, transformers-base
+ , tasty-hunit, tasty-quickcheck, template-haskell, text, time
+ , time-locale-compat, transformers, transformers-base
, transformers-compat, unix, unordered-containers
}:
mkDerivation {
pname = "katip";
- version = "0.3.1.0";
- sha256 = "bd7ba7fcab3a6cd5ed9a1e38f750c06e7fed53d549c9fe974fb74b4a6446ced3";
+ version = "0.3.1.3";
+ sha256 = "8a733a9888157781c60ec3b223bf0256839fb923e41473f3118289ab175413fa";
libraryHaskellDepends = [
aeson auto-update base bytestring containers either exceptions
hostname microlens microlens-th monad-control mtl old-locale
@@ -105063,8 +107595,7 @@ self: {
testHaskellDepends = [
aeson base bytestring directory microlens quickcheck-instances
regex-tdfa tasty tasty-golden tasty-hunit tasty-quickcheck
- template-haskell temporary text time time-locale-compat
- unordered-containers
+ template-haskell text time time-locale-compat unordered-containers
];
homepage = "https://github.com/Soostone/katip";
description = "A structured logging framework";
@@ -105081,8 +107612,8 @@ self: {
}:
mkDerivation {
pname = "katip-elasticsearch";
- version = "0.3.0.0";
- sha256 = "93aec808795efb6add91cd294f6612db8d0207f6192d6a518932484dca8a9a45";
+ version = "0.3.0.1";
+ sha256 = "92ad73f911363b879e7d8ba4b4249469ca7b6807f0469ca5648e64e38d5720d6";
libraryHaskellDepends = [
aeson async base bloodhound enclosed-exceptions exceptions
http-client http-types katip retry scientific stm stm-chans text
@@ -105582,8 +108113,8 @@ self: {
}:
mkDerivation {
pname = "keera-hails-reactivevalues";
- version = "0.2.2.0";
- sha256 = "27756d64d0b275d9556f0ffbefdad8e1bb9942f5fc17d585e6148cfc31496e8b";
+ version = "0.2.2.1";
+ sha256 = "27785b27fafb6249a538d400dd47405fa66fc5267de1f17b7ff7a4a4fe738566";
libraryHaskellDepends = [ base contravariant ];
testHaskellDepends = [
base directory filepath hlint HUnit mtl process QuickCheck
@@ -105779,8 +108310,8 @@ self: {
}:
mkDerivation {
pname = "keysafe";
- version = "0.20161022";
- sha256 = "2b6cc28f249b18dcdb0263ccb649598ddc8196f449e14130a20b0358711151a1";
+ version = "0.20161107";
+ sha256 = "ded1fd52ede4c574a4dd85ff60296f0e1bfe9b248857ee83025247790a03dfe7";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -106219,6 +108750,8 @@ self: {
pname = "kqueue";
version = "0.2";
sha256 = "700c6daf8a3f6ff1dbbc7f8ef10f3acb2ffddb4ccc65a68fa533907802f67369";
+ revision = "1";
+ editedCabalFile = "cea5494eb8fc333d8f9d35768eea1c813620f39e35f1a37feae1811aa57b9850";
libraryHaskellDepends = [ base directory filepath mtl time unix ];
libraryToolDepends = [ c2hs ];
homepage = "http://github.com/hesselink/kqueue";
@@ -106244,6 +108777,33 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "krapsh" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, base16-bytestring
+ , binary, bytestring, containers, cryptohash-sha256, deepseq
+ , exceptions, formatting, hashable, hspec, lens, monad-logger, mtl
+ , QuickCheck, random, raw-strings-qq, scientific, SHA, text
+ , text-format, transformers, unordered-containers, vector, wreq
+ }:
+ mkDerivation {
+ pname = "krapsh";
+ version = "0.1.6.0";
+ sha256 = "12c4c3a9d4e0d013056ad269a51ae77078a6a582b9b5924d5e58b73251176d6e";
+ libraryHaskellDepends = [
+ aeson aeson-pretty base base16-bytestring binary bytestring
+ containers cryptohash-sha256 deepseq exceptions formatting hashable
+ lens monad-logger mtl QuickCheck random scientific SHA text
+ text-format transformers unordered-containers vector wreq
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers formatting hspec QuickCheck
+ raw-strings-qq text vector
+ ];
+ homepage = "https://github.com/krapsh/kraps-haskell";
+ description = "Haskell bindings for Spark Dataframes and Datasets";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"krpc" = callPackage
({ mkDerivation, base, bencoding, bytestring, containers
, data-default-class, hspec, lifted-base, monad-control
@@ -106556,8 +109116,8 @@ self: {
}:
mkDerivation {
pname = "lambda-calculator";
- version = "0.5.0";
- sha256 = "b6f3da4fbb70574ad0131b0ca2ff509031eebf17b8ab650c71651b2aedda26a1";
+ version = "1.0.0";
+ sha256 = "c0010570a3f90cd6eb74b36e6787eb19a01f49005fe24de72ca957406909dc86";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base parsec ];
@@ -106633,6 +109193,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "lambda-sampler" = callPackage
+ ({ mkDerivation, base, MonadRandom, mtl, QuickCheck, test-framework
+ , test-framework-quickcheck2, transformers
+ }:
+ mkDerivation {
+ pname = "lambda-sampler";
+ version = "1.0";
+ sha256 = "caa0d9284dc39ca81a8ff86e4c675d24937dbbe7b6298d9c0aa13524e12d1af2";
+ libraryHaskellDepends = [ base MonadRandom mtl transformers ];
+ testHaskellDepends = [
+ base QuickCheck test-framework test-framework-quickcheck2
+ ];
+ homepage = "https://github.com/maciej-bendkowski/lambda-sampler";
+ description = "Boltzmann sampler utilities for lambda calculus";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"lambda-toolbox" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -106728,7 +109306,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
@@ -106781,6 +109359,7 @@ self: {
homepage = "http://haskell.org/haskellwiki/Lambdabot";
description = "Lambdabot Haskell plugins";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"lambdabot-irc-plugins" = callPackage
@@ -107003,29 +109582,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.1";
+ sha256 = "48e0869887cf6e01abe45e95f117c6bb2e50c4d1f0c23895a59438da19fad4e7";
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";
@@ -107112,8 +109685,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
@@ -107128,8 +109701,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;
@@ -107164,8 +109737,8 @@ self: {
}:
mkDerivation {
pname = "lambdatex";
- version = "0.1.0.4";
- sha256 = "0f289460551802ad7d01c1bfc0c52c827e20e961633e228e33cb9dc8bdd178bf";
+ version = "0.1.1.0";
+ sha256 = "ab86128908697c0f595076b36769e26365d927ade325879d9b350deb489c0164";
libraryHaskellDepends = [
async base containers directory HaTeX mtl text transformers
];
@@ -107370,8 +109943,8 @@ self: {
}:
mkDerivation {
pname = "language-c-quote";
- version = "0.11.7";
- sha256 = "d35d3b22cc12ed6e7b1036401d394f0a55c9b278e807144f64d0eca41121a230";
+ version = "0.11.7.1";
+ sha256 = "5583e92748e6b4cac01536bff86eb119e424e136e03bb3ea0d2db3217328f88c";
libraryHaskellDepends = [
array base bytestring containers exception-mtl
exception-transformers filepath haskell-src-meta mainland-pretty
@@ -107689,28 +110262,6 @@ self: {
}) {};
"language-javascript" = callPackage
- ({ mkDerivation, alex, array, base, blaze-builder, bytestring
- , Cabal, containers, happy, hspec, mtl, QuickCheck, text
- , utf8-light, utf8-string
- }:
- mkDerivation {
- pname = "language-javascript";
- version = "0.6.0.8";
- sha256 = "98a48760012d7b9eb7625532ea1d18ee0127a18dc11ccd679717ea53151c2ab9";
- libraryHaskellDepends = [
- array base blaze-builder bytestring containers mtl text utf8-string
- ];
- libraryToolDepends = [ alex happy ];
- testHaskellDepends = [
- array base blaze-builder bytestring Cabal containers hspec mtl
- QuickCheck utf8-light utf8-string
- ];
- homepage = "http://github.com/erikd/language-javascript";
- description = "Parser for JavaScript";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "language-javascript_0_6_0_9" = callPackage
({ mkDerivation, alex, array, base, blaze-builder, bytestring
, Cabal, containers, happy, hspec, mtl, QuickCheck, text
, utf8-light, utf8-string
@@ -107730,7 +110281,6 @@ self: {
homepage = "https://github.com/erikd/language-javascript";
description = "Parser for JavaScript";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"language-kort" = callPackage
@@ -107957,7 +110507,7 @@ self: {
hydraPlatforms = [ "x86_64-linux" ];
}) {};
- "language-puppet_1_3_2_1" = callPackage
+ "language-puppet_1_3_4" = callPackage
({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
, base16-bytestring, bytestring, case-insensitive, containers
, cryptonite, directory, either, exceptions, filecache, formatting
@@ -107971,8 +110521,8 @@ self: {
}:
mkDerivation {
pname = "language-puppet";
- version = "1.3.2.1";
- sha256 = "2540cebeae24f1ad783cd52cff87c55734fe631626f211c2f8579a1c5d4b1ac4";
+ version = "1.3.4";
+ sha256 = "6944b5f03001c07d3b8208db6125594af6ebd101f7025ef45bb01cee071018bc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -108353,8 +110903,8 @@ self: {
}:
mkDerivation {
pname = "latex-formulae-image";
- version = "0.1.1.1";
- sha256 = "6c663420647282ec20c71421a2faf95629f2690283df4b9279ae53536cac3f61";
+ version = "0.1.1.2";
+ sha256 = "92f1fa3233eef7992a6fcae9fa240c6859e63ff09d7e89ca212017b974f29f0d";
libraryHaskellDepends = [
base directory errors filepath JuicyPixels process temporary
transformers
@@ -108371,8 +110921,8 @@ self: {
}:
mkDerivation {
pname = "latex-formulae-pandoc";
- version = "0.2.0.3";
- sha256 = "289720149572814da30b9854b8a7b0798125c3fa3508b28ca53c9d382f65d12d";
+ version = "0.2.0.4";
+ sha256 = "76013ba9f4b9f1631ac347c026799b4a70bcb3b8a6e07038218befc5d0ec8332";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -108388,6 +110938,30 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "latex-function-tables" = callPackage
+ ({ mkDerivation, base, bifunctors, HaTeX, lens, mtl, process
+ , semigroups, template-haskell, th-printf
+ }:
+ mkDerivation {
+ pname = "latex-function-tables";
+ version = "0.1.0.0";
+ sha256 = "7145b64e438624e8c5a3590c67f113df5010f8f28feb33aaa95602ef75939af4";
+ revision = "1";
+ editedCabalFile = "6bd3bb245f08cc610e07279a310ae99bd37ee797fda60c6fc84b13c9fb38bf83";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bifunctors HaTeX lens mtl semigroups template-haskell
+ th-printf
+ ];
+ executableHaskellDepends = [ base HaTeX process template-haskell ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/unitb/latex-function-tables";
+ description = "Function table specifications in latex";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"lattices" = callPackage
({ mkDerivation, base, containers, deepseq, hashable, QuickCheck
, semigroups, tagged, tasty, tasty-quickcheck, transformers
@@ -108563,14 +111137,28 @@ self: {
({ mkDerivation, base, transformers, unsafe }:
mkDerivation {
pname = "lazyio";
- version = "0.1.0.3";
- sha256 = "bb8d8c0c14ab35d80d0eee69e51b9111fea975eabe171c37a0f680adaff708be";
+ version = "0.1.0.4";
+ sha256 = "8b54f0bccdc1c836393ce667ea0f1ad069d52c04762e61fad633d4d44916cf6c";
libraryHaskellDepends = [ base transformers unsafe ];
homepage = "http://www.haskell.org/haskellwiki/Lazy_IO";
description = "Run IO actions lazily while respecting their order";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "lazyset" = callPackage
+ ({ mkDerivation, base, containers, data-ordlist, HUnit }:
+ mkDerivation {
+ pname = "lazyset";
+ version = "0.1.0.0";
+ sha256 = "9e62ccd181117484c63920b8dfb8d385d23119e11595ab2aa045b272c55f4bad";
+ libraryHaskellDepends = [ base containers data-ordlist ];
+ testHaskellDepends = [ base containers data-ordlist HUnit ];
+ homepage = "https://github.com/happyherp/lazyset";
+ description = "Set and Map from lazy/infinite lists";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"lazysmallcheck" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -108768,6 +111356,20 @@ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"leapseconds-announced" = callPackage
({ mkDerivation, base, QuickCheck, time }:
mkDerivation {
@@ -108781,6 +111383,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "leapseconds-announced_2017_1" = callPackage
+ ({ mkDerivation, base, QuickCheck, time }:
+ mkDerivation {
+ pname = "leapseconds-announced";
+ version = "2017.1";
+ sha256 = "0f9c1add6d3015df20b4ca2b6c0256af4b27732bee5467f3c85cbc698307f619";
+ libraryHaskellDepends = [ base time ];
+ testHaskellDepends = [ base QuickCheck time ];
+ homepage = "https://github.com/bjornbm/leapseconds-announced";
+ description = "Leap seconds announced at library release time";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"learn" = callPackage
({ mkDerivation, base, containers }:
mkDerivation {
@@ -109102,6 +111718,8 @@ self: {
pname = "lens";
version = "4.15.1";
sha256 = "5cfaa64cb1b9787193c2247a1ed1c248104ba5fadb91cec6432e648e41b1bea6";
+ revision = "2";
+ editedCabalFile = "012be5e38b4fa0f4cb98ad04d6eb82a48eea6d789213a058b08fdc2e64aa1327";
libraryHaskellDepends = [
array base base-orphans bifunctors bytestring comonad containers
contravariant distributive exceptions filepath free ghc-prim
@@ -109326,8 +111944,8 @@ self: {
({ mkDerivation, base, doctest, lens }:
mkDerivation {
pname = "lens-tutorial";
- version = "1.0.1";
- sha256 = "66494550d66d4c62ea56d0184d118e302d3f1f12505c5c7c0a00e098e77272ab";
+ version = "1.0.2";
+ sha256 = "ef2638f69bfbb35f15adc20bde588419889eb0f7c899b3f03ae746fc08d1e1b5";
libraryHaskellDepends = [ base lens ];
testHaskellDepends = [ base doctest ];
description = "Tutorial for the lens library";
@@ -109397,8 +112015,8 @@ self: {
}:
mkDerivation {
pname = "lentil";
- version = "1.0.3.1";
- sha256 = "f7270a276914c96190c570397cc9e0dcadb874dec438ff32c2e36eda6d72bee3";
+ version = "1.0.3.2";
+ sha256 = "7c4fcfd08e2b4369f14a3502215cdb6f70a8f776350a6113d3d6f8dbc7a1c397";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -109943,6 +112561,40 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "liblawless" = callPackage
+ ({ mkDerivation, aeson, base, base-unicode-symbols, binary
+ , boomerang, bytestring, containers, containers-unicode-symbols
+ , contravariant, data-default, data-textual, dns, exceptions
+ , filepath, hjsonschema, lens, machines, mtl, network, network-ip
+ , parsers, pathtype, protolude, QuickCheck, random, semigroups, stm
+ , stm-containers, temporary, test-framework
+ , test-framework-quickcheck2, test-framework-th, text, text-icu
+ , text-icu-normalized, text-printer, time, transformers, zippers
+ }:
+ mkDerivation {
+ pname = "liblawless";
+ version = "0.16.1";
+ sha256 = "9598c6e717b1118057190f6a6f15977903956df374812e94049e78866b40578a";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base base-unicode-symbols binary boomerang bytestring
+ containers containers-unicode-symbols contravariant data-default
+ data-textual dns exceptions hjsonschema lens machines mtl network
+ network-ip parsers pathtype protolude QuickCheck random semigroups
+ stm stm-containers temporary text text-icu text-icu-normalized
+ text-printer time transformers zippers
+ ];
+ testHaskellDepends = [
+ aeson base binary bytestring exceptions filepath network QuickCheck
+ semigroups temporary test-framework test-framework-quickcheck2
+ test-framework-th text time transformers
+ ];
+ description = "Prelude based on protolude for GHC 8 and beyond";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"liblinear-enumerator" = callPackage
({ mkDerivation, base, bindings-DSL, enumerator, mtl, vector }:
mkDerivation {
@@ -109971,6 +112623,39 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "libmolude" = callPackage
+ ({ mkDerivation, aeson, base, base-unicode-symbols, binary
+ , bytestring, concurrent-machines, containers
+ , containers-unicode-symbols, contravariant, data-textual
+ , directory, exceptions, filepath, hjsonschema, lens, machines, mtl
+ , parsers, path, path-io, protolude, QuickCheck, random, semigroups
+ , stm, stm-containers, temporary, test-framework
+ , test-framework-quickcheck2, test-framework-th, text, text-icu
+ , text-icu-normalized, text-printer, time, transformers, yaml
+ , zippers
+ }:
+ mkDerivation {
+ pname = "libmolude";
+ version = "0.12.3";
+ sha256 = "4914c6c7dbbf08d5ab03498654d096ee3b21385ecb5be5e2574b05215b2f55b2";
+ libraryHaskellDepends = [
+ aeson base base-unicode-symbols binary bytestring
+ concurrent-machines containers containers-unicode-symbols
+ contravariant data-textual directory exceptions filepath
+ hjsonschema lens machines mtl parsers path path-io protolude random
+ semigroups stm stm-containers temporary text text-icu
+ text-icu-normalized text-printer time transformers yaml zippers
+ ];
+ testHaskellDepends = [
+ base binary bytestring exceptions filepath QuickCheck semigroups
+ temporary test-framework test-framework-quickcheck2
+ test-framework-th text time transformers
+ ];
+ description = "Prelude based on protolude for GHC 8 and beyond";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"libmpd" = callPackage
({ mkDerivation, attoparsec, base, bytestring, containers
, data-default-class, filepath, hspec, mtl, network, old-locale
@@ -110667,6 +113352,50 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "line" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+ , cryptohash-sha256, http-types, lens, text, time, transformers
+ , wai, wreq
+ }:
+ mkDerivation {
+ pname = "line";
+ version = "1.0.1.0";
+ sha256 = "b356e813369b9ebf80ea71a79e658caabbc32645de8821eb878809afb0f1e1d5";
+ libraryHaskellDepends = [
+ aeson base base64-bytestring bytestring cryptohash-sha256
+ http-types lens text time transformers wai wreq
+ ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/noraesae/line";
+ description = "Haskell SDK for the LINE API";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "line_2_1_0_2" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+ , cryptohash-sha256, hspec, hspec-wai, http-conduit, http-types
+ , QuickCheck, quickcheck-instances, raw-strings-qq, scotty, text
+ , time, transformers, wai
+ }:
+ mkDerivation {
+ pname = "line";
+ version = "2.1.0.2";
+ sha256 = "456d5ffaec68338fc5892371445e0ff8fa768a68008107f0de22aa0fb962a813";
+ libraryHaskellDepends = [
+ aeson base base64-bytestring bytestring cryptohash-sha256
+ http-conduit http-types scotty text time transformers wai
+ ];
+ testHaskellDepends = [
+ aeson base base64-bytestring bytestring cryptohash-sha256 hspec
+ hspec-wai QuickCheck quickcheck-instances raw-strings-qq scotty
+ text time transformers
+ ];
+ homepage = "https://github.com/noraesae/line";
+ description = "Haskell SDK for the LINE API";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"line-break" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -110847,21 +113576,19 @@ self: {
"linearmap-category" = callPackage
({ mkDerivation, base, constrained-categories, containers
- , free-vector-spaces, ieee754, lens, linear, semigroups, vector
- , vector-space
+ , free-vector-spaces, ieee754, lens, linear, manifolds-core
+ , semigroups, tagged, vector, vector-space
}:
mkDerivation {
pname = "linearmap-category";
- version = "0.1.0.1";
- sha256 = "ff237dba6477c1ef1328c36785563422fbf3aae1acd31cf5aca139d8a0b4adbd";
- revision = "1";
- editedCabalFile = "c917ace1221a02587e65c9224c1b39fd6999b9c6f712138312def89981bcd3d4";
+ version = "0.3.0.1";
+ sha256 = "f8f24aa068e6578798b9fcdbbc4e7058322db89cf630540b7b91a7cbfe5d5f78";
libraryHaskellDepends = [
base constrained-categories containers free-vector-spaces ieee754
- lens linear semigroups vector vector-space
+ lens linear manifolds-core semigroups tagged vector vector-space
];
homepage = "https://github.com/leftaroundabout/linearmap-family";
- description = "Native, matrix-free linear algebra";
+ description = "Native, complete, matrix-free linear algebra";
license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -111329,18 +114056,18 @@ self: {
}) {};
"liquid" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, lens, lens-aeson, mtl
- , QuickCheck, scientific, semigroups, tasty, tasty-hunit
- , tasty-quickcheck, tasty-th, text, unordered-containers
- , validation, vector
+ ({ mkDerivation, aeson, attoparsec, base, hashable, lens
+ , lens-aeson, mtl, QuickCheck, scientific, semigroups, tasty
+ , tasty-hunit, tasty-quickcheck, tasty-th, text
+ , unordered-containers, validation, vector
}:
mkDerivation {
pname = "liquid";
- version = "0.1.0.1";
- sha256 = "f2c7cbfb26acbc9abd1856286997c7175ea20c4584225c287d4c75938898f18d";
+ version = "0.1.0.3";
+ sha256 = "c14d1b3dfbabbc4892369a24f67d29f3a172e9de87ac0132bf3121f86bcee90b";
libraryHaskellDepends = [
- aeson attoparsec base lens lens-aeson mtl scientific semigroups
- text unordered-containers validation vector
+ aeson attoparsec base hashable lens lens-aeson mtl scientific
+ semigroups text unordered-containers validation vector
];
testHaskellDepends = [
aeson attoparsec base lens lens-aeson mtl QuickCheck scientific
@@ -111799,13 +114526,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 ];
@@ -111813,8 +114541,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";
@@ -111986,8 +114714,8 @@ self: {
}:
mkDerivation {
pname = "llvm-extra";
- version = "0.7";
- sha256 = "5f2e1fb4a4b8960ff7e10db014de90706e5d10504f88f89dbd8869f9d5921f20";
+ version = "0.7.0.1";
+ sha256 = "4928e405deff09451edce864558ce7b3276549ca7f1d71dac118dcbcafe15573";
libraryHaskellDepends = [
base containers cpuid llvm-tf non-empty tfp transformers unsafe
utility-ht
@@ -112515,21 +115243,21 @@ self: {
}) {};
"log" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
- , bloodhound, bytestring, cond, deepseq, exceptions, hpqtypes
- , http-client, lifted-base, monad-control, monad-time, mtl
- , old-locale, split, stm, text, text-show, time, transformers
- , transformers-base, unordered-containers, vector
+ ({ mkDerivation, aeson, base, bloodhound, bytestring, exceptions
+ , http-client, http-types, log-base, log-elasticsearch
+ , log-postgres, process, random, tasty, tasty-hunit, text, time
+ , transformers
}:
mkDerivation {
pname = "log";
- version = "0.5.3";
- sha256 = "2b948145b4c63f136fdac698e4c908d49029f0436ddceae3d7ae0a9544406143";
+ version = "0.7";
+ sha256 = "67daea67ce76d9838f2cb853f198e891d853d705405ff3806ce46fdf2376e51b";
libraryHaskellDepends = [
- aeson aeson-pretty base base64-bytestring bloodhound bytestring
- cond deepseq exceptions hpqtypes http-client lifted-base
- monad-control monad-time mtl old-locale split stm text text-show
- time transformers transformers-base unordered-containers vector
+ base log-base log-elasticsearch log-postgres
+ ];
+ testHaskellDepends = [
+ aeson base bloodhound bytestring exceptions http-client http-types
+ process random tasty tasty-hunit text time transformers
];
homepage = "https://github.com/scrive/log";
description = "Structured logging solution with multiple backends";
@@ -112537,6 +115265,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "log-base" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq
+ , exceptions, monad-control, monad-time, mtl, semigroups, stm, text
+ , time, transformers-base, unordered-containers
+ }:
+ mkDerivation {
+ pname = "log-base";
+ version = "0.7";
+ sha256 = "ba961838e19cccb5d84a052ba75acbd7320119dda482a4fa230346743c8a8c07";
+ libraryHaskellDepends = [
+ aeson aeson-pretty base bytestring deepseq exceptions monad-control
+ monad-time mtl semigroups stm text time transformers-base
+ unordered-containers
+ ];
+ homepage = "https://github.com/scrive/log";
+ description = "Structured logging solution (base package)";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"log-domain" = callPackage
({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq
, directory, distributive, doctest, filepath, generic-deriving
@@ -112579,6 +115326,72 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "log-elasticsearch" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
+ , bloodhound, bytestring, deepseq, http-client, log-base
+ , semigroups, text, text-show, time, transformers
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "log-elasticsearch";
+ version = "0.7";
+ sha256 = "bf2326aa0c54972452543973cec3f03f68c6d0c6f9aed285696425da24122bb7";
+ libraryHaskellDepends = [
+ aeson aeson-pretty base base64-bytestring bloodhound bytestring
+ deepseq http-client log-base semigroups text text-show time
+ transformers unordered-containers vector
+ ];
+ homepage = "https://github.com/scrive/log";
+ description = "Structured logging solution (Elasticsearch back end)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "log-postgres" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
+ , bytestring, deepseq, hpqtypes, http-client, lifted-base, log-base
+ , mtl, semigroups, split, text, text-show, time
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "log-postgres";
+ version = "0.7";
+ sha256 = "33744eff195af018d2cf9fa2ce6617ce3cf5242cf478fea776e4a9db7a74f963";
+ libraryHaskellDepends = [
+ aeson aeson-pretty base base64-bytestring bytestring deepseq
+ hpqtypes http-client lifted-base log-base mtl semigroups split text
+ text-show time unordered-containers vector
+ ];
+ homepage = "https://github.com/scrive/log";
+ description = "Structured logging solution (PostgreSQL back end)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "log-utils" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, cmdargs, data-default
+ , exceptions, hpqtypes, http-types, invariant, kontra-config
+ , lifted-base, log, monad-control, random, text, time, transformers
+ , transformers-base, unjson, vector, wai, warp
+ }:
+ mkDerivation {
+ pname = "log-utils";
+ version = "0.2.2";
+ sha256 = "7fe12350c66debb33f6bf348c34ee2d046931035cf93dac2c13d76294eed3688";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ aeson base bytestring cmdargs data-default exceptions hpqtypes
+ http-types invariant kontra-config lifted-base log monad-control
+ random text time transformers transformers-base unjson vector wai
+ warp
+ ];
+ 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
({ mkDerivation, base, containers, json, parsec }:
mkDerivation {
@@ -112666,16 +115479,16 @@ self: {
"logging-effect" = callPackage
({ mkDerivation, async, base, exceptions, free, monad-control, mtl
- , stm, stm-delay, text, time, transformers, transformers-base
- , wl-pprint-text
+ , semigroups, stm, stm-delay, text, time, transformers
+ , transformers-base, wl-pprint-text
}:
mkDerivation {
pname = "logging-effect";
- version = "1.1.0";
- sha256 = "51275afa770efb4bef3bea13fb294eeb9f7b7ca8186879d49dfa4b2cdcfbdb48";
+ version = "1.1.1";
+ sha256 = "4e1a6f746757ebf787820cbdb202b0b9ff206a44a24895d5500bec2ffc789fc5";
libraryHaskellDepends = [
- async base exceptions free monad-control mtl stm stm-delay text
- time transformers transformers-base wl-pprint-text
+ async base exceptions free monad-control mtl semigroups stm
+ stm-delay text time transformers transformers-base wl-pprint-text
];
homepage = "https://github.com/ocharles/logging-effect";
description = "A mtl-style monad transformer for general purpose & compositional logging";
@@ -112689,6 +115502,8 @@ self: {
pname = "logging-facade";
version = "0.1.1";
sha256 = "60f9f29d54e9756825400f281101872ed87de55271e87571068838a7b3d98da2";
+ revision = "1";
+ editedCabalFile = "fc89005336a9b64c524183154716ebf8a26c27f8fa5730225f818f0128c2a2b2";
libraryHaskellDepends = [ base template-haskell transformers ];
testHaskellDepends = [ base hspec ];
description = "Simple logging abstraction that allows multiple back-ends";
@@ -113217,14 +116032,12 @@ self: {
}) {};
"lowgl" = callPackage
- ({ mkDerivation, base, data-default, gl, linear, vector }:
+ ({ mkDerivation, base, gl, linear, vector }:
mkDerivation {
pname = "lowgl";
- version = "0.3.1.1";
- sha256 = "85f5a954970634aa41bc77b6a2932ed935b1411be4ad7badab31dad45b2365b0";
- revision = "1";
- editedCabalFile = "d16861021ff55cbb15185537758b01c3bf1eddf910c2dfd57cb3e51d73f5e591";
- libraryHaskellDepends = [ base data-default gl linear vector ];
+ version = "0.4.0.1";
+ sha256 = "fceb0202bed4a3a3e0431ad32eac95fcc4aefef93b992a35797da0bfc8d39df7";
+ libraryHaskellDepends = [ base gl linear vector ];
description = "Basic gl wrapper and reference";
license = stdenv.lib.licenses.bsd2;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -113237,8 +116050,8 @@ self: {
}:
mkDerivation {
pname = "lp-diagrams";
- version = "2.0.0";
- sha256 = "8ff64960d7874d4a34867d8834eac9c535b73175f0abe8743b50dfd886aabf50";
+ version = "2.1.0";
+ sha256 = "289129d3581ea5276c3e9a829322bc1ce38ca62094390706a5fa2c6f176c37be";
libraryHaskellDepends = [
base containers gasp graphviz labeled-tree lens mtl parsek
polynomials-bernstein process reflection text typography-geometry
@@ -113464,8 +116277,8 @@ self: {
}:
mkDerivation {
pname = "lua-bc";
- version = "0.1.0.2";
- sha256 = "b507d95739cf149ea5fa321b53182c53cdf89d9726c494734092da19f7dfb515";
+ version = "0.1.1";
+ sha256 = "6a4186dc3ad092df6b5cfd78a0b18175a1944e7044de6a7817f90b195090e02e";
libraryHaskellDepends = [
base binary bytestring containers data-binary-ieee754 pretty text
vector
@@ -113548,8 +116361,8 @@ self: {
}:
mkDerivation {
pname = "lucid";
- version = "2.9.6";
- sha256 = "a8435c73bacc3dc60efd89c21b29c9fbca9a10676ec158d4e810ab751849a8c9";
+ version = "2.9.7";
+ sha256 = "a087af27ad196e3a41ccb6b954a12d384589a14b2ac55614e6a27817f65e0608";
libraryHaskellDepends = [
base blaze-builder bytestring containers hashable mmorph mtl text
transformers unordered-containers
@@ -114011,14 +116824,14 @@ self: {
"machinecell" = callPackage
({ mkDerivation, arrows, base, free, hspec, mtl, profunctors
- , QuickCheck, semigroups
+ , QuickCheck, semigroups, transformers
}:
mkDerivation {
pname = "machinecell";
- version = "3.2.0";
- sha256 = "507f367bd35ea9b0b2c81af1b1ec14f4aa68fae4309f71c69c9c58715405bddd";
+ version = "3.3.1";
+ sha256 = "5911832fa471797e5cbc5b4c98c1078f0bad799ba8cb33dbf0e19c6fae35619c";
libraryHaskellDepends = [
- arrows base free mtl profunctors semigroups
+ arrows base free mtl profunctors semigroups transformers
];
testHaskellDepends = [
arrows base hspec mtl profunctors QuickCheck semigroups
@@ -114136,6 +116949,32 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "mackerel-client" = callPackage
+ ({ mkDerivation, aeson, aeson-qq, base, bytestring, data-default
+ , directory, filepath, hspec, htoml, http-client, http-client-tls
+ , http-types, parsec, raw-strings-qq, split, text
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "mackerel-client";
+ version = "0.0.2";
+ sha256 = "c0b9b1b074176b45771ae6b1bfb3bc41dacdb1c0ccfab675b06eceba037ddaf1";
+ revision = "1";
+ editedCabalFile = "e4fd64b142d46108e28cc52262779ae1096efefdb01ea6128f4a86161d880030";
+ libraryHaskellDepends = [
+ aeson base bytestring data-default directory filepath htoml
+ http-client http-client-tls http-types parsec split text
+ unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson aeson-qq base data-default hspec raw-strings-qq
+ unordered-containers
+ ];
+ homepage = "https://github.com/itchyny/mackerel-client-hs";
+ description = "An API client library for Mackerel";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"maclight" = callPackage
({ mkDerivation, base, filemanip, filepath, HUnit
, optparse-applicative, parsec, strict, test-framework
@@ -114882,6 +117721,31 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "mandrill_0_5_3_0" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
+ , bytestring, containers, email-validate, http-client
+ , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck
+ , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "mandrill";
+ version = "0.5.3.0";
+ sha256 = "b022383dfbae3b6281a216924f508d9651849250a6dcadcedc9c30465fc5160d";
+ libraryHaskellDepends = [
+ aeson base base64-bytestring blaze-html bytestring containers
+ email-validate http-client http-client-tls http-types lens mtl
+ old-locale QuickCheck text time unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit
+ tasty-quickcheck text
+ ];
+ description = "Library for interfacing with the Mandrill JSON API";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mandulia" = callPackage
({ mkDerivation, array, base, bytestring, containers, directory
, filepath, GLUT, hslua, time
@@ -114942,12 +117806,17 @@ self: {
}) {};
"manifold-random" = callPackage
- ({ mkDerivation, base, manifolds, random-fu, vector-space }:
+ ({ mkDerivation, base, constrained-categories, linearmap-category
+ , manifolds, random-fu, semigroups, vector-space
+ }:
mkDerivation {
pname = "manifold-random";
- version = "0.1.1.0";
- sha256 = "9979681fcea7a314db619da04ffca77c93d5afe42ce0b819bd974ca70e74050c";
- libraryHaskellDepends = [ base manifolds random-fu vector-space ];
+ version = "0.4.0.0";
+ sha256 = "7300fabce3e4c7723cc320f4c96bbd7980ca4e72cb694aa422b91d51b6e26c5e";
+ libraryHaskellDepends = [
+ base constrained-categories linearmap-category manifolds random-fu
+ semigroups vector-space
+ ];
homepage = "https://github.com/leftaroundabout/manifolds";
description = "Sampling random points on general manifolds";
license = stdenv.lib.licenses.gpl3;
@@ -114956,19 +117825,18 @@ self: {
"manifolds" = callPackage
({ mkDerivation, base, comonad, constrained-categories, containers
- , deepseq, free-vector-spaces, linear, linearmap-category, MemoTrie
- , microlens, microlens-th, semigroups, tagged, transformers
- , trivial-constraint, vector, vector-space, void
+ , deepseq, free-vector-spaces, lens, linear, linearmap-category
+ , manifolds-core, MemoTrie, semigroups, tagged, transformers
+ , vector, vector-space, void
}:
mkDerivation {
pname = "manifolds";
- version = "0.3.0.0";
- sha256 = "011ee59126ab31c49ec4fab8cfe1a77ca76b170f74ecae75f4458e25593616ab";
+ version = "0.4.0.0";
+ sha256 = "7a4a8a4c392b5e0743e0984bbd361a744a7e054838ca9353131b0bea04e09f93";
libraryHaskellDepends = [
base comonad constrained-categories containers deepseq
- free-vector-spaces linear linearmap-category MemoTrie microlens
- microlens-th semigroups tagged transformers trivial-constraint
- vector vector-space void
+ free-vector-spaces lens linear linearmap-category manifolds-core
+ MemoTrie semigroups tagged transformers vector vector-space void
];
homepage = "https://github.com/leftaroundabout/manifolds";
description = "Coordinate-free hypersurfaces";
@@ -114976,6 +117844,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "manifolds-core" = callPackage
+ ({ mkDerivation, base, tagged, vector-space }:
+ mkDerivation {
+ pname = "manifolds-core";
+ version = "0.4.0.0";
+ sha256 = "53a19cc72ef02345f161676d04701249fbf36cd02303672a1d5e3ecd78341568";
+ libraryHaskellDepends = [ base tagged vector-space ];
+ homepage = "https://github.com/leftaroundabout/manifolds";
+ description = "The basic classes for the manifolds hierarchy";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"map-exts" = callPackage
({ mkDerivation, base, bytestring, cassava, containers }:
mkDerivation {
@@ -115059,8 +117939,8 @@ self: {
}:
mkDerivation {
pname = "markdown";
- version = "0.1.15";
- sha256 = "5bf44c4a0df5a9c43dc7fcac86cbbd586c703e1a5f8ba6a77ea8f8207152e628";
+ 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
@@ -115326,24 +118206,27 @@ self: {
}) {};
"marvin" = callPackage
- ({ mkDerivation, aeson, async, base, bytestring, classy-prelude
- , configurator, directory, filepath, hslogger, lens, mtl, mustache
- , network-uri, optparse-generic, random, template-haskell
- , text-format, text-icu, vector, websockets, wreq, wuss
+ ({ mkDerivation, aeson, async, base, bytestring, configurator
+ , directory, filepath, hashable, hslogger, lens, mono-traversable
+ , mtl, mustache, network-uri, optparse-applicative
+ , optparse-generic, pcre-light, random, template-haskell, text
+ , text-format, unordered-containers, vector, websockets, wreq, wuss
}:
mkDerivation {
pname = "marvin";
- version = "0.0.1";
- sha256 = "ba51c4f1559352f14821486200f931c6a8e2b5670a3b3e435574c2ce014fe614";
+ version = "0.0.4";
+ sha256 = "76c0af008fd2b2c691abe29541b392fe47f59f8a004b837bb8e398f916df1bae";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson async base bytestring classy-prelude configurator hslogger
- lens mtl network-uri optparse-generic random template-haskell
- text-format text-icu vector websockets wreq wuss
+ aeson async base bytestring configurator hashable hslogger lens
+ mono-traversable mtl network-uri optparse-generic pcre-light random
+ template-haskell text text-format unordered-containers vector
+ websockets wreq wuss
];
executableHaskellDepends = [
- base classy-prelude directory filepath mustache optparse-generic
+ aeson base bytestring configurator directory filepath
+ mono-traversable mustache optparse-applicative text
];
homepage = "https://github.com/JustusAdam/marvin#readme";
description = "A modular bot for slack";
@@ -115352,27 +118235,25 @@ self: {
}) {};
"marxup" = callPackage
- ({ mkDerivation, base, configurator, containers, cubicbezier
- , directory, dlist, filepath, glpk-hs, graphviz, labeled-tree, lens
- , mtl, parsek, polynomials-bernstein, pretty, process, text
- , typography-geometry, vector
+ ({ mkDerivation, base, configurator, containers, directory, dlist
+ , filepath, haskell-src-exts, labeled-tree, lens, lp-diagrams, mtl
+ , parsek, pretty, process, text
}:
mkDerivation {
pname = "marxup";
- version = "3.0.0.1";
- sha256 = "1675a378317ff0b1b3e2500ae8b4e62555dc85c4ab8d8f72c0d3cc227c4edf07";
+ version = "3.1.0.0";
+ sha256 = "21dded8147b7eed7ae4ae5a1ba10648467f77334e01351d1dff754fc59585f2f";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base containers cubicbezier directory filepath glpk-hs graphviz
- labeled-tree lens mtl polynomials-bernstein process text
- typography-geometry vector
+ base containers directory filepath haskell-src-exts labeled-tree
+ lens lp-diagrams mtl process text
];
executableHaskellDepends = [
base configurator dlist parsek pretty
];
description = "Markup language preprocessor for Haskell";
- license = "GPL";
+ license = stdenv.lib.licenses.gpl2;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -115451,8 +118332,8 @@ self: {
}:
mkDerivation {
pname = "math-functions";
- version = "0.2.0.2";
- sha256 = "2358ee156011a9d97cae2596c788bd00cd6ee698e5fb1c67e0eefb15aff24737";
+ version = "0.2.1.0";
+ sha256 = "f71b5598de453546396a3f5f7f6ce877fffcc996639b7569d8628cae97da65eb";
libraryHaskellDepends = [
base deepseq primitive vector vector-th-unbox
];
@@ -115580,14 +118461,14 @@ self: {
}) {eng = null; mat = null; mx = null;};
"matrices" = callPackage
- ({ mkDerivation, base, primitive, tasty, tasty-hunit
+ ({ mkDerivation, base, deepseq, primitive, tasty, tasty-hunit
, tasty-quickcheck, vector
}:
mkDerivation {
pname = "matrices";
- version = "0.4.3";
- sha256 = "7bc65e57db63146824e8b840f72ce0980251337b98819148439b1afe8d0d4039";
- libraryHaskellDepends = [ base primitive vector ];
+ version = "0.4.4";
+ sha256 = "50f110321d71db257adfbe0f126542e936148ee473679edc1c2bf37c60d539ee";
+ libraryHaskellDepends = [ base deepseq primitive vector ];
testHaskellDepends = [
base tasty tasty-hunit tasty-quickcheck vector
];
@@ -115855,8 +118736,8 @@ self: {
({ mkDerivation, base, containers, mwc-probability, transformers }:
mkDerivation {
pname = "mcmc-types";
- version = "1.0.2";
- sha256 = "5d2fd31114e45516b2437827e89b0572e9e9db87a7201d77b437de6e2bba54f3";
+ version = "1.0.3";
+ sha256 = "3c4b25030b05567694ddc313ca808a32133ad5433b4d89837e1ed00bbfcefc6e";
libraryHaskellDepends = [
base containers mwc-probability transformers
];
@@ -115940,20 +118821,41 @@ self: {
}:
mkDerivation {
pname = "mdp";
- version = "0.1.0.0";
- sha256 = "816474886b59ab0f0cd5c4779f2702e9b7484fe94179a426894f561828f86711";
+ version = "0.1.1.0";
+ sha256 = "6e0e52f652dd969d5bfda6edf6519e6a0c38fa40994626820dc10c8a52aa4143";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base containers vector ];
- executableHaskellDepends = [ base containers vector ];
- testHaskellDepends = [
- base containers HTF HUnit QuickCheck vector
- ];
+ executableHaskellDepends = [ base vector ];
+ testHaskellDepends = [ base HTF HUnit QuickCheck vector ];
description = "Tools for solving Markov Decision Processes";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "mealstrom" = callPackage
+ ({ mkDerivation, aeson, async, base, bytestring, containers
+ , hashable, list-t, postgresql-simple, resource-pool, stm
+ , stm-containers, tasty, tasty-hunit, text, time, uuid
+ }:
+ mkDerivation {
+ pname = "mealstrom";
+ version = "0.0.0.1";
+ sha256 = "bde77bd197b39ff4673048ee17ec42043d96fbbea101e8650d9db9229757e83f";
+ libraryHaskellDepends = [
+ aeson async base bytestring containers hashable list-t
+ postgresql-simple resource-pool stm stm-containers text time uuid
+ ];
+ testHaskellDepends = [
+ aeson async base bytestring hashable list-t postgresql-simple
+ resource-pool stm stm-containers tasty tasty-hunit text time uuid
+ ];
+ homepage = "https://github.com/linearray/mealstrom";
+ description = "Manipulate FSMs and store them in PostgreSQL";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"means" = callPackage
({ mkDerivation, base, semigroups }:
mkDerivation {
@@ -116023,8 +118925,8 @@ self: {
({ mkDerivation, base, heap, QuickCheck }:
mkDerivation {
pname = "median-stream";
- version = "0.3.0.0";
- sha256 = "579c8c60b7376f78e02fa5cdd950c1116198126114c610a3561109d3b2dd2b74";
+ version = "0.7.0.0";
+ sha256 = "e92fc44be8189dafe9190aad225462780f26d0b1fe1823376342329db6c71f3d";
libraryHaskellDepends = [ base heap ];
testHaskellDepends = [ base QuickCheck ];
homepage = "https://github.com/caneroj1/median-stream#readme";
@@ -116462,6 +119364,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "memory_0_14" = callPackage
+ ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim
+ , tasty, tasty-hunit, tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "memory";
+ version = "0.14";
+ sha256 = "ca0248c9a889906a5a8fc95ce3c549b27abc3edb4d85d03893aef56934148e1d";
+ libraryHaskellDepends = [
+ base bytestring deepseq foundation ghc-prim
+ ];
+ testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+ homepage = "https://github.com/vincenthz/hs-memory";
+ description = "memory and related abstraction stuff";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"memorypool" = callPackage
({ mkDerivation, base, containers, transformers, unsafe, vector }:
mkDerivation {
@@ -116548,14 +119468,19 @@ self: {
}) {};
"messagepack" = callPackage
- ({ mkDerivation, base, bytestring, cereal, containers, QuickCheck
- , test-framework, test-framework-quickcheck2, test-framework-th
+ ({ mkDerivation, base, bytestring, cereal, containers, deepseq
+ , QuickCheck, test-framework, test-framework-quickcheck2
+ , test-framework-th
}:
mkDerivation {
pname = "messagepack";
- version = "0.5.3";
- sha256 = "0c7e98943db3712fe4bc6a2ffcbe92cc1637d8ccc5fc73c333568a6856a8b67c";
- libraryHaskellDepends = [ base bytestring cereal containers ];
+ version = "0.5.4";
+ sha256 = "939590c05d5b0831b3b4796f2e1a070e290982c92b2009f2aa1ef5f4b05b5d7c";
+ revision = "1";
+ editedCabalFile = "4bfea0a7200706d1826fab53e19df38e5df759672d50095143b4ef078e8d235c";
+ libraryHaskellDepends = [
+ base bytestring cereal containers deepseq
+ ];
testHaskellDepends = [
base bytestring cereal containers QuickCheck test-framework
test-framework-quickcheck2 test-framework-th
@@ -117274,8 +120199,8 @@ self: {
}:
mkDerivation {
pname = "mighty-metropolis";
- version = "1.0.3";
- sha256 = "29b68aecb78fbe97cfcba96ba09dbd69b6e2b7df1cdb073a7be90ecf23db7e80";
+ version = "1.0.4";
+ sha256 = "6e670796298b3f47a7226c0ce51a97889395119e3de32e4722186af55d8092cf";
libraryHaskellDepends = [
base mcmc-types mwc-probability pipes primitive transformers
];
@@ -117285,6 +120210,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "mighty-metropolis_1_1_0" = callPackage
+ ({ mkDerivation, base, containers, mcmc-types, mwc-probability
+ , pipes, primitive, transformers
+ }:
+ mkDerivation {
+ pname = "mighty-metropolis";
+ version = "1.1.0";
+ sha256 = "2a8ac91fe51fa440347ce41edafca463fbf0d822fffca89796250e5e79143f6b";
+ libraryHaskellDepends = [
+ base mcmc-types mwc-probability pipes primitive transformers
+ ];
+ testHaskellDepends = [ base containers mwc-probability ];
+ homepage = "http://github.com/jtobin/mighty-metropolis";
+ description = "The Metropolis algorithm";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mikmod" = callPackage
({ mkDerivation, base, bytestring }:
mkDerivation {
@@ -117392,8 +120335,8 @@ self: {
}:
mkDerivation {
pname = "mime-mail";
- version = "0.4.11";
- sha256 = "84fa24f83206cb88377128395c2d6db2d08bbe9b568ba6ab8eeb76952abedfee";
+ version = "0.4.12";
+ sha256 = "93e1caa9932bec12dc1b931db2f3ea9e2e2db9b8382b7babaf0a5e559936217c";
libraryHaskellDepends = [
base base64-bytestring blaze-builder bytestring filepath process
random text
@@ -117954,8 +120897,8 @@ self: {
({ mkDerivation, base, mtl, transformers, transformers-compat }:
mkDerivation {
pname = "mmorph";
- version = "1.0.6";
- sha256 = "14c391b111af4cc10917a9340897ae2a5718f5b0b7e6bc13f379445c58fe0dc5";
+ version = "1.0.9";
+ sha256 = "e1f27d3881b254e2a87ffb21f33e332404abb180361f9d29092a85e321554563";
libraryHaskellDepends = [
base mtl transformers transformers-compat
];
@@ -117992,8 +120935,10 @@ self: {
}:
mkDerivation {
pname = "mnist-idx";
- version = "0.1.2.5";
- sha256 = "e8881f03789ae5046b33a051a0cc5a269614642d5876d893fc4a9c34b9bdad56";
+ version = "0.1.2.6";
+ sha256 = "0ea524a09dbf48c372859b491439b8131f4f0875e8a6d980342d0d438d61a9ae";
+ revision = "1";
+ editedCabalFile = "4e91ab8e67b03b8d567f0b2d900b1364840d2a83c3bd5a8f312e4b0467a9bac6";
libraryHaskellDepends = [ base binary bytestring vector ];
testHaskellDepends = [ base binary directory hspec vector ];
homepage = "https://github.com/kryoxide/mnist-idx/";
@@ -118041,13 +120986,15 @@ self: {
}) {};
"modbus-tcp" = callPackage
- ({ mkDerivation, base, bytestring, cereal, network, transformers }:
+ ({ mkDerivation, base, bytestring, cereal, mtl, network
+ , transformers
+ }:
mkDerivation {
pname = "modbus-tcp";
- version = "0.2.1";
- sha256 = "b235be55c9efcb4796ba7bfd11e6592ecb0dbbbf814aff4ebe33314b0caf51b8";
+ version = "0.3";
+ sha256 = "539d030348f403431f763bcc822bc5e8dd946ed28e353e2a877427409b3d7737";
libraryHaskellDepends = [
- base bytestring cereal network transformers
+ base bytestring cereal mtl network transformers
];
homepage = "https://github.com/roelvandijk/modbus-tcp";
description = "Communicate with Modbus devices over TCP";
@@ -118055,6 +121002,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "model" = callPackage
+ ({ mkDerivation, base, containers, deepseq, ghc-prim, ListLike
+ , pretty, tasty, tasty-hunit, tasty-quickcheck, transformers
+ }:
+ mkDerivation {
+ pname = "model";
+ version = "0.2.1";
+ sha256 = "0da6c98beffd1767fa5bbee92de5ff444402899a4855b193f83511309afeb96d";
+ libraryHaskellDepends = [
+ base containers deepseq ListLike pretty transformers
+ ];
+ testHaskellDepends = [
+ base containers ghc-prim pretty tasty tasty-hunit tasty-quickcheck
+ ];
+ homepage = "http://github.com/tittoassini/model";
+ description = "Derive a model of a data type using Generics";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"modelicaparser" = callPackage
({ mkDerivation, ansi-terminal, base, containers, filepath, parsec
, QuickCheck
@@ -118097,6 +121063,31 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "modify-fasta_0_8_2_3" = callPackage
+ ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative
+ , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split
+ , text, text-show
+ }:
+ mkDerivation {
+ pname = "modify-fasta";
+ version = "0.8.2.3";
+ sha256 = "dcee07de4f97b10c557cc3a18aee35d75caf8ef65bdc104bcd6785bfabc7465e";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers fasta regex-tdfa regex-tdfa-text split text
+ text-show
+ ];
+ executableHaskellDepends = [
+ base containers fasta mtl optparse-applicative pipes pipes-text
+ semigroups split text
+ ];
+ homepage = "https://github.com/GregorySchwartz/modify-fasta";
+ description = "Modify fasta (and CLIP) files in several optional ways";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"modsplit" = callPackage
({ mkDerivation, base, directory, filepath, haskell98, mtl
, utf8-string
@@ -118684,8 +121675,8 @@ self: {
}:
mkDerivation {
pname = "monad-logger";
- version = "0.3.20";
- sha256 = "58be0b1e04d1cce4a40e9502448de8ae2c72eff98a6c173539653bacbb3c9fe9";
+ version = "0.3.20.1";
+ sha256 = "8e7cd3af6a28c6be29ec184d221c60d745d14142794efbd175077ee3e8c0baad";
libraryHaskellDepends = [
base blaze-builder bytestring conduit conduit-extra exceptions
fast-logger lifted-base monad-control monad-loops mtl resourcet stm
@@ -118737,8 +121728,8 @@ self: {
}:
mkDerivation {
pname = "monad-logger-syslog";
- version = "0.1.2.0";
- sha256 = "8b7d6598cbe4046aaeb7f86e526f259be4dde43967bf8a15f8ce3ea9f33221c2";
+ version = "0.1.3.0";
+ sha256 = "b35098f5d3a7ea9bcdda886a60b19c404618f36410011d7beaef07ee353383e3";
libraryHaskellDepends = [
base bytestring fast-logger hsyslog monad-logger text transformers
];
@@ -119526,6 +122517,20 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "money" = callPackage
+ ({ mkDerivation, base, doctest }:
+ mkDerivation {
+ pname = "money";
+ version = "0.1.0";
+ sha256 = "b3d078e6bf2201dfe7d524776fb7c3cee47b4f4d06d493c6f9bb9d3fb2407f9c";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base doctest ];
+ homepage = "https://github.com/jpvillaisaza/money";
+ description = "Money";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mongoDB" = callPackage
({ mkDerivation, array, base, base16-bytestring, base64-bytestring
, binary, bson, bytestring, containers, cryptohash
@@ -119613,6 +122618,8 @@ self: {
pname = "monky";
version = "2.1.0.0";
sha256 = "044ea050aa7be67209652fb1a8cca97ad017a2effcdd41432c959a1b840439d0";
+ revision = "1";
+ editedCabalFile = "8dac5d11177a4374041712a519d50cb6b1fd41fffe201e77eff44f103257c446";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -120027,8 +123034,8 @@ self: {
}:
mkDerivation {
pname = "morph";
- version = "0.1.0.1";
- sha256 = "8ac454d889af2ebe0ef92011e85c9b005be07262a642e3435dac6951c38363f6";
+ version = "0.1.1.1";
+ sha256 = "3b325579797ef49dbc5c49ad0fa05b451806f7178121beb2ee548a988b9745dc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -120069,7 +123076,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "morte_1_6_4" = callPackage
+ "morte_1_6_5" = callPackage
({ mkDerivation, alex, array, base, binary, containers, deepseq
, Earley, http-client, http-client-tls, microlens, microlens-mtl
, mtl, optparse-applicative, pipes, QuickCheck, system-fileio
@@ -120078,8 +123085,8 @@ self: {
}:
mkDerivation {
pname = "morte";
- version = "1.6.4";
- sha256 = "8066f8a4092d3fee6fc67bb361bee0a71dc59f9bb38bb81e4d85d9f799076598";
+ version = "1.6.5";
+ sha256 = "49d292a44d25fe4372856da87380165e1da317c6fafc8bb0d047bbce867787c9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -120558,12 +123565,12 @@ self: {
}) {};
"mtl-c" = callPackage
- ({ mkDerivation, base, mtl }:
+ ({ mkDerivation, base, mtl, transformers }:
mkDerivation {
pname = "mtl-c";
- version = "0.1";
- sha256 = "eb852379c1710af26179c148114b5269f568e3b8317b1a5716f2a07d00942159";
- libraryHaskellDepends = [ base mtl ];
+ version = "0.1.1";
+ sha256 = "2dd7da3c2ed207aa2e4bb5b49aa09e537cfe8c2cae241d026bc52cd091f6ea8b";
+ libraryHaskellDepends = [ base mtl transformers ];
homepage = "https://github.com/fumieval/mtl-c";
description = "Very strict CPS'd transformers";
license = stdenv.lib.licenses.bsd3;
@@ -120835,6 +123842,19 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "multi-trie" = callPackage
+ ({ mkDerivation, base, composition, containers, HTF }:
+ mkDerivation {
+ pname = "multi-trie";
+ version = "0.1";
+ sha256 = "ffcaa510f0f7e379d62c63669f1a35607e49a9811a5d6e50fd2229d9ec967b44";
+ libraryHaskellDepends = [ base composition containers ];
+ testHaskellDepends = [ base containers HTF ];
+ homepage = "https://github.com/vadimvinnik/multi-trie";
+ description = "Trie of sets, as a model for compound names having multiple values";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"multiaddr" = callPackage
({ mkDerivation, attoparsec, base, base58-bytestring, bytestring
, cereal, errors, hashable, tasty, tasty-hunit, tasty-quickcheck
@@ -121060,12 +124080,14 @@ self: {
({ mkDerivation, base, template-haskell }:
mkDerivation {
pname = "multirec";
- version = "0.7.6";
- sha256 = "5212ab1014ccf58472c831fd203e2218073aea213f9f3cc80acafef0458afc27";
+ version = "0.7.7";
+ sha256 = "f342653e874db55f673e6d6236a2c21cc815d5e999ce62affe54fc99a49362e7";
libraryHaskellDepends = [ base template-haskell ];
+ testHaskellDepends = [ base ];
homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
description = "Generic programming for families of recursive datatypes";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"multirec-alt-deriver" = callPackage
@@ -121561,8 +124583,8 @@ self: {
}:
mkDerivation {
pname = "mustache";
- version = "2.1";
- sha256 = "159241066d7e78bb40436391113f319ccb9753e6e00a72c604ccba493e7d42d6";
+ version = "2.1.2";
+ sha256 = "383305b302400070f0b4f6d95f28d5b6b9ffc5d6d660421bb18d122351880f80";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -121744,12 +124766,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "mwc-probability_1_3_0" = callPackage
+ ({ mkDerivation, base, mwc-random, primitive, transformers }:
+ mkDerivation {
+ pname = "mwc-probability";
+ version = "1.3.0";
+ sha256 = "0f9ba623fa2fea7770e3f1cacb1d8a0b14711e60039590d5181864e5a2fe1f6f";
+ libraryHaskellDepends = [ base mwc-random primitive transformers ];
+ homepage = "http://github.com/jtobin/mwc-probability";
+ description = "Sampling function-based probability distributions";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mwc-random" = callPackage
({ mkDerivation, base, primitive, time, vector }:
mkDerivation {
pname = "mwc-random";
- version = "0.13.4.0";
- sha256 = "c52cfdeab2fe6cae3e2b0de382757372df571b7c25a6712ab205fb784b5a8aea";
+ version = "0.13.5.0";
+ sha256 = "28dd2d95d088438ab15e9dee45ddc500b6c4700a87539c70a48b1b7b4c8d1ca9";
libraryHaskellDepends = [ base primitive time vector ];
doCheck = false;
homepage = "https://github.com/bos/mwc-random";
@@ -121911,23 +124946,21 @@ self: {
"mysql-haskell" = callPackage
({ mkDerivation, base, binary, binary-ieee754, binary-parsers
, blaze-textual, bytestring, bytestring-lexing, cryptonite
- , HsOpenSSL, io-streams, memory, monad-loops, network
- , optparse-applicative, scientific, tasty, tasty-hunit, tcp-streams
- , text, time, tls, vector, wire-streams, word24
+ , io-streams, memory, monad-loops, network, scientific, tasty
+ , tasty-hunit, tcp-streams, text, time, tls, vector, wire-streams
+ , word24
}:
mkDerivation {
pname = "mysql-haskell";
- version = "0.6.0.0";
- sha256 = "c1d577ccf0f38a1e0c54409c6e2dfc55bc77c88a3a22537679c4a742d5674429";
+ version = "0.8.0.0";
+ sha256 = "5fe7c723b869a0cd160005f6080960c989b678e154c24f4c2419b775b73eece4";
libraryHaskellDepends = [
base binary binary-ieee754 binary-parsers blaze-textual bytestring
- bytestring-lexing cryptonite HsOpenSSL io-streams memory
- monad-loops network scientific tcp-streams text time tls vector
- wire-streams word24
+ bytestring-lexing cryptonite io-streams memory monad-loops network
+ scientific tcp-streams text time tls vector wire-streams word24
];
testHaskellDepends = [
- base bytestring io-streams optparse-applicative tasty tasty-hunit
- text time vector
+ base bytestring io-streams tasty tasty-hunit text time vector
];
homepage = "https://github.com/winterland1989/mysql-haskell";
description = "pure haskell MySQL driver";
@@ -121935,6 +124968,41 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "mysql-haskell-nem" = callPackage
+ ({ mkDerivation, base, bytestring, io-streams, mysql-haskell
+ , scientific, text, time
+ }:
+ mkDerivation {
+ pname = "mysql-haskell-nem";
+ version = "0.1.0.0";
+ sha256 = "7a0868b76edc96a7aff7860f96436b9040f6cb9319dd67f68bfd700948721f0d";
+ libraryHaskellDepends = [
+ base bytestring io-streams mysql-haskell scientific text time
+ ];
+ homepage = "https://github.com/lorenzo/mysql-haskell-nem#readme";
+ description = "Adds a interface like mysql-simple to mysql-haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "mysql-haskell-openssl" = callPackage
+ ({ mkDerivation, base, HsOpenSSL, io-streams, mysql-haskell
+ , network, tcp-streams, tcp-streams-openssl, wire-streams
+ }:
+ mkDerivation {
+ pname = "mysql-haskell-openssl";
+ version = "0.8.0.0";
+ sha256 = "653df3a834ee18da50c2f740a9d241b0d0bc046b584c4fbc66e5a529ff27b616";
+ libraryHaskellDepends = [
+ base HsOpenSSL io-streams mysql-haskell network tcp-streams
+ tcp-streams-openssl wire-streams
+ ];
+ 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
({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
, blaze-textual, bytestring, hspec, mysql, old-locale, pcre-light
@@ -122205,8 +125273,8 @@ self: {
({ mkDerivation, base, containers, monoid-extras }:
mkDerivation {
pname = "namespace";
- version = "0.1.2.2";
- sha256 = "78992bb0c7b3f03633884512417674fbd9400298cf869b05d2d7ef9c9cdfe2f1";
+ version = "0.1.3.0";
+ sha256 = "bfb9ce8386eb72cb1e00b06632140629fc587128c0729dd85f29a022b5c82a06";
libraryHaskellDepends = [ base containers monoid-extras ];
testHaskellDepends = [ base ];
homepage = "https://github.com/xu-hao/namespace";
@@ -122358,15 +125426,16 @@ self: {
}) {};
"nanovg" = callPackage
- ({ mkDerivation, base, bytestring, containers, freeglut, GLEW
+ ({ mkDerivation, base, bytestring, c2hs, containers, freeglut, GLEW
, hspec, inline-c, mesa, QuickCheck, text, vector
}:
mkDerivation {
pname = "nanovg";
- version = "0.5.0.0";
- sha256 = "26fae2bd7cc430b5fa46200ae0100779f481cde5c236d33f87a78feca3678f6e";
+ version = "0.5.1.0";
+ sha256 = "2e76eaf2b3814d5651a6c13bea84c561d416d0138303cd3826ed89a399c6e437";
libraryHaskellDepends = [ base bytestring containers text vector ];
librarySystemDepends = [ freeglut GLEW mesa ];
+ libraryToolDepends = [ c2hs ];
testHaskellDepends = [ base containers hspec inline-c QuickCheck ];
homepage = "https://github.com/cocreature/nanovg-hs";
description = "Haskell bindings for nanovg";
@@ -122546,6 +125615,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "natural-transformation_0_4" = callPackage
+ ({ mkDerivation, base, containers, quickcheck-instances, tasty
+ , tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "natural-transformation";
+ version = "0.4";
+ sha256 = "aac28e2c1147ed77c1ec0f0eb607a577fa26d0fd67474293ba860ec124efc8af";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base containers quickcheck-instances tasty tasty-quickcheck
+ ];
+ homepage = "https://github.com/ku-fpg/natural-transformation";
+ description = "A natural transformation package";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"naturalcomp" = callPackage
({ mkDerivation, base, text, utf8-string }:
mkDerivation {
@@ -123085,6 +126172,8 @@ self: {
pname = "netpbm";
version = "1.0.2";
sha256 = "846a04bca94be31c779888febc390c64cfba93e40f3a7a2f80ff6a6e44fcc2d7";
+ revision = "1";
+ editedCabalFile = "a0d0ed6bfda0c77c9842b627403392757df62d29aa0994124db6bfc2ca961cee";
libraryHaskellDepends = [
attoparsec attoparsec-binary base bytestring storable-record
unordered-containers vector vector-th-unbox
@@ -123283,8 +126372,8 @@ 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;};
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
"netwire-vinylglfw-examples" = callPackage
({ mkDerivation, array, base, bytestring, containers, directory
@@ -123501,8 +126590,8 @@ self: {
({ mkDerivation, base, bytestring, network, text, time, vector }:
mkDerivation {
pname = "network-carbon";
- version = "1.0.6";
- sha256 = "28e0a72d86be8a21637a62a83273311aab446b1d6e4a13f2638101aa6cd19ef6";
+ version = "1.0.7";
+ sha256 = "9cb794e29273aedf7f3fba7eed81a6a9f83791809095c22c11bf094a687dc9c0";
libraryHaskellDepends = [
base bytestring network text time vector
];
@@ -124066,6 +127155,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "network-transport-inmemory_0_5_2" = callPackage
+ ({ mkDerivation, base, bytestring, containers, data-accessor
+ , network-transport, network-transport-tests, stm
+ }:
+ mkDerivation {
+ pname = "network-transport-inmemory";
+ version = "0.5.2";
+ sha256 = "8245d795330157d90ad9de599854d119c6d8938a45ab8c4ec89f3160b2e9ef4e";
+ libraryHaskellDepends = [
+ base bytestring containers data-accessor network-transport stm
+ ];
+ testHaskellDepends = [
+ base network-transport network-transport-tests
+ ];
+ homepage = "http://haskell-distributed.github.com";
+ description = "In-memory instantiation of Network.Transport";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"network-transport-tcp" = callPackage
({ mkDerivation, base, bytestring, containers, data-accessor
, network, network-transport, network-transport-tests
@@ -124409,6 +127518,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "nfc" = callPackage
+ ({ mkDerivation, base, bytestring, c2hs, nfc }:
+ mkDerivation {
+ pname = "nfc";
+ version = "0.0.1";
+ sha256 = "524f46e2ccaacf26cd6058fbd7b1e9a27aa62a3338154d9209aa3b49d011d731";
+ libraryHaskellDepends = [ base bytestring ];
+ librarySystemDepends = [ nfc ];
+ libraryToolDepends = [ c2hs ];
+ homepage = "https://github.com/centromere/nfc#readme";
+ description = "libnfc bindings";
+ license = stdenv.lib.licenses.publicDomain;
+ }) {nfc = null;};
+
"ngrams-loader" = callPackage
({ mkDerivation, attoparsec, base, machines, mtl, parseargs
, resourcet, sqlite-simple, text
@@ -124433,8 +127556,8 @@ self: {
({ mkDerivation, async, base, bytestring, template-haskell, unix }:
mkDerivation {
pname = "ngx-export";
- version = "0.2.4.0";
- sha256 = "83423a70e9d066a02ea3931b96de18cfcdc9866a47bd7a00c5b82a96f436d99c";
+ version = "0.2.5.0";
+ sha256 = "160e9f29ddc659a39c96de3971de7086528f608e372912a3f4e5b5f11a94590b";
libraryHaskellDepends = [
async base bytestring template-haskell unix
];
@@ -124505,21 +127628,21 @@ self: {
}) {};
"nicovideo-translator" = callPackage
- ({ mkDerivation, base, bytestring, case-insensitive, cmdargs
- , containers, dns, http-client, http-types, iso639, lens
- , naver-translate, setlocale, text, text-format, wai, warp, wreq
- , xml-conduit
+ ({ mkDerivation, aeson, async, base, bytestring, case-insensitive
+ , cmdargs, containers, dns, http-client, http-types, iso639, lens
+ , lens-aeson, setlocale, text, text-format, unordered-containers
+ , wai, warp, wreq, xml-conduit
}:
mkDerivation {
pname = "nicovideo-translator";
- version = "0.1.0.1";
- sha256 = "d2a7963385d06c67dad7d3aadd215c7d243e1e189b9fc3358bceb36a5c65f68a";
+ version = "0.2.0.0";
+ sha256 = "039a1dd1e25450b96ee513091b382f2f9e00826fa2ae69811da9c9a2fe0d4bf0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring case-insensitive cmdargs containers dns http-client
- http-types iso639 lens naver-translate setlocale text text-format
- wai warp wreq xml-conduit
+ aeson async base bytestring case-insensitive cmdargs containers dns
+ http-client http-types iso639 lens lens-aeson setlocale text
+ text-format unordered-containers wai warp wreq xml-conduit
];
executableHaskellDepends = [ base ];
homepage = "https://github.com/dahlia/nicovideo-translator";
@@ -124591,13 +127714,14 @@ self: {
}) {};
"nix-eval" = callPackage
- ({ mkDerivation, base, process, QuickCheck, tasty, tasty-quickcheck
+ ({ mkDerivation, base, hindent, process, QuickCheck, strict, tasty
+ , tasty-quickcheck
}:
mkDerivation {
pname = "nix-eval";
- version = "0.1.0.2";
- sha256 = "f603ce62cd8abaab8cf09c8cf3f8b17332b0490658310eadea5242826b2ef419";
- libraryHaskellDepends = [ base process ];
+ version = "0.3.3.0";
+ sha256 = "4bf250e5a866b4cdfc9d9feaf6c186bfdd45ea04dcfa30dcb1131aa38d7910b1";
+ libraryHaskellDepends = [ base hindent process strict ];
testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
homepage = "http://chriswarbo.net/git/nix-eval";
description = "Evaluate Haskell expressions using Nix to get packages";
@@ -124921,8 +128045,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "nonfree";
- version = "0.1.0.1";
- sha256 = "11d7f5d66a6ec832cb2c15b5f33b6b2fbc3cdf8c49da3a5a8f9ca252531c4e16";
+ version = "0.1.0.2";
+ sha256 = "e0c3207fdc46af5d182ae135f32d8a0ccb7a7779ba8898d954bf6703ee42b0f2";
libraryHaskellDepends = [ base ];
description = "Free structures sans laws";
license = stdenv.lib.licenses.mit;
@@ -124990,10 +128114,8 @@ self: {
}:
mkDerivation {
pname = "normalization-insensitive";
- version = "2.0";
- sha256 = "8f8ab5ae70a07a2d65fd0a46dbd8ed5cc3f3af5e95aa074e5a12b312a4dd4e29";
- revision = "1";
- editedCabalFile = "0f02d93794b029d48c4cd5564f7f357efba43bd13e33a51044994d487e274fc2";
+ version = "2.0.0.1";
+ sha256 = "17f922efd2b1a6ebdefb619c12d1581585f3bc0c2deec811ba124f8ae38d109d";
libraryHaskellDepends = [
base bytestring deepseq hashable text unicode-transforms
];
@@ -125642,10 +128764,8 @@ self: {
}:
mkDerivation {
pname = "nvim-hs";
- version = "0.0.7";
- sha256 = "bbd20049812fd481b882443341b17ad4b6b4e4766e7767130beb4f005786dabf";
- revision = "1";
- editedCabalFile = "957ab623269032edade4d4ea8c62761e7f35564e6a35dbcb825cbb3d05224bfd";
+ version = "0.1.0";
+ sha256 = "69d20c6ea113d9a88e68256f7c4017886e88005fca32a3c0c2cba3749ea09bd0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -125680,8 +128800,8 @@ self: {
}:
mkDerivation {
pname = "nvim-hs-contrib";
- version = "0.0.6";
- sha256 = "0825e32af7a9ee26a1f3d8104b2864208ac8142ce10c3f79516897cb5d12682d";
+ version = "0.1.0";
+ sha256 = "f0de17887d394301ec1975ab768ad6a6131bd7e6580b11c8b9364980e3be6472";
libraryHaskellDepends = [
ansi-wl-pprint base bytestring data-default directory exceptions
messagepack mtl nvim-hs parsec process resourcet setenv stm text
@@ -125705,9 +128825,11 @@ self: {
}:
mkDerivation {
pname = "nvvm";
- version = "0.7.5.0";
- sha256 = "ccd9efb4f1f97318e98d3ad363810d2fd4780992c37fc92d7e526b3af8f59c85";
- setupHaskellDepends = [ base Cabal directory filepath ];
+ version = "0.7.5.1";
+ sha256 = "73914a6a1816432b0cc687a6200b52a030a705b51276f8266a984c3617f69109";
+ setupHaskellDepends = [
+ base Cabal directory filepath template-haskell
+ ];
libraryHaskellDepends = [ base bytestring cuda template-haskell ];
libraryToolDepends = [ c2hs ];
homepage = "https://github.com/tmcdonell/nvvm";
@@ -125768,26 +128890,48 @@ self: {
"oanda-rest-api" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, Decimal
- , hlint, hspec, HUnit, lens, old-locale, scientific, text, time
- , vector, wreq
+ , hlint, hspec, http-conduit, HUnit, lens, old-locale, scientific
+ , text, thyme, vector
}:
mkDerivation {
pname = "oanda-rest-api";
- version = "0.1.0.0";
- sha256 = "7a22fbe550d0bd7d80d9a07e4e563557ff81f294eef423026542bc2bd8a18b0f";
+ version = "0.3.0.0";
+ sha256 = "be57364a4da2e2b20d188c8a50efe15b4a07daf641e4294e3b9eba87b75f7603";
+ revision = "1";
+ editedCabalFile = "44db3924a18face1edc0b9c6ee19c0ed2bc0d0441a123286bb099bfac663d1d5";
libraryHaskellDepends = [
- aeson base bytestring containers Decimal lens old-locale scientific
- text time vector wreq
+ aeson base bytestring containers Decimal http-conduit lens
+ old-locale scientific text thyme vector
];
testHaskellDepends = [
- aeson base bytestring containers Decimal hlint hspec HUnit lens
- old-locale scientific text time vector wreq
+ aeson base bytestring containers Decimal hlint hspec http-conduit
+ HUnit lens old-locale scientific text thyme vector
];
- homepage = "http://github.com/jdreaver/oanda-rest-api";
+ homepage = "https://github.com/jdreaver/oanda-rest-api#readme";
description = "Client to the OANDA REST API";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "oauth10a" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+ , cryptohash, entropy, http-types, time, transformers
+ }:
+ mkDerivation {
+ pname = "oauth10a";
+ version = "0.1.0.0";
+ sha256 = "a923cb04195ed275990623b821933bc52e00a7311ee485e803d272185c11aacc";
+ revision = "1";
+ editedCabalFile = "5ee8aca8d824721a86d2ecb7cc094baffa6591059e49e6f7da5682851c30b7a1";
+ libraryHaskellDepends = [
+ aeson base base64-bytestring bytestring cryptohash entropy
+ http-types time transformers
+ ];
+ testHaskellDepends = [ base bytestring ];
+ homepage = "https://github.com/gatlin/oauth10a#readme";
+ description = "Fully Automatic Luxury OAuth 1.0a headers";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"oauthenticated" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
, bytestring, case-insensitive, crypto-random, cryptohash, either
@@ -125836,13 +128980,15 @@ self: {
}) {};
"obdd" = callPackage
- ({ mkDerivation, array, base, containers, mtl, random }:
+ ({ mkDerivation, array, base, containers, mtl, process, random }:
mkDerivation {
pname = "obdd";
- version = "0.3.3";
- sha256 = "bf9aa0cc89f4964df7e9fe61d1c5e3b37d6e04f3750a9c98025c21d45a24f1b5";
- libraryHaskellDepends = [ array base containers mtl random ];
- testHaskellDepends = [ base containers ];
+ version = "0.6.1";
+ sha256 = "0db47df8588a5ffd6a925cf4d21c3e313aac9ec8ced2461dfddbfafb38ba1053";
+ libraryHaskellDepends = [
+ array base containers mtl process random
+ ];
+ testHaskellDepends = [ array base containers ];
homepage = "https://github.com/jwaldmann/haskell-obdd";
description = "Ordered Reduced Binary Decision Diagrams";
license = "GPL";
@@ -125971,6 +129117,30 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "octane_0_18_1" = 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.18.1";
+ sha256 = "0531b90b093b4e89f183801cdf7c4220adf7c118d90aba00db2968d3e0b7604b";
+ 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
@@ -126067,8 +129237,8 @@ self: {
}:
mkDerivation {
pname = "oeis";
- version = "0.3.7";
- sha256 = "5d898a04d6117eca1250083cb8783d159302e9b5eb084878f5771916204861cf";
+ version = "0.3.8";
+ sha256 = "4be72f80596045a51e56f8d810b5a044689f117b38a614bd9645e97dd3e39c93";
libraryHaskellDepends = [ base HTTP network network-uri ];
testHaskellDepends = [
base HUnit test-framework test-framework-hunit
@@ -126284,15 +129454,14 @@ self: {
"ombra" = callPackage
({ mkDerivation, base, gl, hashable, hashtables, transformers
- , unordered-containers, vect, vector
+ , unordered-containers, vect
}:
mkDerivation {
pname = "ombra";
- version = "0.1.1.0";
- sha256 = "d23a834bfd3195eadc37e9f8b443dfec9b2d223bec8ab1e7eecfb1278055de72";
+ version = "0.2.2.0";
+ sha256 = "006dde6ad3c4273078f7129a67380b1002b2fb6f2f92f253695e846a23181d60";
libraryHaskellDepends = [
base gl hashable hashtables transformers unordered-containers vect
- vector
];
homepage = "https://github.com/ziocroc/Ombra";
description = "Render engine";
@@ -126526,10 +129695,8 @@ self: {
}:
mkDerivation {
pname = "opaleye";
- version = "0.5.1.1";
- sha256 = "4a931cbed10a9eb2c20abb1cfa7a70ead7c5b0464ec516a0dd437fef7b3dc02e";
- revision = "1";
- editedCabalFile = "134244b5b0a2b0d253dfd9021e6522938a138ed68631af787c0d7f3d673e6e39";
+ version = "0.5.2.2";
+ sha256 = "e09e565314d59a420349f0a5295ee4f9ed7215d579741fcf06d376703dd3d102";
libraryHaskellDepends = [
aeson attoparsec base base16-bytestring bytestring case-insensitive
contravariant postgresql-simple pretty product-profunctors
@@ -126707,16 +129874,16 @@ self: {
}) {};
"open-union" = callPackage
- ({ mkDerivation, base }:
+ ({ mkDerivation, base, type-fun }:
mkDerivation {
pname = "open-union";
- version = "0.1.0.1";
- sha256 = "1ceb46a9eeb6114a5eb8eeb3805a9d4f218c88cd2f24e42c25271b348b3a7fb6";
+ version = "0.2.0.0";
+ sha256 = "e9835d4e736afcedda90ff1e21ab6446266c1aa925b453ebf2292561dab48bbe";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [ base ];
- executableHaskellDepends = [ base ];
- homepage = "https://github.com/RobotGymnast/open-union";
+ libraryHaskellDepends = [ base type-fun ];
+ executableHaskellDepends = [ base type-fun ];
+ homepage = "https://github.com/bfopa/open-union";
description = "Extensible, type-safe unions";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -126742,8 +129909,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";
@@ -127288,16 +130455,51 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "opentype" = callPackage
+ ({ mkDerivation, base, binary, bytestring, containers, ghc
+ , microlens, microlens-th, mtl, pretty-hex, time
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "opentype";
+ version = "0.1.1";
+ sha256 = "c074b4b424201266f126ffe4360adbe00c9c855d65b4d48aeaf835033c504b0d";
+ libraryHaskellDepends = [
+ base binary bytestring containers ghc microlens microlens-th mtl
+ pretty-hex time unordered-containers vector
+ ];
+ description = "Opentype loading and writing";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "operate-do" = callPackage
+ ({ mkDerivation, base, charset, doctest, filemanip
+ , haskell-src-meta, hspec, QuickCheck, template-haskell
+ }:
+ mkDerivation {
+ pname = "operate-do";
+ version = "0.1.0";
+ sha256 = "c1daa940cd97336eecba200f8201f591ed1395390feeb3c9376fea86b7901764";
+ libraryHaskellDepends = [
+ base charset haskell-src-meta template-haskell
+ ];
+ testHaskellDepends = [ base doctest filemanip hspec QuickCheck ];
+ homepage = "https://github.com/uecmma/haskell-library-collections/tree/master/operate-do";
+ description = "Simple project template from stack";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"operational" = callPackage
({ mkDerivation, base, mtl, random }:
mkDerivation {
pname = "operational";
- version = "0.2.3.4";
- sha256 = "51cc8751432201f4cbef15a187ee668bca13d774eb0ef28c8e3d36f633866810";
+ version = "0.2.3.5";
+ sha256 = "91d479063ae7ed3d0a6ae911bdee550fbf31cf341910f9778046b484c55b4af4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base mtl ];
- executableHaskellDepends = [ random ];
+ executableHaskellDepends = [ base mtl random ];
homepage = "http://wiki.haskell.org/Operational";
description = "Implementation of difficult monads made easy with operational semantics";
license = stdenv.lib.licenses.bsd3;
@@ -127307,8 +130509,8 @@ self: {
({ mkDerivation, base, mtl }:
mkDerivation {
pname = "operational-alacarte";
- version = "0.3";
- sha256 = "c9e6ebe251d0854ed71fcf10ea54af2489f6819e180c55d6f15cc1fe3cb5dfcc";
+ version = "0.3.1";
+ sha256 = "d52a77eee6056ac730bf9b953018044aa5ed9b381e7cd4e7a6e59348c1969d58";
libraryHaskellDepends = [ base mtl ];
testHaskellDepends = [ base ];
homepage = "https://github.com/emilaxelsson/operational-alacarte";
@@ -127624,17 +130826,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "optparse-generic_1_1_3" = callPackage
- ({ mkDerivation, base, bytestring, optparse-applicative
+ "optparse-generic_1_1_4" = callPackage
+ ({ mkDerivation, base, bytestring, optparse-applicative, semigroups
, system-filepath, text, time, transformers, void
}:
mkDerivation {
pname = "optparse-generic";
- version = "1.1.3";
- sha256 = "aa999234f55296f2c82a05f2ba9e7e418065ae60c826569e6590f021be7321a0";
+ version = "1.1.4";
+ sha256 = "dc69bc73d6e3de52bcc5c4ccd8ce741eebb8d10747bc7f819b38b0cdaf1e520c";
libraryHaskellDepends = [
- base bytestring optparse-applicative system-filepath text time
- transformers void
+ base bytestring optparse-applicative semigroups system-filepath
+ text time transformers void
];
description = "Auto-generate a command-line parser for your datatype";
license = stdenv.lib.licenses.bsd3;
@@ -128602,7 +131804,7 @@ self: {
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
- "pandoc_1_18" = callPackage
+ "pandoc_1_19_1" = callPackage
({ mkDerivation, aeson, ansi-terminal, array, base
, base64-bytestring, binary, blaze-html, blaze-markup, bytestring
, cmark, containers, data-default, deepseq, Diff, directory
@@ -128617,8 +131819,8 @@ self: {
}:
mkDerivation {
pname = "pandoc";
- version = "1.18";
- sha256 = "3ea4b977f31d71dedd99a4584a895659efbbab02b00fdc9daaf7781787ce4e92";
+ version = "1.19.1";
+ sha256 = "9d22db0a1536de0984f4a605f1a28649e68d540e6d892947d9644987ecc4172a";
configureFlags = [ "-fhttps" "-f-trypandoc" ];
isLibrary = true;
isExecutable = true;
@@ -128660,8 +131862,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-citeproc";
- version = "0.10.2.2";
- sha256 = "1475a2e0a13922df9c931c0480154fa4f02bd81ef34b166596b035898c94dd7a";
+ version = "0.10.3";
+ sha256 = "2f6233ff91a9fb08edfb0ac2b4ec40729d87590a7c557d0452674dd3c7df4d58";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -128689,8 +131891,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-citeproc-preamble";
- version = "1.1.0";
- sha256 = "2200bed5ca32cb6fd74b53dec3e913c0298ada8434154f97c34991a1e9fe568f";
+ version = "1.2.1";
+ sha256 = "99e0988741a8b820ca951b2aabc35d251119c84e0a8245bf0c9b55cbe0e22121";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -128705,20 +131907,18 @@ self: {
({ mkDerivation, base, bytestring, containers, data-accessor
, data-accessor-template, data-accessor-transformers, data-default
, directory, filepath, hspec, mtl, pandoc, pandoc-types, process
- , roman-numerals, syb, template-haskell, yaml
+ , roman-numerals, syb, template-haskell, utility-ht, yaml
}:
mkDerivation {
pname = "pandoc-crossref";
- version = "0.2.3.0";
- sha256 = "b6b4200023da4835cf50a2c9a247a837282ccf16e1684336b5a15d17b9ad085e";
- revision = "1";
- editedCabalFile = "d2e8585033cbfcb5d232c01e6df4f9ba073d1249613847c238d433b011015693";
+ version = "0.2.4.1";
+ sha256 = "2aa2266ac3916677c18bd9a88b99f32622c22c983abaed3598020913ca3912ed";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bytestring containers data-accessor data-accessor-template
data-accessor-transformers data-default mtl pandoc pandoc-types
- roman-numerals syb template-haskell yaml
+ roman-numerals syb template-haskell utility-ht yaml
];
executableHaskellDepends = [
base bytestring containers data-default mtl pandoc pandoc-types
@@ -128728,7 +131928,7 @@ self: {
base bytestring containers data-accessor data-accessor-template
data-accessor-transformers data-default directory filepath hspec
mtl pandoc pandoc-types process roman-numerals syb template-haskell
- yaml
+ utility-ht yaml
];
description = "Pandoc filter for cross-references";
license = stdenv.lib.licenses.gpl2;
@@ -128803,22 +132003,23 @@ self: {
}) {};
"pandoc-placetable" = callPackage
- ({ mkDerivation, base, explicit-exception, http-conduit
- , pandoc-types, spreadsheet, utf8-string
+ ({ mkDerivation, aeson, base, bytestring, explicit-exception
+ , http-conduit, pandoc-types, spreadsheet, utf8-string
}:
mkDerivation {
pname = "pandoc-placetable";
- version = "0.4.1";
- sha256 = "8c1e03f5bd538301eda3c5b83b594693638b805b6fead191a10d9b73a7c18383";
+ version = "0.4.2";
+ sha256 = "5151cd72e3277229e87efd0e7cb150434baa1be76e117e5644f93bfba4f81579";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base explicit-exception http-conduit pandoc-types spreadsheet
- utf8-string
+ aeson base bytestring explicit-exception http-conduit pandoc-types
+ spreadsheet utf8-string
];
homepage = "https://github.com/mb21/pandoc-placetable";
description = "Pandoc filter to include CSV files";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"pandoc-plantuml-diagrams" = callPackage
@@ -128843,6 +132044,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "pandoc-stylefrommeta" = callPackage
+ ({ mkDerivation, base, containers, HaTeX, MissingH, pandoc
+ , pandoc-types
+ }:
+ mkDerivation {
+ pname = "pandoc-stylefrommeta";
+ version = "0.1.0.1";
+ sha256 = "8118b1f301b9a77ea855b217db98f3bc205bb04e673100a652460bea888af2d3";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base containers HaTeX MissingH pandoc pandoc-types
+ ];
+ homepage = "http://github.com/lyokha/styleFromMeta";
+ description = "Pandoc filter to customize links, images and paragraphs";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"pandoc-types" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, deepseq
, ghc-prim, syb
@@ -129434,8 +132653,8 @@ self: {
({ mkDerivation, base, containers, process }:
mkDerivation {
pname = "parseargs";
- version = "0.2.0.7";
- sha256 = "900eaca47e0ddbdadf137377f1eb6b16b69eabed54ce45a4c22b176ba8ddb45d";
+ version = "0.2.0.8";
+ sha256 = "7b789204c15d0c478db3d133f349a6970b5509fc6af655faedc03c7426dcf7d6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base containers ];
@@ -129464,12 +132683,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;
@@ -129999,8 +133218,8 @@ self: {
}:
mkDerivation {
pname = "patat";
- version = "0.3.3.0";
- sha256 = "63e9aa04425cada935fa4959b7e474c2d9c8b857a3ca84e6499e376c69729132";
+ version = "0.4.5.0";
+ sha256 = "d60fb0d72ad518e3f3cf49fe6576ad5f2c1f371d75884394791fe2dcf417c5c9";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -130052,8 +133271,8 @@ self: {
}:
mkDerivation {
pname = "patches-vector";
- version = "0.1.5.2";
- sha256 = "aa19e7edb991e383672d58536351f63733359b0260902170c61c48e7196fec85";
+ version = "0.1.5.4";
+ sha256 = "f4c938988ad98883b98db10a32d4d544c39f98fc77b4e2c8da393718ef30da54";
libraryHaskellDepends = [
base edit-distance-vector microlens vector
];
@@ -130068,16 +133287,22 @@ self: {
"path" = callPackage
({ mkDerivation, aeson, base, bytestring, deepseq, exceptions
- , filepath, hspec, HUnit, mtl, template-haskell
+ , filepath, genvalidity, genvalidity-hspec, hspec, HUnit, mtl
+ , QuickCheck, template-haskell, validity
}:
mkDerivation {
pname = "path";
- version = "0.5.9";
- sha256 = "e67982fe579b6318def4769db9a7a3ae07ac7b67b4e8d6326f568cb72aafa727";
+ version = "0.5.11";
+ sha256 = "bf0d9ea00271017893f59d5e136cb22116278220899609104d7906635286ac14";
+ revision = "1";
+ editedCabalFile = "a7cad89b8049cd067990a13713c27513b7c473182accfebae5eb2aa0a1d2c197";
libraryHaskellDepends = [
aeson base deepseq exceptions filepath template-haskell
];
- testHaskellDepends = [ aeson base bytestring hspec HUnit mtl ];
+ testHaskellDepends = [
+ aeson base bytestring filepath genvalidity genvalidity-hspec hspec
+ HUnit mtl QuickCheck validity
+ ];
description = "Support for well-typed paths";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -130675,6 +133900,8 @@ self: {
pname = "peano";
version = "0.1.0.1";
sha256 = "31fdd23993a76155738224a7b230a1a6fcfde091b2fbc945df4cb54068eeec7b";
+ revision = "1";
+ editedCabalFile = "544dd9ba3e8a67303b376ebcd5c000bdcd977c67475c058a2579be75ce8ec469";
libraryHaskellDepends = [ base ];
description = "Peano numbers";
license = "unknown";
@@ -131364,8 +134591,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";
@@ -131833,8 +135060,8 @@ self: {
}:
mkDerivation {
pname = "pgdl";
- version = "10.2";
- sha256 = "8b27c1af6318c385027b1fa89c7459a0cbb274383148ec1d434c16cf8111216a";
+ version = "10.5";
+ sha256 = "cd4a959d4648589e14b71aa0940141c7881166f8ad0257eb427c3acf71942c7b";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -131862,16 +135089,17 @@ self: {
}) {};
"pgp-wordlist" = callPackage
- ({ mkDerivation, base, bytestring, containers, HUnit, tasty
- , tasty-hunit, tasty-quickcheck, text, vector
+ ({ mkDerivation, base, bytestring, containers, deepseq, doctest
+ , HUnit, tasty, tasty-hunit, tasty-quickcheck, text, vector
}:
mkDerivation {
pname = "pgp-wordlist";
- version = "0.1.0.1";
- sha256 = "a3dde976bc94fc83e8dce20cdafe673f5afdc741ac0360098ee8b415a0436d88";
+ version = "0.1.0.2";
+ sha256 = "e28b6fe85222adf1247d5870ab47c68c3d25df3f9ceda104bfb64e1414a92466";
libraryHaskellDepends = [ base bytestring containers text vector ];
testHaskellDepends = [
- base bytestring HUnit tasty tasty-hunit tasty-quickcheck text
+ base bytestring deepseq doctest HUnit tasty tasty-hunit
+ tasty-quickcheck text
];
homepage = "https://github.com/quchen/pgp-wordlist";
description = "Translate between binary data and a human-readable collection of words";
@@ -132029,8 +135257,8 @@ self: {
}:
mkDerivation {
pname = "phoityne-vscode";
- version = "0.0.10.0";
- sha256 = "6c002069fa4416c1767affe099102a031e495e74f7ff904ed3d14eef74335916";
+ version = "0.0.11.0";
+ sha256 = "d9d5e2b94ac48b2a7aaa50526b66dfe47de9c368147b64865c3dc2d65c17defb";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -132357,8 +135585,10 @@ self: {
({ mkDerivation, base, process, unix }:
mkDerivation {
pname = "pid1";
- version = "0.1.0.0";
- sha256 = "2b8e4bcdb1ce5c1dd5734d4406edd899e72e0afbe83758ff77590508a39d6cd2";
+ version = "0.1.0.1";
+ sha256 = "163b6dc85426558ad1a897675bf7f560389addf172c8e5858f817342ee7345c8";
+ revision = "1";
+ editedCabalFile = "f3213f1c04a1daa726ee2f6ceda69d843b80f4726759ef2fe2e23c4f34342746";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base process unix ];
@@ -132421,20 +135651,21 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "pinboard_0_9_10" = callPackage
- ({ mkDerivation, aeson, base, bytestring, containers, either, hspec
- , http-client, http-client-tls, http-types, mtl, network
- , profunctors, QuickCheck, random, safe-exceptions, semigroups
- , text, time, transformers, unordered-containers, vector
+ "pinboard_0_9_12_1" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, hspec
+ , http-client, http-client-tls, http-types, monad-logger, mtl
+ , network, profunctors, QuickCheck, random, safe-exceptions
+ , semigroups, text, time, transformers, unordered-containers
+ , vector
}:
mkDerivation {
pname = "pinboard";
- version = "0.9.10";
- sha256 = "841e1a70daecec66d53fb3fdeb1c89fa5c2de0e5bd701129a9596492216a5249";
+ version = "0.9.12.1";
+ sha256 = "dd6303ec05b38e9b2af196d4efee5ee174fef62c960c2ad15943faef9d96d237";
libraryHaskellDepends = [
- aeson base bytestring containers either http-client http-client-tls
- http-types mtl network profunctors random safe-exceptions text time
- transformers unordered-containers vector
+ aeson base bytestring containers http-client http-client-tls
+ http-types monad-logger mtl network profunctors random
+ safe-exceptions text time transformers unordered-containers vector
];
testHaskellDepends = [
aeson base bytestring containers hspec mtl QuickCheck
@@ -132532,17 +135763,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "pipes_4_2_0" = callPackage
- ({ mkDerivation, base, mmorph, mtl, QuickCheck, test-framework
- , test-framework-quickcheck2, transformers
+ "pipes_4_3_2" = callPackage
+ ({ mkDerivation, base, exceptions, mmorph, mtl, QuickCheck
+ , test-framework, test-framework-quickcheck2, transformers
}:
mkDerivation {
pname = "pipes";
- version = "4.2.0";
- sha256 = "1e407197e94c3c8642fd2c7b4f8e5a3e537844dff2780c396464a47ae0ec0124";
- revision = "1";
- editedCabalFile = "1ce0aac0a280be337215bcf2a8b73b081a948bfb93e24045a7e3a3c3e6adfad0";
- libraryHaskellDepends = [ base mmorph mtl transformers ];
+ version = "4.3.2";
+ sha256 = "7957bb290db7f1dfad0581f363ab97fcd58f7c0b916e1114464cb9a398b8334a";
+ libraryHaskellDepends = [
+ base exceptions mmorph mtl transformers
+ ];
testHaskellDepends = [
base mtl QuickCheck test-framework test-framework-quickcheck2
transformers
@@ -132676,8 +135907,8 @@ self: {
}:
mkDerivation {
pname = "pipes-bytestring";
- version = "2.1.3";
- sha256 = "d2211e068fe28c5e6a5dc0089eec0dd31bedd4b942285965a02f8aa20c4c6f3e";
+ version = "2.1.4";
+ sha256 = "6c3f72de28aa538887f6c442884e88a4a0219057998e3710b81439dcb4466deb";
libraryHaskellDepends = [
base bytestring pipes pipes-group pipes-parse transformers
];
@@ -132718,6 +135949,7 @@ self: {
homepage = "https://github.com/centromere/pipes-cacophony";
description = "Pipes for Noise-secured network connections";
license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"pipes-cellular" = callPackage
@@ -132800,8 +136032,8 @@ self: {
({ mkDerivation, async, base, contravariant, pipes, stm, void }:
mkDerivation {
pname = "pipes-concurrency";
- version = "2.0.6";
- sha256 = "e0523b67c40c0e0fba04e2eb695adae9142ee199a8f54326f770cb33d66a3b8e";
+ version = "2.0.7";
+ sha256 = "14a47f0096361b495330b4489c3534ee37f507550ffa2f57cb0e70362df47559";
libraryHaskellDepends = [ base contravariant pipes stm void ];
testHaskellDepends = [ async base pipes stm ];
description = "Concurrency for the pipes ecosystem";
@@ -132914,8 +136146,8 @@ self: {
}:
mkDerivation {
pname = "pipes-extras";
- version = "1.0.7";
- sha256 = "f4d441160cf5d50ad83c15c88c80b835e39d7a73a4e7943c6a6d4c796df28be2";
+ version = "1.0.8";
+ sha256 = "4d0f7932212988b5e4c661238d66db316cd11bae15506a87d925ae058194d37b";
libraryHaskellDepends = [ base foldl pipes transformers ];
testHaskellDepends = [
base HUnit pipes test-framework test-framework-hunit transformers
@@ -132975,8 +136207,8 @@ self: {
}:
mkDerivation {
pname = "pipes-group";
- version = "1.0.5";
- sha256 = "dbcdfe483c57f337a259635d2fde149e1d2b081092f0b1b30fc7d175b38e2ef5";
+ version = "1.0.6";
+ sha256 = "07ad6f6ba7675b59aeb3be77171170da99a6f54e18b8d477d52f94b05e8ab766";
libraryHaskellDepends = [
base free pipes pipes-parse transformers
];
@@ -133000,6 +136232,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "pipes-http_1_0_5" = callPackage
+ ({ mkDerivation, base, bytestring, http-client, http-client-tls
+ , pipes
+ }:
+ mkDerivation {
+ pname = "pipes-http";
+ version = "1.0.5";
+ sha256 = "49a196466de1638f3806a49bf10fef9eb3c06456ababf09ffd025b6b64f23055";
+ libraryHaskellDepends = [
+ base bytestring http-client http-client-tls pipes
+ ];
+ description = "HTTP client with pipes interface";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"pipes-illumina" = callPackage
({ mkDerivation, base, bytestring, directory, filepath, pipes
, pipes-bgzf
@@ -133051,8 +136299,8 @@ self: {
}:
mkDerivation {
pname = "pipes-key-value-csv";
- version = "0.4.0.0";
- sha256 = "1792858c4359a6c0ed9c685d422005c285853ac8382cb14390c2d00829ec427e";
+ version = "0.4.0.2";
+ sha256 = "3d2ecb1a9fc0a276aebdf626191def168df95de896d929f96bf9927658c4ef6c";
libraryHaskellDepends = [
base bifunctors containers data-default-class lens mtl pipes
pipes-bytestring pipes-group pipes-parse pipes-safe pipes-text
@@ -133181,8 +136429,8 @@ self: {
({ mkDerivation, base, pipes, transformers }:
mkDerivation {
pname = "pipes-parse";
- version = "3.0.7";
- sha256 = "3f61375dd13d6ca6aa4d73ba62e3dbc8f02f6ad62d6dffb5f1eecd21e1637824";
+ version = "3.0.8";
+ sha256 = "d28f831b2c8229cca567ee95570787d2dd3f5cfcff3b3c44ee308360a8c107a9";
libraryHaskellDepends = [ base pipes transformers ];
description = "Parsing infrastructure for the pipes ecosystem";
license = stdenv.lib.licenses.bsd3;
@@ -133233,8 +136481,8 @@ self: {
({ mkDerivation, base, mwc-random, pipes, vector }:
mkDerivation {
pname = "pipes-random";
- version = "1.0.0.1";
- sha256 = "e18371195212d91ccb7f08f0d4065b3fd314988480bc72fce03f60716ac29ccd";
+ version = "1.0.0.2";
+ sha256 = "1b176ae550fd31ebe8d0d5fca6f1c420b50adb2364d68f7fcaeb7006a48c6520";
libraryHaskellDepends = [ base mwc-random pipes vector ];
description = "Producers for handling randomness";
license = stdenv.lib.licenses.bsd3;
@@ -133293,6 +136541,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "pipes-safe_2_2_5" = callPackage
+ ({ mkDerivation, base, containers, exceptions, monad-control, mtl
+ , pipes, transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "pipes-safe";
+ version = "2.2.5";
+ sha256 = "0242cfe67853dc5bd94c979b06da25423d8bf96c3b095f4d33b745c78605a67c";
+ libraryHaskellDepends = [
+ base containers exceptions monad-control mtl pipes transformers
+ transformers-base
+ ];
+ description = "Safety for the pipes ecosystem";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"pipes-shell" = callPackage
({ mkDerivation, async, base, bytestring, directory, hspec, pipes
, pipes-bytestring, pipes-safe, process, stm, stm-chans, text
@@ -133334,8 +136599,8 @@ self: {
}:
mkDerivation {
pname = "pipes-text";
- version = "0.0.2.4";
- sha256 = "0e16ad5f29c981100452f23aa6c4998cc96427d70af5be389559fd6223279fb0";
+ version = "0.0.2.5";
+ sha256 = "4489ee02a8ebfd87049fc4dd1380b21e6f33984eb0101c836ab8e054759c0f2a";
libraryHaskellDepends = [
base bytestring pipes pipes-bytestring pipes-group pipes-parse
pipes-safe streaming-commons text transformers
@@ -133734,12 +136999,12 @@ self: {
"playlists" = callPackage
({ mkDerivation, attoparsec, base, bytestring, doctest, filepath
- , hlint, hspec, optparse-applicative, text, word8
+ , hspec, optparse-applicative, text, word8
}:
mkDerivation {
pname = "playlists";
- version = "0.3.0.0";
- sha256 = "8bb2141f2e996d7d4ab376e53fd00c0abfdfc05b00abc53b8c44573720e089bc";
+ version = "0.4.0.0";
+ sha256 = "38a4cb8370ced24a7ac198f16b509799993e9798ccfb9fc3448ee8e14bd71688";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -133748,13 +137013,32 @@ self: {
executableHaskellDepends = [
base bytestring optparse-applicative text
];
- testHaskellDepends = [ base bytestring doctest hlint hspec ];
+ testHaskellDepends = [
+ base bytestring doctest filepath hspec text
+ ];
homepage = "https://github.com/pjones/playlists";
description = "Library and executable for working with playlist files";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "playlists-http" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, either, exceptions
+ , http-client, mtl, playlists, text
+ }:
+ mkDerivation {
+ pname = "playlists-http";
+ version = "0.1.0.0";
+ sha256 = "9f3360bd4adcf45c0bd85eecc717c8093f8d8c71adcf8cff5d961c6cea1c15e3";
+ libraryHaskellDepends = [
+ attoparsec base bytestring either exceptions http-client mtl
+ playlists text
+ ];
+ homepage = "https://github.com/pjones/playlists-http";
+ description = "Library to glue together playlists and http-client";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"plist" = callPackage
({ mkDerivation, base, base64-bytestring, bytestring, hxt }:
mkDerivation {
@@ -133899,6 +137183,52 @@ self: {
license = "GPL";
}) {};
+ "plotlyhs" = callPackage
+ ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
+ , lucid, microlens, microlens-th, text
+ }:
+ mkDerivation {
+ pname = "plotlyhs";
+ version = "0.1.0";
+ sha256 = "445bc874f9edef177830e39968ac487bfd156702750c74f287ed6387a07b5f5b";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base blaze-html blaze-markup bytestring lucid microlens
+ microlens-th text
+ ];
+ executableHaskellDepends = [ aeson base lucid microlens text ];
+ homepage = "https://github.com/glutamate/plotlyhs";
+ description = "Haskell bindings to Plotly.js";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "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 {
@@ -134207,6 +137537,8 @@ self: {
pname = "pointful";
version = "1.0.9";
sha256 = "6a1881236419751beb5b2e4e495bd9093ea2dec3f3cbd44e2a62aaabe53cacd6";
+ revision = "1";
+ editedCabalFile = "5a0ac6eb52c232cca59759b25a34eff0d89f614332b088baaa8b11e27fb19c8e";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -134354,11 +137686,11 @@ self: {
({ mkDerivation, base, containers, hspec, lens, mtl }:
mkDerivation {
pname = "polar-shader";
- version = "0.2.0.0";
- sha256 = "a251680f9d717394cb91e758d51ab8a69889be619325aff378d80b21742867f5";
+ version = "0.3.0.0";
+ sha256 = "426c5bb67fdb5be0e648678fa9d03800e714d5f89123b93d72fb8c7b7c01af24";
libraryHaskellDepends = [ base containers lens mtl ];
testHaskellDepends = [ base containers hspec ];
- description = "High-level shader compiler for Polar Game Engine";
+ description = "High-level shader compiler framework";
license = stdenv.lib.licenses.asl20;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -134635,12 +137967,12 @@ self: {
}) {};
"pong-server" = callPackage
- ({ mkDerivation, base, hspec, network, QuickCheck }:
+ ({ mkDerivation, base, data-default, hspec, network, QuickCheck }:
mkDerivation {
pname = "pong-server";
- version = "0.0.2.0";
- sha256 = "2964703036c52a24afc15522f3ad0a5eee5ee14f3153dd35a9e3ddd7501761ad";
- libraryHaskellDepends = [ base network ];
+ version = "0.0.2.1";
+ sha256 = "145242c8ad672f358eb83f503ba5f92478040d943236b25010d343085f42779a";
+ libraryHaskellDepends = [ base data-default network ];
testHaskellDepends = [ base hspec network QuickCheck ];
homepage = "http://github.com/RobertFischer/pong-server#readme";
description = "A simple embedded pingable server that runs in the background";
@@ -135790,6 +139122,50 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "praglude" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, bytestring, casing
+ , containers, data-default, deepseq, directory, filepath, hashable
+ , lens, mtl, random, semigroups, string-convert, template-haskell
+ , text, time, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "praglude";
+ version = "0.2.1.0";
+ sha256 = "6d0a637bccc13464149d75482e61ed8f10caf93d721d43f49e583032aad6d776";
+ libraryHaskellDepends = [
+ aeson base base64-bytestring bytestring casing containers
+ data-default deepseq directory filepath hashable lens mtl random
+ semigroups string-convert template-haskell text time
+ unordered-containers vector
+ ];
+ homepage = "https://github.com/tdammers/praglude";
+ description = "A pragmatic Prelude";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "preamble" = callPackage
+ ({ mkDerivation, aeson, base, basic-prelude, exceptions
+ , fast-logger, lens, monad-control, monad-logger, mtl, resourcet
+ , safe, shake, template-haskell, text, text-manipulate, time
+ , transformers-base, unordered-containers
+ }:
+ mkDerivation {
+ pname = "preamble";
+ version = "0.0.3";
+ sha256 = "5a4a1a4fa8dcad02d6afbdc99b44d4f9e94571b48b88115b7d1ebb266f776a73";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base basic-prelude exceptions fast-logger lens monad-control
+ monad-logger mtl resourcet safe template-haskell text
+ text-manipulate time transformers-base unordered-containers
+ ];
+ executableHaskellDepends = [ base basic-prelude shake ];
+ homepage = "https://github.com/swift-nav/preamble";
+ description = "Yet another prelude";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"precis" = callPackage
({ mkDerivation, base, Cabal, containers, cpphs, directory
, filepath, haskell-src-exts, xhtml
@@ -135972,20 +139348,22 @@ self: {
}) {};
"pregame" = callPackage
- ({ mkDerivation, base, bytestring, cmdargs, containers
- , data-default, lens, mtl, parallel, safe, stm, text, transformers
- , tuple, vector
+ ({ mkDerivation, aeson, array, base, bytestring, containers
+ , data-default, deepseq, either, ghc-prim, integer-gmp, lens, mtl
+ , safe, StateVar, stm, text, text-conversions, time, tuple
+ , unordered-containers, vector
}:
mkDerivation {
pname = "pregame";
- version = "0.1.4.3";
- sha256 = "c46be43886c12e04954a7674ea4fbc8be0f79a75d19effb9b420d41e5e754253";
+ version = "1.0.3.0";
+ sha256 = "447c76f91a0b79f55250168258f840d73062d77ec44c9727ccddcba9561a777f";
libraryHaskellDepends = [
- base bytestring cmdargs containers data-default lens mtl parallel
- safe stm text transformers tuple vector
+ aeson array base bytestring containers data-default deepseq either
+ ghc-prim integer-gmp lens mtl safe StateVar stm text
+ text-conversions time tuple unordered-containers vector
];
homepage = "https://github.com/jxv/pregame";
- description = "Prelude counterpart";
+ description = "Prelude for applications";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -136269,6 +139647,22 @@ self: {
license = "GPL";
}) {};
+ "pretty-display" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, base, pretty-show, text }:
+ mkDerivation {
+ pname = "pretty-display";
+ version = "0.1.10";
+ sha256 = "7dd446519a316ebd9b33f3d6fc61603d73ffba1f6dd3ed6ada79bd9c8a043406";
+ 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 {
@@ -136326,6 +139720,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "pretty-simple" = callPackage
+ ({ mkDerivation, ansi-terminal, base, doctest, Glob, lens
+ , mono-traversable, mtl, parsec, semigroups, transformers
+ }:
+ mkDerivation {
+ pname = "pretty-simple";
+ version = "0.2.0.0";
+ sha256 = "f4f9141b0b816ad56918bb92daba2b62295207eb3119afcc3c2baf2ae46bb4d3";
+ libraryHaskellDepends = [
+ ansi-terminal base lens mono-traversable mtl parsec semigroups
+ transformers
+ ];
+ testHaskellDepends = [ base doctest Glob ];
+ homepage = "https://github.com/cdepillabout/pretty-simple";
+ description = "Simple pretty printer for any datatype with a 'Show' instance";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"pretty-sop" = callPackage
({ mkDerivation, base, generics-sop, pretty-show }:
mkDerivation {
@@ -136450,6 +139862,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 {
@@ -136535,6 +139961,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "printcess" = callPackage
+ ({ mkDerivation, base, containers, hspec, HUnit, lens, mtl
+ , QuickCheck, transformers
+ }:
+ mkDerivation {
+ pname = "printcess";
+ version = "0.1.0.2";
+ sha256 = "53907a189318381f5b6d77a15fa36eff274bc1f500f974dba060896d5d7e2418";
+ libraryHaskellDepends = [ base containers lens mtl transformers ];
+ testHaskellDepends = [
+ base containers hspec HUnit lens mtl QuickCheck transformers
+ ];
+ homepage = "https://github.com/m0rphism/printcess/";
+ description = "Pretty printing with indentation, mixfix operators, and automatic line breaks";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"printf-mauke" = callPackage
({ mkDerivation, base, bytestring, containers, data-default
, template-haskell
@@ -136673,6 +140116,8 @@ self: {
pname = "proc";
version = "0.0.9";
sha256 = "8a8e6685d3b917d9db2ccbd55028af49bf0a2a51f27a7dcf7901413230c96c5c";
+ revision = "1";
+ editedCabalFile = "bf249bc625b72139c2e981f4bf0500fc6c7a749c28824c63f62f68cee9fbe028";
libraryHaskellDepends = [
base containers directory filepath process regex-tdfa split strict
xformat
@@ -136695,14 +140140,16 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "process_1_4_2_0" = callPackage
- ({ mkDerivation, base, deepseq, directory, filepath, unix }:
+ "process_1_4_3_0" = callPackage
+ ({ mkDerivation, base, bytestring, deepseq, directory, filepath
+ , unix
+ }:
mkDerivation {
pname = "process";
- version = "1.4.2.0";
- sha256 = "1c2ba524a238e464ae9c22582bea92da2d4c5227e1704a984bb8631dcb562bec";
+ version = "1.4.3.0";
+ sha256 = "5473f4d20a19c3ba448ace7d4d01ec821ad531574c23934fd3c55627f5a7f0eb";
libraryHaskellDepends = [ base deepseq directory filepath unix ];
- testHaskellDepends = [ base ];
+ testHaskellDepends = [ base bytestring directory ];
description = "Process libraries";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -136745,6 +140192,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "process-extras_0_7_1" = callPackage
+ ({ mkDerivation, base, bytestring, data-default, deepseq
+ , generic-deriving, HUnit, ListLike, mtl, process, text
+ }:
+ mkDerivation {
+ pname = "process-extras";
+ version = "0.7.1";
+ sha256 = "d25f6228825960b90f86aba3e49bf27fe1cd2f893b44ccb748c3442aa6bcd30f";
+ libraryHaskellDepends = [
+ base bytestring data-default deepseq generic-deriving ListLike mtl
+ process text
+ ];
+ testHaskellDepends = [ base HUnit ];
+ homepage = "https://github.com/seereason/process-extras";
+ description = "Process extras";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"process-iterio" = callPackage
({ mkDerivation, base, bytestring, cpphs, iterIO, process
, transformers
@@ -137044,6 +140510,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "profiteur_0_4_1_0" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath
+ , js-jquery, text, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "profiteur";
+ version = "0.4.1.0";
+ sha256 = "c9e67c15761d06df8088cdbdfaf56a31f3b7b4c169e5c50418c8cd3a29fd8ef7";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ aeson attoparsec base bytestring filepath js-jquery text
+ unordered-containers vector
+ ];
+ homepage = "http://github.com/jaspervdj/profiteur";
+ description = "Treemap visualiser for GHC prof files";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"profunctor-extras" = callPackage
({ mkDerivation, base, profunctors }:
mkDerivation {
@@ -137397,8 +140883,8 @@ self: {
}:
mkDerivation {
pname = "propellor";
- version = "3.2.1";
- sha256 = "757188dbf42e595e3b2eee8df4b30076ae929df636e83750ae99777612cc0cf2";
+ version = "3.2.3";
+ sha256 = "078b51c15e4dbce6f55cd26eeb82ed6307e3c47661ab6518f421a1c95e60a11a";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -137498,10 +140984,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 ];
@@ -137953,8 +141437,8 @@ self: {
}:
mkDerivation {
pname = "psqueues";
- version = "0.2.2.2";
- sha256 = "97b539c4d9da0f0460cd17153641a647b59eb04fde00ec38ea8b56dd9086423f";
+ version = "0.2.2.3";
+ sha256 = "6d757c30f6fdc8df7ed62601f2b2530e71192109ab94d06dec4176c9c3eea6b5";
libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
testHaskellDepends = [
array base deepseq ghc-prim hashable HUnit QuickCheck tagged
@@ -138013,12 +141497,12 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "publicsuffix_0_20161104" = callPackage
+ "publicsuffix_0_20161206" = callPackage
({ mkDerivation, base, filepath, hspec, template-haskell }:
mkDerivation {
pname = "publicsuffix";
- version = "0.20161104";
- sha256 = "b80360a305ae44f92548195e699751a00df1c812546453c1b415058ac00e24f4";
+ version = "0.20161206";
+ sha256 = "0f6ef27c6e71f62c7f994dff75f53ba46a469da00a688c6428932426e80b2959";
libraryHaskellDepends = [ base filepath template-haskell ];
testHaskellDepends = [ base hspec ];
homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
@@ -138401,19 +141885,19 @@ self: {
}) {};
"pure-zlib" = callPackage
- ({ mkDerivation, base, base-compat, bytestring, bytestring-builder
- , containers, filepath, fingertree, HUnit, monadLib, QuickCheck
- , tasty, tasty-hunit, tasty-quickcheck
+ ({ mkDerivation, array, base, base-compat, bytestring
+ , bytestring-builder, containers, filepath, fingertree, HUnit
+ , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
}:
mkDerivation {
pname = "pure-zlib";
- version = "0.5";
- sha256 = "b7cf6e9d02c9ab7d246651b4a49696448dd35cbd2146ace84ff4a9ea5afc30ab";
+ version = "0.6";
+ sha256 = "ab7814fbef5bfa299d3c9e3f7c614a20d3a2600b85807ee7284e235ada78ebc5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base base-compat bytestring bytestring-builder containers
- fingertree monadLib
+ array base base-compat bytestring bytestring-builder containers
+ fingertree
];
executableHaskellDepends = [ base base-compat bytestring ];
testHaskellDepends = [
@@ -138488,47 +141972,50 @@ 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;
}) {};
- "purescript_0_10_1" = callPackage
- ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal
- , ansi-wl-pprint, base, base-compat, bower-json, boxes, bytestring
- , clock, containers, data-ordlist, directory, dlist, edit-distance
- , file-embed, filepath, fsnotify, Glob, haskeline, hspec
- , hspec-discover, http-client, http-types, HUnit
- , language-javascript, lifted-base, monad-control, monad-logger
- , mtl, network, optparse-applicative, parallel, parsec
- , pattern-arrows, pipes, pipes-http, process, protolude, regex-tdfa
- , safe, semigroups, silently, sourcemap, spdx, split, stm, syb
- , text, time, transformers, transformers-base, transformers-compat
+ "purescript_0_10_3" = callPackage
+ ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty
+ , ansi-terminal, ansi-wl-pprint, base, base-compat, bower-json
+ , boxes, bytestring, clock, containers, data-ordlist, directory
+ , dlist, edit-distance, file-embed, filepath, foldl, fsnotify, Glob
+ , haskeline, hspec, hspec-discover, http-client, http-types, HUnit
+ , language-javascript, lens, lifted-base, monad-control
+ , monad-logger, mtl, network, optparse-applicative, parallel
+ , parsec, pattern-arrows, pipes, pipes-http, process, protolude
+ , regex-tdfa, safe, semigroups, silently, sourcemap, spdx, split
+ , stm, syb, system-filepath, text, time, transformers
+ , transformers-base, transformers-compat, turtle
, unordered-containers, utf8-string, vector, wai, wai-websockets
, warp, websockets
}:
mkDerivation {
pname = "purescript";
- version = "0.10.1";
- sha256 = "954e333a0f7c860941384289de241b683cbdd606c5c71ab300fe7ac7b3573df0";
+ version = "0.10.3";
+ sha256 = "261e2afde8bf1d58a9c9c23296b37b57dfcd47d4f25cc7798a36a6e73978c5c2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-better-errors ansi-terminal base base-compat bower-json
boxes bytestring clock containers data-ordlist directory dlist
edit-distance filepath fsnotify Glob haskeline http-client
- http-types language-javascript lifted-base monad-control
+ http-types language-javascript lens lifted-base monad-control
monad-logger mtl parallel parsec pattern-arrows pipes pipes-http
process protolude regex-tdfa safe semigroups sourcemap spdx split
stm syb text time transformers transformers-base
transformers-compat unordered-containers utf8-string vector
];
executableHaskellDepends = [
- aeson ansi-terminal ansi-wl-pprint base base-compat boxes
- bytestring containers directory file-embed filepath Glob haskeline
- http-types monad-logger mtl network optparse-applicative parsec
- process protolude split stm text time transformers
- transformers-compat utf8-string wai wai-websockets warp websockets
+ aeson aeson-pretty ansi-terminal ansi-wl-pprint base base-compat
+ boxes bytestring containers directory file-embed filepath foldl
+ Glob haskeline http-types monad-logger mtl network
+ optparse-applicative parsec process protolude split stm
+ system-filepath text time transformers transformers-compat turtle
+ utf8-string wai wai-websockets warp websockets
];
testHaskellDepends = [
aeson aeson-better-errors base base-compat boxes bytestring
@@ -138536,6 +142023,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;
@@ -138773,28 +142261,29 @@ self: {
"puzzle-draw" = callPackage
({ mkDerivation, aeson, base, blaze-svg, bytestring, containers
- , deepseq, diagrams-lib, diagrams-svg, filepath, hashable, mtl
- , optparse-applicative, parsec, SVGFonts, tasty, tasty-hunit, text
+ , deepseq, diagrams-lib, diagrams-svg, filepath, hashable, hspec
+ , linear, mtl, optparse-applicative, parsec, process, SVGFonts
+ , tasty, tasty-golden, tasty-hspec, tasty-hunit, text
, unordered-containers, vector-space, yaml
}:
mkDerivation {
pname = "puzzle-draw";
- version = "0.1.0.4";
- sha256 = "118edc89b2a1bcdb9c5ce93c475eeb173709308d25e668875374a69214116c49";
+ version = "0.2.0.0";
+ sha256 = "02dcb3892d34d719fc93ca02168b63fff8ff25a2cb0e926cf74de49b8f5b5113";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base containers diagrams-lib diagrams-svg filepath hashable
- mtl optparse-applicative parsec SVGFonts text unordered-containers
- vector-space yaml
+ linear mtl optparse-applicative parsec SVGFonts text
+ unordered-containers vector-space yaml
];
executableHaskellDepends = [
aeson base diagrams-lib diagrams-svg filepath optparse-applicative
- yaml
+ process tasty tasty-golden yaml
];
testHaskellDepends = [
base blaze-svg bytestring containers deepseq diagrams-lib
- diagrams-svg tasty tasty-hunit text yaml
+ diagrams-svg hspec tasty tasty-hspec tasty-hunit text yaml
];
description = "Creating graphics for pencil puzzles";
license = stdenv.lib.licenses.mit;
@@ -138841,6 +142330,32 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) libdevil;};
+ "pvss" = callPackage
+ ({ mkDerivation, base, binary, bytestring, cryptonite
+ , cryptonite-openssl, deepseq, hourglass, integer-gmp, memory
+ , tasty, tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "pvss";
+ version = "0.1";
+ sha256 = "fa140bcc44158ae54a486668820c6b7c4b767ea702c5e687b064dcd386c0fc99";
+ revision = "1";
+ editedCabalFile = "2d6b823ed5c0e8852c2d91c248b09cabf83409fb71bd473ab15c44b30427dd0e";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base binary bytestring cryptonite cryptonite-openssl deepseq
+ integer-gmp memory
+ ];
+ executableHaskellDepends = [
+ base cryptonite deepseq hourglass memory
+ ];
+ testHaskellDepends = [ base cryptonite tasty tasty-quickcheck ];
+ homepage = "https://github.com/input-output-hk/pvss-haskell#readme";
+ description = "Public Verifiable Secret Sharing";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"pwstore-cli" = callPackage
({ mkDerivation, base, bytestring, cmdargs, HUnit, process
, pwstore-fast, test-framework, test-framework-hunit, text
@@ -139037,6 +142552,47 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) qhull;};
+ "qr-imager" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, cryptonite, directory
+ , haskell-qrencode, jose-jwt, JuicyPixels, lens, vector
+ }:
+ mkDerivation {
+ pname = "qr-imager";
+ version = "0.1.0.1";
+ sha256 = "2936851586f3e63e7e4aa589d06d88cb6968f5e2c5861f71df62a89fc43d7ef9";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring cryptonite directory haskell-qrencode
+ jose-jwt JuicyPixels lens vector
+ ];
+ executableHaskellDepends = [ base bytestring ];
+ homepage = "https://github.com/vmchale/QRImager#readme";
+ description = "Library to generate QR codes from bytestrings and objects";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "qr-repa" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, cryptonite, directory
+ , haskell-qrencode, jose-jwt, lens, repa, repa-devil, vector
+ }:
+ mkDerivation {
+ pname = "qr-repa";
+ version = "0.1.0.0";
+ sha256 = "5e84243d64121ddc9ed8554a5783680abb2a228846744bd64ce36e2c90776d37";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring cryptonite directory haskell-qrencode
+ jose-jwt lens repa repa-devil vector
+ ];
+ executableHaskellDepends = [ base bytestring ];
+ homepage = "https://github.com/vmchale/QRRepa#readme";
+ description = "Library to generate QR codes from bytestrings and objects and scale image files";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"qrcode" = callPackage
({ mkDerivation, array, base, containers, mtl, vector }:
mkDerivation {
@@ -139068,12 +142624,12 @@ self: {
qtc_opengl = null; qtc_script = null; qtc_tools = null;};
"qtah-cpp-qt5" = callPackage
- ({ mkDerivation, base, qtah-generator, qtbase }:
+ ({ mkDerivation, base, process, qtah-generator, qtbase }:
mkDerivation {
pname = "qtah-cpp-qt5";
- version = "0.1.2";
- sha256 = "1a99a2c0c5eb8cb60d162298600ee2bba993ce3224ac412cf9eeec386503e258";
- libraryHaskellDepends = [ base qtah-generator ];
+ version = "0.2.0";
+ sha256 = "d6daf6813855a41d87884cfba1afd21f100aeb5581dbc0edd4148c3a7e77efda";
+ libraryHaskellDepends = [ base process qtah-generator ];
librarySystemDepends = [ qtbase ];
homepage = "http://khumba.net/projects/qtah";
description = "Qt bindings for Haskell - C++ library";
@@ -139087,8 +142643,8 @@ self: {
}:
mkDerivation {
pname = "qtah-examples";
- version = "0.1.2";
- sha256 = "eebe064bfa0b93dd850c127632ca59ffa8f269f886ec7e247ec22530e007b442";
+ version = "0.2.0";
+ sha256 = "a2f8e4b352742f97beae28eae0a5d8adbb939b51654274a7e26e3769b2f5f835";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -139102,18 +142658,18 @@ self: {
"qtah-generator" = callPackage
({ mkDerivation, base, containers, directory, filepath, haskell-src
- , hoppy-generator, hoppy-std, mtl, process
+ , hoppy-generator, hoppy-std, mtl, process, transformers
}:
mkDerivation {
pname = "qtah-generator";
- version = "0.1.2";
- sha256 = "77ef82acf21be83855ad04c40dfe6aa66439eb6f42f58774687c9d4f5f94c56f";
+ version = "0.2.1";
+ sha256 = "e478535736e46ab6e373dc32993ee139043b64bbe05197d8a8fbc674174b2fef";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base ];
executableHaskellDepends = [
base containers directory filepath haskell-src hoppy-generator
- hoppy-std mtl process
+ hoppy-std mtl process transformers
];
doHaddock = false;
homepage = "http://khumba.net/projects/qtah";
@@ -139128,8 +142684,8 @@ self: {
}:
mkDerivation {
pname = "qtah-qt5";
- version = "0.1.2";
- sha256 = "320c98e0d90381f56ce992fea845839bd966e030d6afa066c83123d40c73da5e";
+ version = "0.2.0";
+ sha256 = "8647a34799bb129436c91a566b6d18ca728fd5943bdebbfc12d90871bc16c68a";
libraryHaskellDepends = [
base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator
];
@@ -139659,22 +143215,36 @@ self: {
}) {};
"quickcheck-special" = callPackage
- ({ mkDerivation, base, bytestring, nats, QuickCheck
- , quickcheck-instances, scientific, text
- }:
+ ({ mkDerivation, base, bytestring, QuickCheck, scientific, text }:
mkDerivation {
pname = "quickcheck-special";
- version = "0.1.0.0";
- sha256 = "70883efb33e6b072b016ef2df32c90f30e01c3f015c4095374fdf6451cb60113";
+ version = "0.1.0.2";
+ sha256 = "3938d6992d9c269f0318cf247db4a9f472eb6f1e69d2e249fa8841ba92a19977";
libraryHaskellDepends = [
- base bytestring nats QuickCheck quickcheck-instances scientific
- text
+ base bytestring QuickCheck scientific text
];
homepage = "https://github.com/minad/quickcheck-special#readme";
description = "Edge cases and special values for QuickCheck Arbitrary instances";
license = stdenv.lib.licenses.mit;
}) {};
+ "quickcheck-string-random" = callPackage
+ ({ mkDerivation, base, QuickCheck, string-random, tasty
+ , tasty-quickcheck, text
+ }:
+ mkDerivation {
+ pname = "quickcheck-string-random";
+ version = "0.1.0.0";
+ sha256 = "dec015a4dabc4f6b63926502b11c0882272b1282d341a9d39e69033974d9eb12";
+ libraryHaskellDepends = [ base QuickCheck string-random text ];
+ testHaskellDepends = [
+ base QuickCheck tasty tasty-quickcheck text
+ ];
+ homepage = "https://github.com/hiratara/hs-string-random#readme";
+ description = "Helper to build generators with Text.StringRandom";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"quickcheck-text" = callPackage
({ mkDerivation, base, binary, bytestring, QuickCheck, text }:
mkDerivation {
@@ -139827,16 +143397,14 @@ self: {
"quipper" = callPackage
({ mkDerivation, base, containers, directory, easyrender, mtl
- , process, random, template-haskell, unix
+ , primes, process, random, template-haskell, unix
}:
mkDerivation {
pname = "quipper";
- version = "0.7";
- sha256 = "38d86bce23509ff81a0e2964d9c04107c4cbb8ecf799abfed216cc2192dcc47c";
- revision = "1";
- editedCabalFile = "ed852a0a36ec59cf0c95e5cec2d0bc82e19a0576f75236ee986f7a221a721c7b";
+ version = "0.8.1";
+ sha256 = "69dad741fde6f2fb2d3c9497a93f6c31a90f1150205c2cc11c02455d501a2c8c";
libraryHaskellDepends = [
- base containers directory easyrender mtl process random
+ base containers directory easyrender mtl primes process random
template-haskell unix
];
homepage = "http://www.mathstat.dal.ca/~selinger/quipper/";
@@ -139863,8 +143431,8 @@ self: {
}:
mkDerivation {
pname = "quiver-binary";
- version = "0.1.1.0";
- sha256 = "44e9190ce2a87135e85b98d6843ce74b15710537e7dd56524ecb731181fb162a";
+ version = "0.1.1.1";
+ sha256 = "d9a1b83fc011daa5ecc5f29615aa338f44df78d375d6a9d7d2548b8289115832";
libraryHaskellDepends = [
base binary bytestring quiver quiver-bytestring
];
@@ -139961,8 +143529,8 @@ self: {
}:
mkDerivation {
pname = "quiver-instances";
- version = "0.2.0.0";
- sha256 = "00acef0be95c1aad3a0cc56fa6281a794e9375ba25def925370b9bc77eecd90d";
+ version = "0.2.0.1";
+ sha256 = "4365f1cd79585fbecfd9e3f20be97c6cbe41b70dc543a513eed8e97bc53f2ca3";
libraryHaskellDepends = [
base exceptions quiver resourcet transformers transformers-base
];
@@ -139975,8 +143543,8 @@ self: {
({ mkDerivation, base, hspec, QuickCheck, quiver }:
mkDerivation {
pname = "quiver-interleave";
- version = "0.2.0.1";
- sha256 = "0dbe071064fdffb6995475048afe2531096e4009243fe58fc9bfe6ed31f2dad8";
+ version = "0.2.0.2";
+ sha256 = "4648939ed31c08f22b8c0c9be84e826ba4ce964525ee9cdd25c76d618612beaf";
libraryHaskellDepends = [ base quiver ];
testHaskellDepends = [ base hspec QuickCheck quiver ];
description = "Interleave values from multiple Quivers";
@@ -139992,8 +143560,8 @@ self: {
}:
mkDerivation {
pname = "quiver-sort";
- version = "0.2.0.0";
- sha256 = "78dba51aa22ecc34e7d871d066bd936febcb684dd20679d46ba2cd377399ee0c";
+ version = "0.2.0.1";
+ sha256 = "0d181443faa5b577b6f2483af3a51bb1572ea4f5d81000d78ceddd480c51a961";
libraryHaskellDepends = [
base containers directory exceptions quiver quiver-binary
quiver-bytestring quiver-groups quiver-instances quiver-interleave
@@ -140301,6 +143869,38 @@ self: {
license = "LGPL";
}) {};
+ "raketka" = callPackage
+ ({ mkDerivation, aeson, async, base, binary, bytestring, conf-json
+ , containers, distributed-process
+ , distributed-process-simplelocalnet, hspec, network
+ , network-transport, network-transport-tcp, QuickCheck, random, stm
+ , tagged, template-haskell
+ }:
+ mkDerivation {
+ pname = "raketka";
+ version = "1.1.1";
+ sha256 = "00de213d145e568d11272776d9c394339aee1b28358995cffb606056bf3c1572";
+ revision = "1";
+ editedCabalFile = "5f63d0731a5172a670fd30076cd7081a63c0237dd940a2d7938a12c6c1fdbea9";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson async base binary conf-json containers distributed-process
+ distributed-process-simplelocalnet network network-transport
+ network-transport-tcp random stm tagged template-haskell
+ ];
+ executableHaskellDepends = [
+ aeson async base binary bytestring conf-json containers
+ distributed-process distributed-process-simplelocalnet network
+ network-transport network-transport-tcp random stm tagged
+ template-haskell
+ ];
+ testHaskellDepends = [ base hspec QuickCheck ];
+ homepage = "https://github.com/ciez/raketka";
+ description = "distributed-process node";
+ license = stdenv.lib.licenses.publicDomain;
+ }) {};
+
"rakhana" = callPackage
({ mkDerivation, attoparsec, base, bytestring, containers, lens
, mtl, pipes, scientific, transformers, vector, zlib
@@ -140826,7 +144426,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
@@ -140834,8 +144434,8 @@ self: {
}:
mkDerivation {
pname = "rasterific-svg";
- version = "0.3.2";
- sha256 = "ab43e8e6d2800f88becc1c619691ce7b2b63f35ce6007a904c5119b8c1711d23";
+ version = "0.3.2.1";
+ sha256 = "717e87ea679f5fda726bfbbdbfafa40305bece2cce5ad137027e26eaeb57afdf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -140926,24 +144526,22 @@ self: {
"rattletrap" = callPackage
({ mkDerivation, aeson, aeson-casing, base, bimap, binary
, binary-bits, bytestring, containers, data-binary-ieee754
- , filepath, hlint, tasty, tasty-hspec, template-haskell, text
+ , filepath, tasty, tasty-hspec, template-haskell, temporary, text
, vector
}:
mkDerivation {
pname = "rattletrap";
- version = "0.2.0";
- sha256 = "874bb97133deed106534ab4a8b387d3bb14a7ad89504a9e2767301491bc3c077";
+ version = "2.1.0";
+ sha256 = "d969cf852a2210f11a51f21b75f3c16a47a0dc92b695a6ae11c9287ddfe30588";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bimap binary binary-bits bytestring containers
- data-binary-ieee754 text vector
- ];
- executableHaskellDepends = [
- aeson aeson-casing base binary bytestring template-haskell
+ aeson aeson-casing base bimap binary binary-bits bytestring
+ containers data-binary-ieee754 template-haskell text vector
];
+ executableHaskellDepends = [ base ];
testHaskellDepends = [
- base binary bytestring filepath hlint tasty tasty-hspec
+ base bytestring filepath tasty tasty-hspec temporary
];
homepage = "https://github.com/tfausak/rattletrap#readme";
description = "Parse and generate Rocket League replays";
@@ -140996,8 +144594,10 @@ self: {
}:
mkDerivation {
pname = "raw-feldspar";
- version = "0.1";
- sha256 = "e1c3a65925f763519ef55d893b38c859db3a5386c6a8007e08dc941bc521f357";
+ version = "0.2.1";
+ sha256 = "7c188b8ffca38e8f63cfbff3555c8a8d29265262ada77c6e914c2e73859958fc";
+ revision = "1";
+ editedCabalFile = "193a7ca804a40c8b27c2962e39b914933ef7e69c6d1fb1aee7bbf954121df6f8";
libraryHaskellDepends = [
array base constraints containers data-default-class data-hash
imperative-edsl language-c-quote mtl operational-alacarte
@@ -141061,10 +144661,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";
@@ -141285,8 +144883,8 @@ self: {
({ mkDerivation, aeson, base, react-flux, servant, text }:
mkDerivation {
pname = "react-flux-servant";
- version = "0.1.0";
- sha256 = "9dac8c127094cb3ddfded25f5b79f2da46f3f8cd5e6aa58c552b55d341ced901";
+ version = "0.1.1";
+ sha256 = "04931915c2a2afa50effe3e40d4c61dc6e9e6c7c0f7eb834670b9de6054c389c";
libraryHaskellDepends = [ aeson base react-flux servant text ];
homepage = "https://bitbucket.org/wuzzeb/react-flux-servant";
description = "Allow react-flux stores to send requests to a servant server";
@@ -141385,8 +144983,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
@@ -141546,8 +145144,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
@@ -141566,8 +145164,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
@@ -141807,17 +145405,17 @@ self: {
({ mkDerivation, base, base-prelude, bifunctors, bytestring
, containers, contravariant, contravariant-extras, deepseq, dlist
, either, fail, hashable, mtl, profunctors, scientific
- , semigroupoids, semigroups, text, time, transformers
+ , semigroupoids, semigroups, stm, text, time, transformers
, unordered-containers, uuid, vector, void
}:
mkDerivation {
pname = "rebase";
- version = "1.0.2.1";
- sha256 = "beae3eb88c71e817ebfde0b16ce17875f33cefc1371c3e4c72f5a5feb1c2a69e";
+ version = "1.0.6";
+ sha256 = "dcf4217ab3f089a8934808af88d95e6d8e57bd57fac3cce54d8b048232abfa01";
libraryHaskellDepends = [
base base-prelude bifunctors bytestring containers contravariant
contravariant-extras deepseq dlist either fail hashable mtl
- profunctors scientific semigroupoids semigroups text time
+ profunctors scientific semigroupoids semigroups stm text time
transformers unordered-containers uuid vector void
];
homepage = "https://github.com/nikita-volkov/rebase";
@@ -141825,6 +145423,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 {
@@ -141972,16 +145582,19 @@ self: {
}) {};
"recursion-schemes" = callPackage
- ({ mkDerivation, base, bifunctors, comonad, free, transformers
+ ({ mkDerivation, base, base-orphans, bifunctors, comonad, free
+ , HUnit, semigroups, template-haskell, transformers
, transformers-compat
}:
mkDerivation {
pname = "recursion-schemes";
- version = "5";
- sha256 = "c6d298c2e59e2143e833d21dd82613510df55f18000b19264c68d253dfa709fc";
+ version = "5.0.1";
+ sha256 = "b7a97c72fd7edc2d85060626a1f7e3c56756868aec43510dfe41c1e1fa43ff03";
libraryHaskellDepends = [
- base bifunctors comonad free transformers transformers-compat
+ base base-orphans bifunctors comonad free semigroups
+ template-haskell transformers transformers-compat
];
+ testHaskellDepends = [ base HUnit ];
homepage = "http://github.com/ekmett/recursion-schemes/";
description = "Generalized bananas, lenses and barbed wire";
license = stdenv.lib.licenses.bsd3;
@@ -142162,6 +145775,33 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
+ "reduce-equations" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, directory
+ , haskell-src-exts, MissingH, mtl, QuickCheck, quickspec
+ , stringable, tasty, tasty-quickcheck, text, transformers
+ }:
+ mkDerivation {
+ pname = "reduce-equations";
+ version = "0.1.1.0";
+ sha256 = "255b5757a180d042c96d55a4fc165796801b83217cebb4237a30685b68ab57ad";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring containers haskell-src-exts mtl QuickCheck
+ quickspec stringable text transformers
+ ];
+ executableHaskellDepends = [ aeson base ];
+ testHaskellDepends = [
+ aeson base bytestring containers directory haskell-src-exts
+ MissingH QuickCheck quickspec stringable tasty tasty-quickcheck
+ text
+ ];
+ 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
({ mkDerivation, array, base, bytestring, containers, fingertree
, hashable, semigroupoids, semigroups, text, transformers
@@ -142808,23 +146448,24 @@ self: {
"regex-do" = callPackage
({ mkDerivation, array, base, bytestring, hspec, QuickCheck
- , regex-base, regex-pcre, stringsearch, text
+ , regex-base, regex-pcre, stringsearch, tagged, text
}:
mkDerivation {
pname = "regex-do";
- version = "1.1";
- sha256 = "655a035f10fdb6a9db733d28a63b4f8a943224c14c3811779539112796689edc";
- revision = "1";
- editedCabalFile = "407ea11d3fe9a9307983b11124fab217db7d02bf36498b4953b1cf8e25323f77";
+ version = "3.1";
+ sha256 = "487ab5968208a0d7ad7b37016145e4a864dc35ae36976ea77328ae3d6b9d590b";
+ revision = "3";
+ editedCabalFile = "ca32ec1c90923370783cfe79bbdae877f4f98f8e816a32dde618874842c2f178";
libraryHaskellDepends = [
- array base bytestring regex-base regex-pcre stringsearch text
+ array base bytestring regex-base regex-pcre stringsearch tagged
+ text
];
testHaskellDepends = [
array base bytestring hspec QuickCheck regex-base regex-pcre
- stringsearch text
+ stringsearch tagged text
];
homepage = "https://github.com/ciez/regex-do";
- description = "PCRE regex wrapper functions";
+ description = "PCRE wrapper";
license = stdenv.lib.licenses.publicDomain;
}) {};
@@ -143406,8 +147047,8 @@ self: {
}:
mkDerivation {
pname = "rei";
- version = "0.4.0.1";
- sha256 = "108fcfa34f91486946a25d5a1df58e8d2bb6930c852ea8ae4dc5ff81d882ed75";
+ version = "0.4.0.3";
+ sha256 = "195fc1c1a1cff8665d61d8fdd768a72949a4531a41c182e791f5e4824a5000c6";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -144350,6 +147991,56 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "req" = callPackage
+ ({ mkDerivation, aeson, base, blaze-builder, bytestring
+ , case-insensitive, connection, data-default-class, hspec
+ , hspec-core, http-api-data, http-client, http-client-tls
+ , http-types, mtl, QuickCheck, text, time, transformers
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "req";
+ version = "0.1.0";
+ sha256 = "c93bae94d0b640f0d459a3da79c6021f7d8403099e9f08c35a2cddf64eea2269";
+ revision = "1";
+ editedCabalFile = "03f0eb9f9ae76f17e56ff02d4e1f42769c323183497c81f0c0cb2c721e0eed2f";
+ libraryHaskellDepends = [
+ aeson base blaze-builder bytestring case-insensitive connection
+ data-default-class http-api-data http-client http-client-tls
+ http-types mtl text time transformers
+ ];
+ testHaskellDepends = [
+ aeson base blaze-builder bytestring case-insensitive
+ data-default-class hspec hspec-core http-client http-types mtl
+ QuickCheck text time unordered-containers
+ ];
+ 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
+ ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec
+ , http-client, req, resourcet, temporary, transformers
+ }:
+ mkDerivation {
+ pname = "req-conduit";
+ version = "0.1.0";
+ sha256 = "689a8592555b39859ab0d2e50b111217112d51077553dc7103d84afc865ca447";
+ libraryHaskellDepends = [
+ base bytestring conduit http-client req resourcet transformers
+ ];
+ testHaskellDepends = [
+ base bytestring conduit conduit-extra hspec req resourcet temporary
+ transformers
+ ];
+ 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
({ mkDerivation, base, http-client, http-types, HUnit, lens
, network, tasty, tasty-hunit, text, wai, warp, wreq
@@ -144381,6 +148072,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "rerebase" = callPackage
+ ({ mkDerivation, rebase }:
+ mkDerivation {
+ pname = "rerebase";
+ version = "1.0.1.1";
+ sha256 = "44b023de5749713d04d43342dc94ca6562fc0e827e53ac3a8f1e62500b60463b";
+ libraryHaskellDepends = [ rebase ];
+ homepage = "https://github.com/nikita-volkov/rerebase";
+ description = "Reexports from \"base\" with a bunch of other standard libraries";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"reroute" = callPackage
({ mkDerivation, base, deepseq, hashable, hspec, hvect, mtl
, path-pieces, text, unordered-containers, vector
@@ -144460,6 +148163,26 @@ self: {
license = stdenv.lib.licenses.gpl2;
}) {};
+ "resolve-trivial-conflicts_0_3_2_4" = callPackage
+ ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory
+ , filepath, mtl, optparse-applicative, process, unix
+ }:
+ mkDerivation {
+ pname = "resolve-trivial-conflicts";
+ version = "0.3.2.4";
+ sha256 = "62c38ac7859b1f2201e0e79dbfc5d3446b4fb2fd4164cef8c016093f79ae2221";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ ansi-terminal base base-compat Diff directory filepath mtl
+ optparse-applicative process unix
+ ];
+ homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts";
+ description = "Remove trivial conflict markers in a git repository";
+ license = stdenv.lib.licenses.gpl2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"resource-effect" = callPackage
({ mkDerivation, base, containers, extensible-effects, HUnit, mtl
, QuickCheck, test-framework, test-framework-hunit
@@ -144570,8 +148293,8 @@ self: {
}:
mkDerivation {
pname = "resourcet";
- version = "1.1.8";
- sha256 = "b36c9900ef4d330281b413684bcf13b53036303187dc3ca0f0d83b56152c5c4b";
+ version = "1.1.8.1";
+ sha256 = "833a3104a554bda7c434c38a8a63992e8b456f057fa8ec6d039e6abe28715527";
libraryHaskellDepends = [
base containers exceptions lifted-base mmorph monad-control mtl
transformers transformers-base transformers-compat
@@ -144582,6 +148305,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "resourcet_1_1_9" = callPackage
+ ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
+ , mmorph, monad-control, mtl, transformers, transformers-base
+ , transformers-compat
+ }:
+ mkDerivation {
+ pname = "resourcet";
+ version = "1.1.9";
+ sha256 = "5a1999d26b896603cab8121b77f36723dc50960291872b691ff4a9533e162ef5";
+ libraryHaskellDepends = [
+ base containers exceptions lifted-base mmorph monad-control mtl
+ transformers transformers-base transformers-compat
+ ];
+ testHaskellDepends = [ base hspec lifted-base transformers ];
+ homepage = "http://github.com/snoyberg/conduit";
+ description = "Deterministic allocation and freeing of scarce resources";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"respond" = callPackage
({ mkDerivation, aeson, base, bifunctors, bytestring, containers
, data-default-class, exceptions, fast-logger, formatting, HList
@@ -144645,8 +148388,8 @@ self: {
pname = "rest-core";
version = "0.39";
sha256 = "d760d0547fc1a99cd949dde08b7945fb93af24f4e55d45ecf410c352d5005404";
- revision = "2";
- editedCabalFile = "62fec3ffbc0dfaf26d82ad0689dfe74384f2e565ec0c2bff897cd4c71be74583";
+ revision = "3";
+ editedCabalFile = "3b6cf8a675a2bf1f3e22fcf1a39e1658ce112e21b918ad28ace73cdf5dc70aa2";
libraryHaskellDepends = [
aeson aeson-utils base base-compat bytestring case-insensitive
errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat
@@ -144726,8 +148469,8 @@ self: {
pname = "rest-gen";
version = "0.20.0.0";
sha256 = "81a9486136f91773371858f9d3e248b80458e7d55aab11f17cc158c3ce68d542";
- revision = "1";
- editedCabalFile = "32caced8ad0a5273fc9c13ae65f75a37b790ad430d3923febf567616f5eb8e95";
+ revision = "3";
+ editedCabalFile = "b1de24d30b40005298357ecadb54055f9842d8c1e3673feeb453a067a9f9a812";
libraryHaskellDepends = [
aeson base base-compat blaze-html Cabal code-builder directory
fclabels filepath hashable haskell-src-exts HStringTemplate hxt
@@ -145003,8 +148746,8 @@ self: {
}:
mkDerivation {
pname = "retry";
- version = "0.7.4.1";
- sha256 = "d2791b0ea317655c3d5a5d9d1d443eeb66a31953e0a66ac7a510050c54d83fab";
+ version = "0.7.4.2";
+ sha256 = "521b392570b37b17ac8aaea2586a0a16a578f56b9cd0bbf69813b35f7ed2b47c";
libraryHaskellDepends = [
base data-default-class exceptions ghc-prim random transformers
];
@@ -145419,6 +149162,21 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "riscv-isa" = callPackage
+ ({ mkDerivation, base, hspec, mtl, QuickCheck }:
+ mkDerivation {
+ pname = "riscv-isa";
+ version = "0.1.0.0";
+ sha256 = "6a88e07161d0a3bd97cccf3e1d4a88063b09c22e843d6bd7a9af4389849f891a";
+ revision = "1";
+ editedCabalFile = "f998732d08cb67e2d7b6f80b6f9240caedc65e4297d1d90ca87758e78a247e73";
+ libraryHaskellDepends = [ base mtl QuickCheck ];
+ testHaskellDepends = [ base hspec QuickCheck ];
+ homepage = "https://github.com/cocreature/riscv-isa#readme";
+ description = "Haskell representation of the RISC-V instruction set architecture";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"rison" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, hspec
, scientific, text, unordered-containers, vector
@@ -146072,6 +149830,7 @@ self: {
homepage = "https://github.com/RoboticsHS/rosmsg-bin#readme";
description = "ROS message management tools";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"rospkg" = callPackage
@@ -146135,6 +149894,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "rotating-log_0_4_2" = callPackage
+ ({ mkDerivation, base, bytestring, directory, filepath, old-locale
+ , time, time-locale-compat
+ }:
+ mkDerivation {
+ pname = "rotating-log";
+ version = "0.4.2";
+ sha256 = "6ef0ae7ecb9e30387b4088edc173fbb90b8c8b7514f9f7b8b6d92f7d95f754ec";
+ libraryHaskellDepends = [
+ base bytestring directory filepath old-locale time
+ time-locale-compat
+ ];
+ testHaskellDepends = [
+ base bytestring directory filepath time time-locale-compat
+ ];
+ homepage = "http://github.com/Soostone/rotating-log";
+ description = "Size-limited, concurrent, automatically-rotating log writer";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"roundRobin" = callPackage
({ mkDerivation, base, QuickCheck, semigroups, tasty
, tasty-quickcheck
@@ -146426,8 +150206,8 @@ self: {
}:
mkDerivation {
pname = "rss";
- version = "3000.2.0.5";
- sha256 = "6155b9c686b026f0cb7be13f99d2555db06c8c57cf2563d798cb30553137b979";
+ version = "3000.2.0.6";
+ sha256 = "8de46fea948323030528367dfa2e5a81640d656a1c00d674377c809462fd990d";
libraryHaskellDepends = [
base HaXml network network-uri old-locale time
];
@@ -146693,10 +150473,10 @@ self: {
({ mkDerivation, array, base, mtl, parsec, safe, strict, Vec }:
mkDerivation {
pname = "ruff";
- version = "0.4";
- sha256 = "d4effe4cfe26b2ebfb486e7d68f1027aaa3b11d04277d18eb64d2e566e18f225";
+ version = "0.4.0.1";
+ sha256 = "e557e74593e1ab0fc35447f4f8d5cddc2af7c151655cc2c5ae1672fcddcda3c5";
libraryHaskellDepends = [ array base mtl parsec safe strict Vec ];
- homepage = "https://gitorious.org/ruff";
+ homepage = "http://code.mathr.co.uk/ruff";
description = "relatively useful fractal functions";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -146803,6 +150583,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "runtime-arbitrary" = callPackage
+ ({ mkDerivation, base, ifcxt, QuickCheck, template-haskell }:
+ mkDerivation {
+ pname = "runtime-arbitrary";
+ version = "0.1.0.6";
+ sha256 = "012e31cb21f0a057aa8a08c71834d0a5fff52c9742064fea956cd54d4e6069d1";
+ libraryHaskellDepends = [ base ifcxt QuickCheck template-haskell ];
+ 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
({ mkDerivation, base, MonadPrompt, mtl, random-source
, transformers
@@ -146886,8 +150679,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "safe";
- version = "0.3.9";
- sha256 = "d0319ea7b55947e70092f0256aa9f9d2496a93b0e2a0887c0f8eaa0d7fb9b6c9";
+ version = "0.3.10";
+ sha256 = "da724ad9cf4b424c4881a50439c3b13777f477e3301c068ce7d54e9031e14b9a";
libraryHaskellDepends = [ base ];
homepage = "https://github.com/ndmitchell/safe#readme";
description = "Library of safe (exception free) functions";
@@ -146898,8 +150691,8 @@ self: {
({ mkDerivation, base, mtl, transformers }:
mkDerivation {
pname = "safe-access";
- version = "0.3.0.0";
- sha256 = "1eddd50993f6ed86041dbc2f543263eb6261d5d34d3128beb416a44cb8d59215";
+ version = "0.3.1.0";
+ sha256 = "936ddafc0664e4b62f11ebb6b2c3169f06c67e107a0d8f05e27896940eb4bf9f";
libraryHaskellDepends = [ base mtl transformers ];
homepage = "http://darcs.redspline.com/safe-access";
description = "A simple environment to control access to data";
@@ -147362,6 +151155,8 @@ self: {
pname = "sampling";
version = "0.2.0";
sha256 = "0300849bb9b276455397df71fcf061e1db8563045af176f04a2ad31dd333295a";
+ revision = "1";
+ editedCabalFile = "705929c9a629db8150478fd996315889fb8e5ab16dd584bc969727d6cc7e25b1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base foldl mwc-random primitive vector ];
@@ -147371,6 +151166,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "sampling_0_3_1" = callPackage
+ ({ mkDerivation, base, containers, foldl, mwc-random, primitive
+ , vector
+ }:
+ mkDerivation {
+ pname = "sampling";
+ version = "0.3.1";
+ sha256 = "0bc2557dd64e4a933c9c6abab083e57b52508236c94d2151fd6890acc54e691b";
+ libraryHaskellDepends = [
+ base containers foldl mwc-random primitive vector
+ ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/jtobin/sampling";
+ description = "Sample values from collections";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"samtools" = callPackage
({ mkDerivation, base, bytestring, c2hs, seqloc, vector, zlib }:
mkDerivation {
@@ -147682,6 +151495,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
@@ -147692,8 +151520,8 @@ self: {
}:
mkDerivation {
pname = "sbp";
- version = "1.2.8";
- sha256 = "b7e68ecae34b6437ece2f340f1260123fa384828e362371a1035620ab8c1ae09";
+ version = "2.1.3";
+ sha256 = "1feff9aa39dc4bd34de1cb0da5fcf105429aafa1e28c97cfff19a44403c79951";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -148112,6 +151940,19 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "schema" = callPackage
+ ({ mkDerivation, base, hspec, QuickCheck }:
+ mkDerivation {
+ pname = "schema";
+ version = "0.0.1";
+ sha256 = "27466a6eaa757f9f3d2556cff139f64c27e5eb9ff81627fa118467607b92a70c";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base hspec QuickCheck ];
+ homepage = "https://toktok.github.io/";
+ description = "Encoding-independent schemas for Haskell data types";
+ license = stdenv.lib.licenses.agpl3;
+ }) {};
+
"scholdoc" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, binary, blaze-html
, blaze-markup, bytestring, containers, data-default, Diff
@@ -148543,6 +152384,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "scotty-format" = callPackage
+ ({ mkDerivation, aeson, base, http-media, http-types, scotty, text
+ }:
+ mkDerivation {
+ pname = "scotty-format";
+ version = "0.1.0.2";
+ sha256 = "848a326a18445c1c7f39a7aa5a46d3f042c2e9abfd1ef8f972751f51b4c00968";
+ revision = "1";
+ editedCabalFile = "64c796f66dd445224f06820feec9d91717a1de9d2d24d993d5db1d6021240d32";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base http-media http-types scotty text ];
+ executableHaskellDepends = [ aeson base scotty text ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/potomak/scotty-format#readme";
+ description = "Response format helper for the Scotty web framework";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"scotty-hastache" = callPackage
({ mkDerivation, base, containers, filepath, hastache, http-types
, mtl, scotty, text, wai, warp
@@ -149435,8 +153295,8 @@ self: {
}:
mkDerivation {
pname = "semdoc";
- version = "0.1.1";
- sha256 = "05a2a838a25125bf8d8cf9f696f3745486e5d1d2c8a778b16c54a746b970882a";
+ version = "0.1.2";
+ sha256 = "b9a2c73fa5bd0346ae9b21e5ee158460689bf521f97996418b0d426c334b3dc8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -149574,8 +153434,8 @@ self: {
({ mkDerivation, base, containers, doctest, smallcheck }:
mkDerivation {
pname = "semiring-num";
- version = "0.3.0.0";
- sha256 = "75178637123f1d7bcef23346065aae3a4d57ac4a0aba7ad8fb9f78c98f0f08ec";
+ version = "0.5.4.0";
+ sha256 = "f96f42f4cb9bc0c34f4cc0e41178ad23c60fd4f5ff6f1059df5d352df54564e5";
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [ base containers doctest smallcheck ];
homepage = "https://github.com/oisdk/semiring-num";
@@ -149828,8 +153688,8 @@ self: {
({ mkDerivation, base, mtl, transformers }:
mkDerivation {
pname = "seqid";
- version = "0.5.0";
- sha256 = "54d4602699b9e3a59d9fbe27258005ee877f0871b4d285e25336231e43953c15";
+ version = "0.5.1";
+ sha256 = "cea36ce861a457efe5854b3ae9ffef9fc95ea32f14c34e577e5e3d84a5f86695";
libraryHaskellDepends = [ base mtl transformers ];
homepage = "https://github.com/LukeHoersten/seqid";
description = "Sequence ID production and consumption";
@@ -150061,24 +153921,25 @@ self: {
, base16-bytestring, base64-bytestring, binary, binary-orphans
, bytestring, cereal, cereal-vector, clock, containers
, data-msgpack, deepseq, directory, either, exceptions, extra
- , filepath, formatting, hashable, hspec, lens, mtl
+ , filepath, formatting, hashable, hspec, lens, monad-control, mtl
, optparse-applicative, parsec, QuickCheck, quickcheck-instances
- , safecopy, scientific, semigroups, template-haskell, text
+ , safecopy, scientific, semigroups, stm, template-haskell, text
, text-format, time-units, transformers, unordered-containers
, vector, yaml
}:
mkDerivation {
pname = "serokell-util";
- version = "0.1.1.1";
- sha256 = "8411ea10fcff87ce1d2fbe177cf2b3d6d254dc66cded2f49867daeed8334e427";
+ version = "0.1.2.3";
+ sha256 = "f30880e753f8c7e258906ab0a83f15f23b4ae90cd3bbba02719556421dc97f0a";
libraryHaskellDepends = [
acid-state aeson aeson-extra base base16-bytestring
base64-bytestring binary binary-orphans bytestring cereal
cereal-vector clock containers data-msgpack deepseq directory
- either exceptions extra filepath formatting hashable lens mtl
- optparse-applicative parsec QuickCheck quickcheck-instances
- safecopy scientific semigroups template-haskell text text-format
- time-units transformers unordered-containers vector yaml
+ either exceptions extra filepath formatting hashable lens
+ monad-control mtl optparse-applicative parsec QuickCheck
+ quickcheck-instances safecopy scientific semigroups stm
+ template-haskell text text-format time-units transformers
+ unordered-containers vector yaml
];
testHaskellDepends = [
aeson base binary bytestring cereal data-msgpack hspec QuickCheck
@@ -150258,8 +154119,8 @@ self: {
({ mkDerivation, base, doctest, Glob, hspec, QuickCheck, yaml }:
mkDerivation {
pname = "servant-auth";
- version = "0.2.0.0";
- sha256 = "5743a4ac6da19e77c13d0ce02e95eff196932f789ae1bf73a711a1b2f0ed545c";
+ version = "0.2.1.0";
+ sha256 = "31c963fa9dcc39431d45edb0f859771cba74f0dc6229258205fac99f0572fb4a";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest Glob hspec QuickCheck yaml ];
homepage = "http://github.com/plow-technologies/servant-auth#readme";
@@ -150276,8 +154137,8 @@ self: {
}:
mkDerivation {
pname = "servant-auth-client";
- version = "0.2.0.0";
- sha256 = "276fe75aefe7686729883186125a7931ed07a8a593fb59aeea1a71b8461a46f2";
+ version = "0.2.1.0";
+ sha256 = "61afe42548bf696d2a2d2ad89b6284a40c192a30bc9201f0f49529cd90d556fe";
libraryHaskellDepends = [
base bytestring servant servant-auth servant-client text
];
@@ -150356,8 +154217,8 @@ self: {
}:
mkDerivation {
pname = "servant-auth-docs";
- version = "0.2.0.0";
- sha256 = "8a4c47b9804b1d9d60304247d66315ae3d789597d979570e4783a161bc84ced9";
+ version = "0.2.1.0";
+ sha256 = "0bdce6889b1caf64e6b1ecbf565fb5201d32689c576bb3701cde671fbad8e3a1";
libraryHaskellDepends = [
base lens servant servant-auth servant-docs text
];
@@ -150409,36 +154270,38 @@ self: {
"servant-auth-server" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
- , bytestring, case-insensitive, cookie, crypto-api
- , data-default-class, entropy, hspec, http-api-data, http-client
- , http-types, jose, lens, lens-aeson, markdown-unlit, monad-time
- , mtl, QuickCheck, servant-auth, servant-server, text, time
- , transformers, unordered-containers, wai, warp, wreq
+ , bytestring, bytestring-conversion, case-insensitive, cookie
+ , crypto-api, data-default-class, entropy, hspec, http-api-data
+ , http-client, http-types, jose, lens, lens-aeson, markdown-unlit
+ , monad-time, mtl, QuickCheck, servant-auth, servant-server, text
+ , time, transformers, unordered-containers, wai, warp, wreq
}:
mkDerivation {
pname = "servant-auth-server";
- version = "0.2.0.0";
- sha256 = "e021d5fc4983eddd145fcb95e7f317534b7742fdf164b43d6735cbfe1412aa61";
+ version = "0.2.1.0";
+ sha256 = "0f9e848300a916de0892c55a8b530a02d3fc8bcbc7983012780355a88e266c84";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base base64-bytestring blaze-builder bytestring
- case-insensitive cookie crypto-api data-default-class entropy
- http-api-data jose lens monad-time mtl servant-auth servant-server
- text time unordered-containers wai
+ bytestring-conversion case-insensitive cookie crypto-api
+ data-default-class entropy http-api-data jose lens monad-time mtl
+ servant-auth servant-server text time unordered-containers wai
];
executableHaskellDepends = [
aeson base base64-bytestring blaze-builder bytestring
- case-insensitive cookie crypto-api data-default-class entropy
- http-api-data jose lens markdown-unlit monad-time mtl servant-auth
- servant-server text time transformers unordered-containers wai warp
+ bytestring-conversion case-insensitive cookie crypto-api
+ data-default-class entropy http-api-data jose lens markdown-unlit
+ monad-time mtl servant-auth servant-server text time transformers
+ unordered-containers wai warp
];
testHaskellDepends = [
aeson base base64-bytestring blaze-builder bytestring
- case-insensitive cookie crypto-api data-default-class entropy hspec
- http-api-data http-client http-types jose lens lens-aeson
- monad-time mtl QuickCheck servant-auth servant-server text time
- unordered-containers wai warp wreq
+ bytestring-conversion case-insensitive cookie crypto-api
+ data-default-class entropy hspec http-api-data http-client
+ http-types jose lens lens-aeson monad-time mtl QuickCheck
+ servant-auth servant-server text time unordered-containers wai warp
+ wreq
];
homepage = "http://github.com/plow-technologies/servant-auth#readme";
description = "servant-server/servant-auth compatibility";
@@ -150710,18 +154573,20 @@ self: {
}) {};
"servant-elm" = callPackage
- ({ mkDerivation, aeson, base, data-default, elm-export, hspec, lens
- , servant, servant-foreign, text
+ ({ mkDerivation, aeson, base, data-default, Diff, directory
+ , elm-export, hspec, HUnit, interpolate, lens, mockery, process
+ , servant, servant-foreign, text, wl-pprint-text
}:
mkDerivation {
pname = "servant-elm";
- version = "0.1.0.2";
- sha256 = "ee5de357b7c835eb68115de8cfcacb81dd83944916afec87c52ff92606c8dbda";
+ version = "0.3.0.0";
+ sha256 = "fc502005a21cb91845c069366f60ddfa77deeb95cb6571bcd2df172e5285439b";
libraryHaskellDepends = [
- base elm-export lens servant servant-foreign text
+ base elm-export lens servant servant-foreign text wl-pprint-text
];
testHaskellDepends = [
- aeson base data-default elm-export hspec servant
+ aeson base data-default Diff directory elm-export hspec HUnit
+ interpolate mockery process servant text
];
homepage = "http://github.com/mattjbray/servant-elm#readme";
description = "Automatically derive Elm functions to query servant webservices";
@@ -151266,8 +155131,8 @@ self: {
}:
mkDerivation {
pname = "servant-snap";
- version = "0.7.0.2";
- sha256 = "0461cc7635c72f2c75770f029811a1c1e72f3245bc4be2fd1beaaee1cd84759b";
+ version = "0.7.0.5";
+ sha256 = "4a92e5a97f025541914cbd48266a7498af2ba25e467c13c4abfab4b8d36144f1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -151378,6 +155243,35 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "servant-swagger-ui_0_2_1_2_2_8" = callPackage
+ ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring
+ , directory, file-embed, filepath, http-media, lens, servant
+ , servant-blaze, servant-server, servant-swagger, swagger2
+ , template-haskell, text, transformers, transformers-compat, wai
+ , wai-app-static, warp
+ }:
+ mkDerivation {
+ pname = "servant-swagger-ui";
+ version = "0.2.1.2.2.8";
+ sha256 = "21a25df5c3527a859a14ae2edf12116d8634e7be1587357f4545f31fc5acb3a4";
+ libraryHaskellDepends = [
+ base blaze-markup bytestring directory file-embed filepath
+ http-media servant servant-blaze servant-server servant-swagger
+ swagger2 template-haskell text transformers transformers-compat
+ wai-app-static
+ ];
+ testHaskellDepends = [
+ aeson base base-compat blaze-markup bytestring directory file-embed
+ filepath http-media lens servant servant-blaze servant-server
+ servant-swagger swagger2 template-haskell text transformers
+ transformers-compat wai wai-app-static warp
+ ];
+ homepage = "https://github.com/phadej/servant-swagger-ui#readme";
+ description = "Servant swagger ui";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-yaml" = callPackage
({ mkDerivation, aeson, base, base-compat, bytestring, http-media
, servant, servant-server, wai, warp, yaml
@@ -151698,8 +155592,8 @@ self: {
}:
mkDerivation {
pname = "setdown";
- version = "0.1.0.1";
- sha256 = "afe89e857793e3189b1fde9372a33fb3edff9c1c82ccc5d2a8b67a74c3620780";
+ version = "0.1.0.3";
+ sha256 = "c41ded101e6bd0bb17106674f49c0a4a06e8a042dcce443cd772e959c6bd98e4";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -151899,8 +155793,8 @@ self: {
({ mkDerivation, base, bytestring, template-haskell, text }:
mkDerivation {
pname = "sext";
- version = "0.1.0.2";
- sha256 = "b5101154373eac70dee9d56854333ea33735a88b7697f2877846c746dd048c3a";
+ version = "0.1.1";
+ sha256 = "d954401c7c416ff8d6c8783c074c061f8268fb0042d553253afd82881284151d";
libraryHaskellDepends = [ base bytestring template-haskell text ];
homepage = "http://github.com/dzhus/sext/";
description = "Lists, Texts and ByteStrings with type-encoded length";
@@ -152121,6 +156015,8 @@ self: {
pname = "shake";
version = "0.15.10";
sha256 = "36331a3cf3e29578c3134e4ee6481dd932e7d40704f5c38703a0eb231ba433d0";
+ revision = "1";
+ editedCabalFile = "bb24876b00ef8cd3f8500ef729a01278e6e4ba9c7e12391cb76c2217ddc55563";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -152281,8 +156177,8 @@ self: {
}:
mkDerivation {
pname = "shakespeare";
- version = "2.0.11.1";
- sha256 = "bc3d6c5bb3cbef9a0aa67bbf5f08b20cf77bc9e29d8e7da5a3768016a0361d5e";
+ 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
@@ -152655,8 +156551,8 @@ self: {
}:
mkDerivation {
pname = "shellmate-extras";
- version = "0.3.4";
- sha256 = "46aecef64462ab34789f63dd338dc1b72aff77f4eaa2ecbf97c32dd9b6130b52";
+ version = "0.3.4.1";
+ sha256 = "f3dd62394e99af6cf92cb50c8ce1f3cd819448eda3009e8c11bb312e26f9b82e";
libraryHaskellDepends = [
base bytestring feed http-conduit http-types mime-types shellmate
tagsoup text utf8-string xml
@@ -152702,6 +156598,8 @@ self: {
pname = "shelly";
version = "1.6.8.1";
sha256 = "e5a32f7552779667d1f0164d271e99c9ddcabdf1a7a1503cd6fc8ba0bb4445cd";
+ revision = "1";
+ editedCabalFile = "455095701152d4564c2b0a6e553f3add129b7bd0a91174a3bc2bc2292bdd5501";
libraryHaskellDepends = [
async base bytestring containers directory enclosed-exceptions
exceptions lifted-async lifted-base monad-control mtl process
@@ -152754,6 +156652,28 @@ 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.3";
+ sha256 = "73d50978e7b6a0c1d1784ab607572411da44aafce58defe45938f2b427b85713";
+ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"shine" = callPackage
({ mkDerivation, base, ghcjs-dom, ghcjs-prim, keycode, mtl, time
, transformers
@@ -152881,6 +156801,19 @@ self: {
license = "GPL";
}) {};
+ "show-prettyprint" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, base, doctest, trifecta }:
+ mkDerivation {
+ pname = "show-prettyprint";
+ version = "0.1.2";
+ sha256 = "5b9e93c48e91f1c91d3b2fcf214ea085f08292ee36916c324709532a7446e7a6";
+ libraryHaskellDepends = [ ansi-wl-pprint base trifecta ];
+ testHaskellDepends = [ base doctest ];
+ homepage = "https://github.com/quchen/show-prettyprint#readme";
+ description = "Robust prettyprinter for output of auto-generated Show instances";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"show-type" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -152975,6 +156908,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "shunya-library" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "shunya-library";
+ version = "0.1.0.4";
+ sha256 = "a497607995efa72ded74f07eb4305afc1bfe9c9df0c70f9334fa062d6f6db1c6";
+ libraryHaskellDepends = [ base ];
+ homepage = "https://github.com/githubuser/shunya-library#readme";
+ description = "Initial project template from stack";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "shunyalib" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "shunyalib";
+ version = "0.1.0.1";
+ sha256 = "ea423c1b87c14dea651bbb6fbbaa6b6c186c7c8014e8308e176071091deb06fa";
+ libraryHaskellDepends = [ base ];
+ homepage = "https://github.com/penguinshunya/shunyalib";
+ description = "Initial project template from stack";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"sibe" = callPackage
({ mkDerivation, base, Chart, Chart-cairo, containers
, data-default-class, deepseq, directory, hmatrix, JuicyPixels
@@ -152983,8 +156940,8 @@ self: {
}:
mkDerivation {
pname = "sibe";
- version = "0.2.0.1";
- sha256 = "964a03b7ba59444dcd0a776da94164840e402d6ca737ca2619a678080571046c";
+ version = "0.2.0.3";
+ sha256 = "324abe72b361aaef1286bbe8e76dda18e431010db60aa1ea018f95e045fe91ea";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -152996,7 +156953,6 @@ self: {
base Chart Chart-cairo containers data-default-class directory
hmatrix JuicyPixels random random-shuffle split vector
];
- testHaskellDepends = [ base hmatrix ];
homepage = "https://github.com/mdibaiee/sibe";
description = "Machine Learning algorithms";
license = stdenv.lib.licenses.gpl3;
@@ -153363,20 +157319,22 @@ self: {
}) {};
"simple-effects" = callPackage
- ({ mkDerivation, base, interlude-l, lens, list-t, monad-control
- , mtl, transformers, transformers-base
+ ({ mkDerivation, base, ghc-prim, interlude-l, lens, list-t
+ , monad-control, mtl, transformers, transformers-base
}:
mkDerivation {
pname = "simple-effects";
- version = "0.3.0.1";
- sha256 = "16796c57b5acea501c3b03c1306813a2488c1021ba5db51d168c2bc0c2f32c7b";
+ version = "0.6.0.1";
+ sha256 = "df8de9fae3ee9c2226565af8f8c4171d1b79678de37e3b280cda3ca013b52944";
libraryHaskellDepends = [
- base interlude-l lens list-t monad-control mtl transformers
- transformers-base
+ base ghc-prim interlude-l lens list-t monad-control mtl
+ transformers transformers-base
];
+ testHaskellDepends = [ base interlude-l ];
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
@@ -153544,8 +157502,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";
@@ -154670,6 +158628,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "slope-field" = callPackage
+ ({ mkDerivation, base, Chart, Chart-cairo, colour
+ , data-default-class, lens, mathexpr
+ }:
+ mkDerivation {
+ pname = "slope-field";
+ version = "0.1.0.1";
+ sha256 = "51c49a88ceb3fd3ec77670e32950a18fe1e185a79820228bb231b4f0d13a29af";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base data-default-class mathexpr ];
+ executableHaskellDepends = [
+ base Chart Chart-cairo colour data-default-class lens
+ ];
+ homepage = "https://github.com/mdibaiee/slope-field";
+ description = "Visualize mathematical function's slope fields";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"slot-lambda" = callPackage
({ mkDerivation, base, containers, haskell-src-exts
, haskell-src-meta, syb, template-haskell, vector
@@ -154980,8 +158957,26 @@ self: {
}:
mkDerivation {
pname = "smsaero";
- version = "0.6.1";
- sha256 = "95d9bd63df306b6ed2ebee3a31c91484bcc29fa72cab77e89f55746bd03bf102";
+ version = "0.6.2";
+ sha256 = "32f2dcbde9d588e11cebba3149a5e3a9e915cb47e13de8a4466690a171d490ec";
+ libraryHaskellDepends = [
+ aeson base containers http-api-data http-client servant
+ servant-client servant-docs text time
+ ];
+ homepage = "https://github.com/GetShopTV/smsaero";
+ description = "SMSAero API and HTTP client based on servant library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "smsaero_0_7_1" = callPackage
+ ({ mkDerivation, aeson, base, containers, http-api-data
+ , http-client, servant, servant-client, servant-docs, text, time
+ }:
+ mkDerivation {
+ pname = "smsaero";
+ version = "0.7.1";
+ sha256 = "cfec597fbd1ea285ce0f035e7f90bda241eca0536a1d22320f5a16ff6909c990";
libraryHaskellDepends = [
aeson base containers http-api-data http-client servant
servant-client servant-docs text time
@@ -155040,8 +159035,8 @@ self: {
}:
mkDerivation {
pname = "smtp-mail";
- version = "0.1.4.5";
- sha256 = "dcb32836cdcc165442d9c182866fa05d959bf22a8349e952e3525dbf585e0e04";
+ version = "0.1.4.6";
+ sha256 = "86dacbef87a2519222a1165b49401a437887a249f5bfd63a99702198dad214bc";
libraryHaskellDepends = [
array base base16-bytestring base64-bytestring bytestring
cryptohash filepath mime-mail network text
@@ -155148,6 +159143,8 @@ self: {
pname = "snap";
version = "1.0.0.1";
sha256 = "293f16c1404793121d3d85abb6287bbb32f5dc1d82b12146d4bb650052322db8";
+ revision = "1";
+ editedCabalFile = "81129d186348ab67fda4278bb6c8575ee7a7caed3e6069e0045f464a4ed911ab";
libraryHaskellDepends = [
aeson attoparsec base bytestring cereal clientsession configurator
containers directory directory-tree dlist filepath hashable heist
@@ -155266,8 +159263,8 @@ self: {
}:
mkDerivation {
pname = "snap-core";
- version = "1.0.0.0";
- sha256 = "9c35a657fc0debbe9df605d7528ce4645c0b4bc4b94b0134116f6746fe980adb";
+ version = "1.0.1.0";
+ sha256 = "f5d2a8b690e77b03626e7bd1856011fc2a13b286939176bde7b61c064aafa37c";
libraryHaskellDepends = [
attoparsec base bytestring bytestring-builder case-insensitive
containers directory filepath HUnit io-streams lifted-base
@@ -155290,16 +159287,15 @@ self: {
"snap-cors" = callPackage
({ mkDerivation, attoparsec, base, bytestring, case-insensitive
- , hashable, network, network-uri, snap, text, transformers
- , unordered-containers
+ , hashable, network, network-uri, snap, text, unordered-containers
}:
mkDerivation {
pname = "snap-cors";
- version = "1.2.10";
- sha256 = "57304a8fa66584fb0d7cd5d7b64feaa8c4a9d15e8f753ff80f1cd2d5e092b637";
+ version = "1.2.11";
+ sha256 = "81bd318b871c08a25bdcb05b286b43e99865b2ea21a4eb48b6e9839362acaf34";
libraryHaskellDepends = [
attoparsec base bytestring case-insensitive hashable network
- network-uri snap text transformers unordered-containers
+ network-uri snap text unordered-containers
];
homepage = "http://github.com/ocharles/snap-cors";
description = "Add CORS headers to Snap applications";
@@ -155401,6 +159397,7 @@ self: {
homepage = "http://snapframework.com/";
description = "Snap dynamic loader";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"snap-loader-static" = callPackage
@@ -155471,8 +159468,8 @@ self: {
}:
mkDerivation {
pname = "snap-server";
- version = "1.0.1.0";
- sha256 = "a398b15e90d2d6bc77af3edf6f5926df7863073a4774c71a46c0adb43c837488";
+ version = "1.0.1.1";
+ sha256 = "878d83a815b9cc8f3d282ef6fafc441528b5f7819147f17f0c1b1f9904146c70";
configureFlags = [ "-fopenssl" ];
libraryHaskellDepends = [
attoparsec base blaze-builder bytestring bytestring-builder
@@ -155513,6 +159510,7 @@ self: {
homepage = "http://snapframework.com/";
description = "Scaffolding CLI for the Snap Framework";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"snap-testing" = callPackage
@@ -155820,21 +159818,21 @@ self: {
"snaplet-i18n" = callPackage
({ mkDerivation, base, bytestring, configurator, filepath, heist
- , lens, snap, snap-loader-static, text, xmlhtml
+ , lens, mtl, snap, snap-loader-static, text, transformers, xmlhtml
}:
mkDerivation {
pname = "snaplet-i18n";
- version = "0.0.5";
- sha256 = "62b279c4b82358d62273911c917a21f96386c8198a8db5d95738dc32f746827a";
+ version = "0.1.0";
+ sha256 = "8933941904b222dd880b46a34af7c6612f47182e38b24022dbed6c6e505c4e3a";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base configurator filepath heist lens snap snap-loader-static text
- xmlhtml
+ base configurator filepath heist lens mtl snap snap-loader-static
+ text transformers xmlhtml
];
executableHaskellDepends = [
base bytestring configurator filepath heist lens snap
- snap-loader-static text xmlhtml
+ snap-loader-static text transformers xmlhtml
];
homepage = "https://github.com/HaskellCNOrg/snaplet-i18n";
description = "snaplet-i18n";
@@ -156012,6 +160010,8 @@ self: {
pname = "snaplet-postgresql-simple";
version = "1.0.1.0";
sha256 = "c747f9a0145c22f36441bab504a45ab20fc68ad46a8383c5f4db6686cd0dee7d";
+ revision = "1";
+ editedCabalFile = "94e77c56c9493373c7d57f50b6dc62e178cf37d294aa046bd66f71f6102b3372";
libraryHaskellDepends = [
base bytestring clientsession configurator lens lifted-base
monad-control mtl postgresql-simple resource-pool snap text
@@ -156225,15 +160225,17 @@ self: {
"snaplet-sqlite-simple" = callPackage
({ mkDerivation, aeson, base, bytestring, clientsession
, configurator, containers, direct-sqlite, directory, errors
- , exceptions, HUnit, lens, lifted-base, monad-control, mtl, snap
- , snap-core, sqlite-simple, stm, test-framework
- , test-framework-hunit, text, time, transformers, transformers-base
- , unordered-containers
+ , exceptions, HUnit, lens, lifted-base, monad-control, mtl
+ , SafeSemaphore, snap, snap-core, sqlite-simple, stm
+ , test-framework, test-framework-hunit, text, time, transformers
+ , transformers-base, unordered-containers
}:
mkDerivation {
pname = "snaplet-sqlite-simple";
- version = "1.0.0.0";
- sha256 = "d787e7cadbabb380ac4a889d9d21ca1e94ead91ef0864788471d1a62f7189f38";
+ 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
@@ -156241,9 +160243,9 @@ self: {
];
testHaskellDepends = [
aeson base bytestring clientsession configurator containers
- directory errors exceptions HUnit lens mtl snap snap-core
- sqlite-simple stm test-framework test-framework-hunit text time
- transformers unordered-containers
+ directory errors exceptions HUnit lens mtl SafeSemaphore snap
+ snap-core sqlite-simple stm test-framework test-framework-hunit
+ text time transformers unordered-containers
];
homepage = "https://github.com/nurpax/snaplet-sqlite-simple";
description = "sqlite-simple snaplet for the Snap Framework";
@@ -156251,6 +160253,27 @@ 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.2.0.0";
+ sha256 = "fc58870fc0cee74f9d4138c909937350faa7d1924a1da8e0f76b4a5ccdf31203";
+ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"snaplet-stripe" = callPackage
({ mkDerivation, base, bytestring, configurator, heist
, lens-family-core, mtl, snap, stripe, text, text-format
@@ -156622,8 +160645,8 @@ self: {
}:
mkDerivation {
pname = "soap";
- version = "0.2.3.1";
- sha256 = "a9cad8d48dfe6674b836e017ba0d1cf80d78f55e543e0bf58d07e5656a6c1c39";
+ version = "0.2.3.3";
+ sha256 = "2d1759c83bc75cacc470ffc64af218f971d55875a61c2de10be1276bd9845979";
libraryHaskellDepends = [
base bytestring conduit configurator data-default exceptions
http-client http-types iconv mtl resourcet text
@@ -156717,14 +160740,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "socket_0_6_2_0" = callPackage
+ "socket_0_7_0_0" = callPackage
({ mkDerivation, async, base, bytestring, QuickCheck, tasty
, tasty-hunit, tasty-quickcheck
}:
mkDerivation {
pname = "socket";
- version = "0.6.2.0";
- sha256 = "c7aed50b213c56c03f22a537acfd794e99564f50f412ec2dcaee6dd9cd9bad1c";
+ version = "0.7.0.0";
+ sha256 = "84dad156fe2d792194e86c4496db648e5fe0bbb55db2070b93058d6aa5f08962";
libraryHaskellDepends = [ base bytestring ];
testHaskellDepends = [
async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -156753,8 +160776,8 @@ self: {
}:
mkDerivation {
pname = "socket-io";
- version = "1.3.5";
- sha256 = "1604797a7095ef26b733cdff8922bf373fac551ab157c9756b031d191f90903f";
+ version = "1.3.6";
+ sha256 = "6ec1577c7f701253bc85a9df03379d77ae99c33d1db5ee4f7e6b06972701fb1a";
libraryHaskellDepends = [
aeson attoparsec base bytestring engine-io mtl stm text
transformers unordered-containers vector
@@ -156768,12 +160791,12 @@ self: {
({ mkDerivation, base, bytestring, lksctp-tools, socket }:
mkDerivation {
pname = "socket-sctp";
- version = "0.1.0.0";
- sha256 = "48ef7cae7ac4ed6674173716a598b611f704c38e14c1ac1006f1f730da60b9f5";
+ version = "0.3.0.0";
+ sha256 = "3320909a90d21f51743a114dd3f69604c7490ce1e86242f280cae8bc7c45092c";
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;
@@ -156898,6 +160921,31 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "solga_0_1_0_2" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, hashable
+ , hspec, hspec-wai, hspec-wai-json, http-types, QuickCheck
+ , resourcet, safe-exceptions, scientific, text
+ , unordered-containers, vector, wai, wai-extra
+ }:
+ mkDerivation {
+ pname = "solga";
+ version = "0.1.0.2";
+ sha256 = "fdb4825ebac855d411c6841e015fe7dd1ac0a56a3bcc78aef7a91a1d8444b06a";
+ libraryHaskellDepends = [
+ aeson base bytestring containers http-types resourcet
+ safe-exceptions text wai wai-extra
+ ];
+ testHaskellDepends = [
+ aeson base bytestring hashable hspec hspec-wai hspec-wai-json
+ http-types QuickCheck scientific text unordered-containers vector
+ wai wai-extra
+ ];
+ homepage = "https://github.com/chpatrick/solga";
+ description = "Simple typesafe web routing";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"solga-swagger" = callPackage
({ mkDerivation, base, bytestring, dlist, http-types
, insert-ordered-containers, lens, mtl, solga, swagger2, text
@@ -156905,8 +160953,8 @@ self: {
}:
mkDerivation {
pname = "solga-swagger";
- version = "0.1.0.1";
- sha256 = "ceac56b2de41102e739301b5edf60af546e6178f139313681cb46bfb693f765f";
+ version = "0.1.0.2";
+ sha256 = "dcb77313090c82ce9f35843ecec2ce59741fffa5f7a337d77b5d545a8e2136d4";
libraryHaskellDepends = [
base bytestring dlist http-types insert-ordered-containers lens mtl
solga swagger2 text unordered-containers
@@ -157344,8 +161392,8 @@ self: {
}:
mkDerivation {
pname = "sparse-linear-algebra";
- version = "0.2.1.1";
- sha256 = "7a5c11c8cf52b79e141388583731ec35b74958c681eef57300e82ef507278253";
+ version = "0.2.2.0";
+ sha256 = "7ef54d3351bd03dadd73797a48aaa629d71deff5a47f2c0e4ea780cdf47b3568";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -157421,8 +161469,8 @@ self: {
}:
mkDerivation {
pname = "spatial-math";
- version = "0.3.1.0";
- sha256 = "0b3ab1617e6c5eb74aacdc156d5b74fd1c1ed8d416d793f7b6e2d279773573da";
+ version = "0.4.0.0";
+ sha256 = "e54b9ecf64ca50aea8b7d4e152bbb462672ac74518d844617bfccbf5c584c5e3";
libraryHaskellDepends = [
base binary cereal ghc-prim lens linear TypeCompose
];
@@ -157576,8 +161624,8 @@ self: {
}:
mkDerivation {
pname = "speedy-slice";
- version = "0.1.4";
- sha256 = "b400e6475d77de2c4dbaf09ee0a3581fd8f34b44c7952e3108ab27960960ea92";
+ version = "0.1.5";
+ sha256 = "d072049b142e1df47a2a6b269dc7a9fc754a1ecd62ed5c6a6e8fb4122dd02441";
libraryHaskellDepends = [
base lens mcmc-types mwc-probability pipes primitive transformers
];
@@ -157587,6 +161635,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "speedy-slice_0_2_0" = callPackage
+ ({ mkDerivation, base, containers, lens, mcmc-types
+ , mwc-probability, pipes, primitive, transformers
+ }:
+ mkDerivation {
+ pname = "speedy-slice";
+ version = "0.2.0";
+ sha256 = "9ae1b3241624bfb5e656347cca1f598ae9b67b1abe23b00ddf8d3d5925234963";
+ libraryHaskellDepends = [
+ base lens mcmc-types mwc-probability pipes primitive transformers
+ ];
+ testHaskellDepends = [ base containers mwc-probability ];
+ homepage = "http://github.com/jtobin/speedy-slice";
+ description = "Speedy slice sampling";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"spelling-suggest" = callPackage
({ mkDerivation, base, edit-distance, parseargs, phonetic-code
, sqlite
@@ -157988,6 +162054,50 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "sprinkles" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
+ , Cabal, case-insensitive, cereal, classy-prelude, containers, curl
+ , data-default, directory, filepath, ginger, Glob, hashable, HDBC
+ , HDBC-mysql, HDBC-postgresql, HDBC-sqlite3, heredoc, hsyslog, HTTP
+ , http-types, memcached-binary, mime-types, mtl, network-uri
+ , pandoc, pandoc-creole, pandoc-types, parsec, process
+ , random-shuffle, regex-base, regex-pcre, safe, scientific
+ , system-locale, tasty, tasty-hunit, tasty-quickcheck
+ , template-haskell, temporary, text, time, transformers
+ , unix-compat, unordered-containers, utf8-string, vector, wai
+ , wai-extra, wai-handler-fastcgi, warp, yaml
+ }:
+ mkDerivation {
+ pname = "sprinkles";
+ version = "0.3.5.0";
+ sha256 = "b6e75244028d2de256583a581fb0f12d5bec1d6447cb1d539ca37caa7b2658f7";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson aeson-pretty array base bytestring Cabal case-insensitive
+ cereal classy-prelude containers curl data-default directory
+ filepath ginger Glob hashable HDBC HDBC-mysql HDBC-postgresql
+ HDBC-sqlite3 hsyslog HTTP http-types memcached-binary mime-types
+ mtl network-uri pandoc pandoc-creole pandoc-types parsec process
+ random-shuffle regex-base regex-pcre safe scientific system-locale
+ template-haskell text time transformers unix-compat
+ unordered-containers utf8-string vector wai wai-extra
+ wai-handler-fastcgi warp yaml
+ ];
+ executableHaskellDepends = [
+ base classy-prelude data-default parsec safe
+ ];
+ testHaskellDepends = [
+ base classy-prelude data-default directory filepath heredoc
+ regex-base regex-pcre tasty tasty-hunit tasty-quickcheck temporary
+ wai-extra
+ ];
+ homepage = "https://bitbucket.org/tdammers/sprinkles";
+ description = "JSON API to HTML website wrapper";
+ license = stdenv.lib.licenses.bsd3;
+ broken = true;
+ }) {pandoc-creole = null;};
+
"spritz" = callPackage
({ mkDerivation, base, lens, mtl, vector }:
mkDerivation {
@@ -158010,8 +162120,8 @@ self: {
}:
mkDerivation {
pname = "sproxy";
- version = "0.9.8";
- sha256 = "255f78f65439ad2e8e0f05fe9df5d07b07863b433bda486b67c3a6c4e0a0311a";
+ version = "0.9.9";
+ sha256 = "161ba53469bb2b9c331ff678125ec5917a28de8cdd30084628219f89fbb1fb08";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -158046,6 +162156,34 @@ self: {
];
description = "Web interface to sproxy database";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "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.93.0";
+ sha256 = "162c72464a0e4d77201db79ed332d14832a8a145c19246aa64b7156360aadcc9";
+ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"spsa" = callPackage
@@ -158214,8 +162352,8 @@ self: {
}:
mkDerivation {
pname = "sqlite-simple";
- version = "0.4.9.0";
- sha256 = "81dfe4a1dd69d2f0334d3be10ba1d6ce91a9ba0602e69170dfbecb84b11f60a3";
+ version = "0.4.12.0";
+ sha256 = "eb5732bea0fff46a1761c5aa635533c7200c748624825440276774ce4bf56093";
libraryHaskellDepends = [
attoparsec base blaze-builder blaze-textual bytestring containers
direct-sqlite text time transformers
@@ -158228,6 +162366,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "sqlite-simple_0_4_12_1" = 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.12.1";
+ sha256 = "2f24f4dfea3b3bc1657b26c786666abd041bb89e09c22d084eaea43d67112227";
+ 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 {
@@ -158554,8 +162714,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";
@@ -158625,32 +162785,57 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "stache_0_2_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, deepseq
+ , directory, exceptions, file-embed, filepath, hspec
+ , hspec-megaparsec, megaparsec, mtl, template-haskell, text
+ , unordered-containers, vector, yaml
+ }:
+ mkDerivation {
+ pname = "stache";
+ version = "0.2.0";
+ sha256 = "0952d6849a297d3ef020feaeb128be4af7d25ab97fa948eb0339a7f75d0a1831";
+ libraryHaskellDepends = [
+ aeson base bytestring containers deepseq directory exceptions
+ filepath megaparsec mtl template-haskell text unordered-containers
+ vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers file-embed hspec hspec-megaparsec
+ megaparsec text yaml
+ ];
+ homepage = "https://github.com/stackbuilders/stache";
+ description = "Mustache templates for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"stack" = callPackage
({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async
, attoparsec, base, base-compat, base16-bytestring
, base64-bytestring, binary, binary-tagged, blaze-builder, byteable
, bytestring, Cabal, clock, conduit, conduit-extra, containers
- , cryptohash, cryptohash-conduit, deepseq, directory, edit-distance
- , either, enclosed-exceptions, errors, exceptions, extra
- , fast-logger, filelock, filepath, fsnotify, generic-deriving
- , gitrev, hashable, hastache, hit, hpack, hpc, hspec, http-client
- , http-client-tls, http-conduit, http-types, lifted-async
- , lifted-base, microlens, monad-control, monad-logger, monad-unlift
- , mono-traversable, mtl, neat-interpolation, open-browser
- , optparse-applicative, optparse-simple, path, path-io, persistent
- , persistent-sqlite, persistent-template, pretty, process
- , project-template, QuickCheck, regex-applicative-text, resourcet
- , retry, safe, semigroups, smallcheck, split, stm, store
+ , cryptohash, cryptohash-conduit, deepseq, directory, either
+ , errors, exceptions, extra, fast-logger, file-embed, filelock
+ , filepath, fsnotify, generic-deriving, gitrev, hashable, hastache
+ , hit, hpack, hpc, hspec, http-client, http-client-tls
+ , http-conduit, http-types, lifted-async, lifted-base, microlens
+ , monad-control, monad-logger, monad-unlift, mono-traversable, mtl
+ , neat-interpolation, open-browser, optparse-applicative
+ , optparse-simple, path, path-io, persistent, persistent-sqlite
+ , persistent-template, pid1, pretty, process, project-template
+ , QuickCheck, regex-applicative-text, resourcet, retry, safe
+ , safe-exceptions, semigroups, smallcheck, split, stm, store
, streaming-commons, tar, template-haskell, temporary, text
- , text-binary, th-reify-many, time, tls, transformers
+ , text-binary, text-metrics, th-reify-many, time, tls, transformers
, transformers-base, unicode-transforms, unix, unix-compat
, unordered-containers, vector, vector-binary-instances, yaml
, zip-archive, zlib
}:
mkDerivation {
pname = "stack";
- version = "1.2.0";
- sha256 = "6a13a98413ea5f1a0642d9080892e6bcd996a17baa4d61521c0e0f3d9bb810b3";
+ version = "1.3.0";
+ sha256 = "060ed345ee724b916427430004548c519eb0219242a019ee06c8afd9a793497b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -158658,18 +162843,18 @@ self: {
base-compat base16-bytestring base64-bytestring binary
binary-tagged blaze-builder byteable bytestring Cabal clock conduit
conduit-extra containers cryptohash cryptohash-conduit deepseq
- directory edit-distance either enclosed-exceptions errors
- exceptions extra fast-logger filelock filepath fsnotify
- generic-deriving hashable hastache hit hpack hpc http-client
- http-client-tls http-conduit http-types lifted-async lifted-base
- microlens monad-control monad-logger monad-unlift mtl open-browser
- optparse-applicative path path-io persistent persistent-sqlite
- persistent-template pretty process project-template
- regex-applicative-text resourcet retry safe semigroups split stm
- store streaming-commons tar template-haskell temporary text
- text-binary time tls transformers transformers-base
- unicode-transforms unix unix-compat unordered-containers vector
- vector-binary-instances yaml zip-archive zlib
+ directory either errors exceptions extra fast-logger file-embed
+ filelock filepath fsnotify generic-deriving hashable hastache hit
+ hpack hpc http-client http-client-tls http-conduit http-types
+ lifted-async lifted-base microlens monad-control monad-logger
+ monad-unlift mtl open-browser optparse-applicative path path-io
+ persistent persistent-sqlite persistent-template pid1 pretty
+ process project-template regex-applicative-text resourcet retry
+ safe safe-exceptions semigroups split stm store streaming-commons
+ tar template-haskell temporary text text-binary text-metrics time
+ tls transformers transformers-base unicode-transforms unix
+ unix-compat unordered-containers vector vector-binary-instances
+ yaml zip-archive zlib
];
executableHaskellDepends = [
base bytestring Cabal containers directory either filelock filepath
@@ -158679,10 +162864,11 @@ self: {
];
testHaskellDepends = [
attoparsec base bytestring Cabal conduit conduit-extra containers
- cryptohash directory exceptions filepath hspec http-conduit
- monad-logger mono-traversable neat-interpolation path path-io
- QuickCheck resourcet retry smallcheck store template-haskell
- temporary text th-reify-many transformers vector
+ cryptohash directory exceptions filepath hspec http-client-tls
+ http-conduit monad-logger mono-traversable neat-interpolation path
+ path-io QuickCheck resourcet retry smallcheck store
+ template-haskell temporary text th-reify-many transformers vector
+ yaml
];
doCheck = false;
preCheck = "export HOME=$TMPDIR";
@@ -158894,8 +163080,54 @@ self: {
}:
mkDerivation {
pname = "stackage-curator";
- version = "0.14.1.1";
- sha256 = "1db3dee8833fe6e42f1266c9b78a5cbee9b02d6a9c83f4cf7e2c607f4a6ad6d5";
+ version = "0.14.3";
+ sha256 = "ce868f0bc6c385d23672421df9a8613c418e50e793a9ffbb16a2e0a4003ba8fa";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson amazonka amazonka-core amazonka-s3 async base
+ base16-bytestring blaze-html byteable bytestring Cabal
+ classy-prelude-conduit conduit conduit-extra containers cryptohash
+ cryptohash-conduit data-default-class directory exceptions filepath
+ hashable html-conduit http-client http-client-tls http-conduit
+ lucid mime-types monad-unlift monad-unlift-ref mono-traversable mtl
+ old-locale process resourcet safe semigroups stm store
+ streaming-commons syb system-fileio system-filepath tar temporary
+ text time transformers unix-compat unordered-containers utf8-string
+ vector xml-conduit xml-types yaml zlib
+ ];
+ executableHaskellDepends = [
+ aeson base http-client http-client-tls optparse-applicative
+ optparse-simple system-filepath text
+ ];
+ testHaskellDepends = [
+ base Cabal classy-prelude-conduit containers directory hspec
+ http-client http-client-tls QuickCheck text yaml
+ ];
+ homepage = "https://github.com/fpco/stackage-curator";
+ description = "Tools for curating Stackage bundles";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "stackage-curator_0_14_4_1" = callPackage
+ ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
+ , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal
+ , classy-prelude-conduit, conduit, conduit-extra, containers
+ , cryptohash, cryptohash-conduit, data-default-class, directory
+ , exceptions, filepath, hashable, hspec, html-conduit, http-client
+ , http-client-tls, http-conduit, lucid, mime-types, monad-unlift
+ , monad-unlift-ref, mono-traversable, mtl, old-locale
+ , optparse-applicative, optparse-simple, process, QuickCheck
+ , resourcet, safe, semigroups, stm, store, streaming-commons, syb
+ , system-fileio, system-filepath, tar, temporary, text, time
+ , transformers, unix-compat, unordered-containers, utf8-string
+ , vector, xml-conduit, xml-types, yaml, zlib
+ }:
+ mkDerivation {
+ pname = "stackage-curator";
+ version = "0.14.4.1";
+ sha256 = "37d3b9ac875d46d209efcaa9c6e0d1ab1edb421f1153292238582ee1aff66add";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -159552,8 +163784,8 @@ self: {
}:
mkDerivation {
pname = "staversion";
- version = "0.1.1.0";
- sha256 = "1c44ee900e27ef1988a4875c39b2ceb32d116ad45dc1c95a8adecfa39e0e3857";
+ version = "0.1.2.0";
+ sha256 = "43db7f70ca360b0d858572afaf012ba10cda7f0ea19511c4e036bdfbb832e917";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -159583,12 +163815,12 @@ self: {
}) {};
"stb-image-redux" = callPackage
- ({ mkDerivation, base, hspec, primitive, vector }:
+ ({ mkDerivation, base, hspec, vector }:
mkDerivation {
pname = "stb-image-redux";
- version = "0.2.0.0";
- sha256 = "1ad898ff99f7c1d6532dea98c6acdb1f786bc7c6095f72b179e423aaac3b9515";
- libraryHaskellDepends = [ base primitive vector ];
+ version = "0.2.1.0";
+ sha256 = "c0e4a5d2bf6d99934430ffd068cb3d28003554c5c8beb84ce76dd487f191eb1d";
+ libraryHaskellDepends = [ base vector ];
testHaskellDepends = [ base hspec vector ];
homepage = "https://github.com/sasinestro/stb-image-redux#readme";
description = "Image loading and writing microlibrary";
@@ -160015,6 +164247,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 {
@@ -160096,8 +164343,8 @@ self: {
}:
mkDerivation {
pname = "stomp-queue";
- version = "0.2.2";
- sha256 = "2ca9ab331d657f1efae64295084fbf3eac05efdb96e186a7f7ba497f24e7d5cf";
+ version = "0.3.1";
+ sha256 = "47dd7f332f2544aaee66fa37ff889cd666c98a8401cec1deeede01b0730b20bb";
libraryHaskellDepends = [
attoparsec base bytestring conduit conduit-extra mime mtl
network-conduit-tls split stompl time utf8-string
@@ -160109,14 +164356,14 @@ self: {
"stompl" = callPackage
({ mkDerivation, attoparsec, base, bytestring, mime, split, text
- , utf8-string
+ , utf8-string, word8
}:
mkDerivation {
pname = "stompl";
- version = "0.3.0";
- sha256 = "52897d2b5f0f100d76e1b8ae0d243102b712f6c760cda103146618e11007e5c6";
+ version = "0.5.0";
+ sha256 = "b0538c190c3fa1f63d81aa2518561c2ae6dd1407f86b56794a2024e9b59a5158";
libraryHaskellDepends = [
- attoparsec base bytestring mime split text utf8-string
+ attoparsec base bytestring mime split text utf8-string word8
];
homepage = "http://github.com/toschoo/mom";
description = "Stomp Parser and Utilities";
@@ -160164,8 +164411,8 @@ self: {
({ mkDerivation, base, byteorder }:
mkDerivation {
pname = "storable-endian";
- version = "0.2.5";
- sha256 = "e206eecf9480e937347ad0663f6c588da490606a1e55b871c68da8c7c1b44112";
+ version = "0.2.6";
+ sha256 = "3743ac8f084ed3187b83f17b4fac280e77c5df01f7910f42b6a1bf09d5a65489";
libraryHaskellDepends = [ base byteorder ];
description = "Storable instances with endianness";
license = stdenv.lib.licenses.bsd3;
@@ -160418,22 +164665,22 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "stratosphere_0_2_0" = callPackage
+ "stratosphere_0_3_1" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
- , hlint, lens, tasty, tasty-hspec, template-haskell, text
+ , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text
, unordered-containers
}:
mkDerivation {
pname = "stratosphere";
- version = "0.2.0";
- sha256 = "7a5b78bbcf125e5fec7e377ddb6917111341bab23a7bf5567e1393a910f9085e";
+ version = "0.3.1";
+ sha256 = "dc72586e7cc78d9be49afc9ae99a9713933fd10fa524d55e22ce9ee34e399130";
libraryHaskellDepends = [
- aeson aeson-pretty base bytestring lens template-haskell text
- unordered-containers
+ aeson aeson-pretty base bytestring hashable lens template-haskell
+ text unordered-containers
];
testHaskellDepends = [
- aeson aeson-pretty base bytestring directory hlint lens tasty
- tasty-hspec template-haskell text unordered-containers
+ aeson aeson-pretty base bytestring directory hashable hlint lens
+ tasty tasty-hspec template-haskell text unordered-containers
];
homepage = "https://github.com/frontrowed/stratosphere#readme";
description = "EDSL for AWS CloudFormation";
@@ -160787,6 +165034,60 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "strelka" = callPackage
+ ({ mkDerivation, attoparsec, base, base-prelude, base64-bytestring
+ , bifunctors, bytestring, hashable, http-media, mtl, semigroups
+ , strelka-core, text, transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "strelka";
+ version = "1";
+ sha256 = "a29e67ccb1929d3f1455ae80472098219ec3dc58b9b5bc9534cb61869ee831d5";
+ libraryHaskellDepends = [
+ attoparsec base base-prelude base64-bytestring bifunctors
+ bytestring hashable http-media mtl semigroups strelka-core text
+ transformers unordered-containers
+ ];
+ homepage = "https://github.com/nikita-volkov/strelka";
+ description = "A simple, flexible and composable web-router";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "strelka-core" = callPackage
+ ({ mkDerivation, base, base-prelude, bifunctors, bytestring
+ , hashable, mtl, semigroups, text, transformers
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "strelka-core";
+ version = "0.1";
+ sha256 = "9cccd19850c9b6afd0a544041476988520b035ec519061d7b92f1f781be69221";
+ libraryHaskellDepends = [
+ base base-prelude bifunctors bytestring hashable mtl semigroups
+ text transformers unordered-containers
+ ];
+ homepage = "https://github.com/nikita-volkov/strelka-core";
+ description = "Core components of \"strelka\"";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "strelka-wai" = callPackage
+ ({ mkDerivation, base, base-prelude, bytestring, case-insensitive
+ , http-types, strelka-core, text, unordered-containers, wai, warp
+ }:
+ mkDerivation {
+ pname = "strelka-wai";
+ version = "1";
+ sha256 = "b30e1e4732acb5c5db772609655a23e8311a627b788dcbcf99dce8cbb3f16137";
+ libraryHaskellDepends = [
+ base base-prelude bytestring case-insensitive http-types
+ strelka-core text unordered-containers wai warp
+ ];
+ homepage = "https://github.com/nikita-volkov/strelka-wai";
+ description = "WAI compatibility layer for \"strelka\"";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"strict" = callPackage
({ mkDerivation, array, base }:
mkDerivation {
@@ -161005,6 +165306,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "string-random" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, containers
+ , pcre-heavy, QuickCheck, random, tasty, tasty-hunit
+ , tasty-quickcheck, text, transformers
+ }:
+ mkDerivation {
+ pname = "string-random";
+ version = "0.1.0.0";
+ sha256 = "501904563b2dc7466568822e6b95e152d2e6e61818717b3963fd78b0888d1424";
+ libraryHaskellDepends = [
+ attoparsec base containers random text transformers
+ ];
+ testHaskellDepends = [
+ base bytestring pcre-heavy QuickCheck tasty tasty-hunit
+ tasty-quickcheck text
+ ];
+ homepage = "https://github.com/hiratara/hs-string-random#readme";
+ description = "A library for generating random string from a regular experession";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"string-similarity" = callPackage
({ mkDerivation, base, bytestring, hspec, QuickCheck, suffixtree }:
mkDerivation {
@@ -161215,6 +165537,21 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {stripe-tests = null;};
+ "strips" = callPackage
+ ({ mkDerivation, base, containers, hspec, mtl }:
+ mkDerivation {
+ pname = "strips";
+ version = "0.1.0.0";
+ sha256 = "6235efbdbf6505b9579266f047020240f642d1f3ee20e8b07480a638e0f71dce";
+ revision = "1";
+ editedCabalFile = "7bd62d7118703833b341b9e596a402ab58e339fe925cfc8b2650b2491fe57ae1";
+ libraryHaskellDepends = [ base containers mtl ];
+ testHaskellDepends = [ base containers hspec mtl ];
+ homepage = "https://github.com/y-kamiya/strips-haskell#readme";
+ description = "resolver using strips algorithm";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"strive" = callPackage
({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
, http-client, http-client-tls, http-types, markdown-unlit
@@ -161453,15 +165790,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "stylish-haskell_0_6_4_0" = callPackage
+ "stylish-haskell_0_6_5_0" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, directory
, filepath, haskell-src-exts, HUnit, mtl, optparse-applicative
, strict, syb, test-framework, test-framework-hunit, yaml
}:
mkDerivation {
pname = "stylish-haskell";
- version = "0.6.4.0";
- sha256 = "7f8aba23c7409350c59fdc836eedc4ab71e179bd5eed7e1b828178ef89bc6676";
+ version = "0.6.5.0";
+ sha256 = "aeee182f8b6a9492eedd12a45cd9a4abb677e95e1789ddd8681e699f27a5ea78";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -161801,8 +166138,8 @@ self: {
}:
mkDerivation {
pname = "super-user-spark";
- version = "0.3.0.0";
- sha256 = "772a27569ab8d2bf00c67b2ab07581cd135ee2a5e129fbf9a46ff2e1a222269e";
+ version = "0.3.2.0";
+ sha256 = "dbef4d44404a06ca283b8b8e4886373a4dd18d042679dd54998d59256aae118d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -161821,6 +166158,19 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "superbuffer" = callPackage
+ ({ mkDerivation, async, base, bytestring, HTF, QuickCheck }:
+ mkDerivation {
+ pname = "superbuffer";
+ version = "0.2.0.1";
+ sha256 = "ced2a0ed729661412d28da1248d39a5b47bb4513847deae59219a0fc12b51166";
+ libraryHaskellDepends = [ base bytestring ];
+ testHaskellDepends = [ async base bytestring HTF QuickCheck ];
+ homepage = "https://github.com/agrafix/superbuffer#readme";
+ description = "Efficiently build a bytestring from smaller chunks";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"supercollider-ht" = callPackage
({ mkDerivation, base, hosc, hsc3, opensoundcontrol-ht, process
, random, transformers
@@ -162601,8 +166951,8 @@ self: {
}:
mkDerivation {
pname = "syntactic";
- version = "3.6.2";
- sha256 = "f110ce1a2d5029756c6388666a4d817c4c739665c1c2cea718858302b2f07a73";
+ version = "3.6.3";
+ sha256 = "93b6c366dcd4a0a09005ffc27ff3d62a9ee070308b6300c415fe8301c8f4f3f0";
libraryHaskellDepends = [
base constraints containers data-hash deepseq mtl syb
template-haskell tree-view
@@ -163078,8 +167428,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "system-info";
- version = "0.1.0.2";
- sha256 = "31c047baaa70679f3ffab275de83a6bf2de7e144a8a2d9ec49f36cf0c6c19a5c";
+ version = "0.1.0.3";
+ sha256 = "9d31bad4a6ea7abdb6bef5e929388a58d200982964042cc4aa991c81066dc8b8";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
homepage = "https://github.com/ChaosGroup/system-info";
@@ -163129,6 +167479,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";
@@ -163377,6 +167729,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 {
@@ -163612,6 +167976,8 @@ self: {
pname = "tagged";
version = "0.8.5";
sha256 = "e47c51c955ed77b0fa36897f652df990aa0a8c4eb278efaddcd604be00fc8d99";
+ revision = "1";
+ editedCabalFile = "a8d7b211a0831f5acf65a36003aebab7673ffb6a874a49715e05e7b76a6cb896";
libraryHaskellDepends = [
base deepseq template-haskell transformers transformers-compat
];
@@ -164010,19 +168376,18 @@ self: {
}) {};
"takusen-oracle" = callPackage
- ({ mkDerivation, base, clntsh, mtl, old-time, sqlplus, time }:
+ ({ mkDerivation, base, clntsh, mtl, old-time, time }:
mkDerivation {
pname = "takusen-oracle";
- version = "0.9.3";
- sha256 = "4d290f84c6f35cc447df478c6afddb38633ed2442c58f4b1e1a3254036fba7b4";
+ version = "0.9.4.1";
+ sha256 = "492159551e80b58cff2318546f3649dd1c2b08eb4ff4f94d855d713df4ec868b";
libraryHaskellDepends = [ base mtl old-time time ];
librarySystemDepends = [ clntsh ];
- libraryToolDepends = [ sqlplus ];
homepage = "https://github.com/paulrzcz/takusen-oracle.git";
description = "Database library with left-fold interface for Oracle";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {clntsh = null; sqlplus = null;};
+ }) {clntsh = null;};
"tal" = callPackage
({ mkDerivation, base, containers, mtl, pretty, transformers
@@ -164331,16 +168696,17 @@ self: {
}) {};
"tasty-ant-xml" = callPackage
- ({ mkDerivation, base, containers, generic-deriving, ghc-prim, mtl
- , stm, tagged, tasty, transformers, xml
+ ({ mkDerivation, base, containers, directory, filepath
+ , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
+ , xml
}:
mkDerivation {
pname = "tasty-ant-xml";
- version = "1.0.2";
- sha256 = "bbc3cc6741597af6b158bb54345d7356c98b50eb8b493abd38178a471915ff5d";
+ version = "1.0.3";
+ sha256 = "34a55d29a962a24aa1d5150795a0cae7a4769950c7ecb7cc1facf3bb0b067562";
libraryHaskellDepends = [
- base containers generic-deriving ghc-prim mtl stm tagged tasty
- transformers xml
+ base containers directory filepath generic-deriving ghc-prim mtl
+ stm tagged tasty transformers xml
];
homepage = "http://github.com/ocharles/tasty-ant-xml";
description = "Render tasty output to XML for Jenkins";
@@ -164365,8 +168731,8 @@ self: {
}:
mkDerivation {
pname = "tasty-discover";
- version = "1.0.0";
- sha256 = "a4c4a3fcf1a3908ebd8f3dbbf1714b2dd50026285f4ba73bc868f79533c0e0a0";
+ version = "1.0.1";
+ sha256 = "d64eb1d6f2d21de2e55fc21cb666423a35d79c4732cc7a0931d6995bbd58adbd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -164376,8 +168742,9 @@ self: {
executableHaskellDepends = [ base directory filepath tasty-th ];
testHaskellDepends = [ base ];
homepage = "https://github.com/lwm/tasty-discover/";
- description = "Automatically discover and run Tasty framework tests";
- license = "GPL";
+ description = "Test discovery for the tasty framework";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tasty-expected-failure" = callPackage
@@ -164852,29 +169219,54 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) openssl;};
- "tcp-streams_0_5_0_0" = callPackage
+ "tcp-streams_0_6_0_0" = callPackage
({ mkDerivation, base, bytestring, data-default-class, directory
- , HsOpenSSL, HsOpenSSL-x509-system, HUnit, io-streams, network
- , openssl, pem, QuickCheck, test-framework, test-framework-hunit
- , test-framework-quickcheck2, tls, x509, x509-store, x509-system
+ , HUnit, io-streams, network, pem, QuickCheck, test-framework
+ , test-framework-hunit, test-framework-quickcheck2, tls, x509
+ , x509-store, x509-system
}:
mkDerivation {
pname = "tcp-streams";
- version = "0.5.0.0";
- sha256 = "a963c6ad88b4feb4012c39bb6ebe1237b3e6263a3b1b0b14fb3b10f729df3be0";
+ version = "0.6.0.0";
+ sha256 = "cfd94893d4b4c177e600186ae8e369bd728c26ed7e626653b29ace274c4e0fbc";
libraryHaskellDepends = [
- base bytestring data-default-class HsOpenSSL HsOpenSSL-x509-system
- io-streams network pem tls x509 x509-store x509-system
+ base bytestring data-default-class io-streams network pem tls x509
+ x509-store x509-system
];
- librarySystemDepends = [ openssl ];
testHaskellDepends = [
base bytestring directory HUnit io-streams network QuickCheck
test-framework test-framework-hunit test-framework-quickcheck2
];
+ homepage = "https://github.com/winterland1989/tcp-streams";
description = "One stop solution for tcp client and server with tls support";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {inherit (pkgs) openssl;};
+ }) {};
+
+ "tcp-streams-openssl" = callPackage
+ ({ mkDerivation, base, bytestring, directory, HsOpenSSL
+ , HsOpenSSL-x509-system, HUnit, io-streams, network, QuickCheck
+ , tcp-streams, test-framework, test-framework-hunit
+ , test-framework-quickcheck2
+ }:
+ mkDerivation {
+ pname = "tcp-streams-openssl";
+ version = "0.6.0.0";
+ sha256 = "4c4c18ed031fe372507ef2361a79ffbfea9c2cda134eecf017aa48ac00bf8d94";
+ libraryHaskellDepends = [
+ base bytestring HsOpenSSL HsOpenSSL-x509-system io-streams network
+ tcp-streams
+ ];
+ testHaskellDepends = [
+ base bytestring directory HUnit io-streams network QuickCheck
+ tcp-streams test-framework test-framework-hunit
+ test-framework-quickcheck2
+ ];
+ 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
({ mkDerivation, base, bytestring, HUnit, lens
@@ -164971,8 +169363,8 @@ self: {
}:
mkDerivation {
pname = "telegram-api";
- version = "0.5.1.1";
- sha256 = "2d253937a83605fd947a0d68d86208f0801bef97bf45679c81528d6c4d4e5d1d";
+ version = "0.5.1.2";
+ sha256 = "f13c9ce45a3d3a7bf52f4fadd8e1410ba64e3015ace00a6f82b2d4adf7e2410c";
libraryHaskellDepends = [
aeson base bytestring http-api-data http-client http-media
http-types mime-types mtl servant servant-client string-conversions
@@ -165617,21 +170009,45 @@ self: {
"test-fixture" = callPackage
({ mkDerivation, base, data-default, hspec, hspec-discover, mtl
- , template-haskell, transformers
+ , template-haskell, th-to-exp, transformers
}:
mkDerivation {
pname = "test-fixture";
- version = "0.4.1.0";
- sha256 = "bddd2b518151218d9848b46f233c70719711a45fd7357ecc3a5eb1d551d437a4";
+ version = "0.4.2.0";
+ sha256 = "4c07ffa83b70dd44cd5b4824629fa021e9971360e29ed05baa8708eb7954981a";
libraryHaskellDepends = [ base data-default mtl template-haskell ];
testHaskellDepends = [
- base hspec hspec-discover mtl transformers
+ base hspec hspec-discover mtl template-haskell th-to-exp
+ transformers
];
homepage = "http://github.com/cjdev/test-fixture#readme";
description = "Test monadic side-effects";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "test-fixture_0_5_0_0" = callPackage
+ ({ mkDerivation, base, data-default, haskell-src-exts
+ , haskell-src-meta, hspec, hspec-discover, mtl, template-haskell
+ , th-orphans, th-to-exp, transformers
+ }:
+ mkDerivation {
+ pname = "test-fixture";
+ version = "0.5.0.0";
+ sha256 = "084877f777878d2cabfb661e957dd8f5517000650c120308f8e2dbe7eda6772d";
+ libraryHaskellDepends = [
+ base data-default haskell-src-exts haskell-src-meta mtl
+ template-haskell th-orphans
+ ];
+ testHaskellDepends = [
+ base hspec hspec-discover mtl template-haskell th-to-exp
+ transformers
+ ];
+ homepage = "http://github.com/cjdev/test-fixture#readme";
+ description = "Test monadic side-effects";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"test-framework" = callPackage
({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers
, hostname, old-locale, random, regex-posix, time, xml
@@ -165983,8 +170399,8 @@ self: {
}:
mkDerivation {
pname = "test-simple";
- version = "0.1.8";
- sha256 = "8e8bacb6299e82d1f3f3643144e24ce574b99b2f052bd630930a4c2e62267895";
+ version = "0.1.9";
+ sha256 = "eaee79bf997272fe0c97a0cfb80347c760ca5de8ffb0d639ddbf00ba6f6ef51d";
libraryHaskellDepends = [
base mtl QuickCheck state-plus template-haskell
];
@@ -166168,6 +170584,28 @@ self: {
license = "GPL";
}) {};
+ "texmath_0_9" = callPackage
+ ({ mkDerivation, base, bytestring, containers, directory, filepath
+ , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+ , utf8-string, xml
+ }:
+ mkDerivation {
+ pname = "texmath";
+ version = "0.9";
+ sha256 = "6ee9cda09fd38b27309abf50216ae2081543c0edf939f71cc3856feca24c5f2c";
+ libraryHaskellDepends = [
+ base containers mtl pandoc-types parsec syb xml
+ ];
+ testHaskellDepends = [
+ base bytestring directory filepath process split temporary text
+ utf8-string xml
+ ];
+ homepage = "http://github.com/jgm/texmath";
+ description = "Conversion between formats used to represent mathematics";
+ license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"texrunner" = callPackage
({ mkDerivation, attoparsec, base, bytestring, directory, filepath
, HUnit, io-streams, lens, mtl, process, temporary, test-framework
@@ -166323,17 +170761,24 @@ self: {
}) {inherit (pkgs) icu;};
"text-icu-normalized" = callPackage
- ({ mkDerivation, base, base-unicode-symbols, bytestring, lens, text
- , text-icu
+ ({ mkDerivation, base, base-unicode-symbols, bytestring, containers
+ , exceptions, filepath, HUnit, lens, parsec, QuickCheck
+ , test-framework, test-framework-hunit, test-framework-quickcheck2
+ , test-framework-th, text, text-icu
}:
mkDerivation {
pname = "text-icu-normalized";
- version = "0.1.6";
- sha256 = "b5487346dc50fc9a70160277ae9f32306a4f517f06815785bcc6d0fa47ce94e8";
+ version = "0.3.0";
+ sha256 = "2a82c5bad47e6b75551a70535aeb574214834b0b4fb190f1f10af750a3245ef0";
libraryHaskellDepends = [
base base-unicode-symbols bytestring lens text text-icu
];
- homepage = "https://gitlab.com/theunixman/text-icu-normalized";
+ testHaskellDepends = [
+ base base-unicode-symbols bytestring containers exceptions filepath
+ HUnit lens parsec QuickCheck test-framework test-framework-hunit
+ test-framework-quickcheck2 test-framework-th text text-icu
+ ];
+ homepage = "https://www.lambdanow.us/browser/text-icu-normalized";
description = "Dealing with Strict Text in NFC normalization";
license = stdenv.lib.licenses.gpl3;
}) {};
@@ -166670,7 +171115,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "text-show_3_4_1" = callPackage
+ "text-show_3_4_1_1" = callPackage
({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
, bytestring, bytestring-builder, containers, contravariant
, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec
@@ -166680,8 +171125,8 @@ self: {
}:
mkDerivation {
pname = "text-show";
- version = "3.4.1";
- sha256 = "1a1ac1c88004b3c060d09d011f645e6fbcf59147b109ee4192cbe7724732558b";
+ version = "3.4.1.1";
+ sha256 = "f0ba04cb7389decad861b668764f7d7e58a6371269f2ac5809f842d2844f9921";
libraryHaskellDepends = [
array base base-compat bifunctors bytestring bytestring-builder
containers contravariant generic-deriving ghc-boot-th ghc-prim
@@ -166750,6 +171195,23 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "text-time" = callPackage
+ ({ mkDerivation, attoparsec, base, Cabal, formatting, hspec
+ , QuickCheck, text, time
+ }:
+ mkDerivation {
+ pname = "text-time";
+ version = "0.2.0";
+ sha256 = "cf62c803c3532b5ea7c1dec673f86df935d588f9a41e1e6f33b9715d0f2cf392";
+ libraryHaskellDepends = [ attoparsec base formatting text time ];
+ testHaskellDepends = [
+ attoparsec base Cabal formatting hspec QuickCheck text time
+ ];
+ homepage = "https://github.com/klangner/text-time";
+ description = "Library for Time parsing from Text into UTCTime";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"text-utf7" = callPackage
({ mkDerivation, base, bytestring, quickcheck-instances, tasty
, tasty-hunit, tasty-quickcheck, text
@@ -166768,6 +171230,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
@@ -166803,8 +171278,8 @@ self: {
({ mkDerivation, base, deepseq, text, vector }:
mkDerivation {
pname = "text-zipper";
- version = "0.8.3";
- sha256 = "3baf7623d26dc96f19e30c1c54e3be19607b8bd7917ea62e8d35a2b233e4e09f";
+ version = "0.9";
+ sha256 = "4601bf9bc703a85a5053f507474b8d0227c3391b4ce95ef0d22f9affa0dfd9b6";
libraryHaskellDepends = [ base deepseq text vector ];
homepage = "https://github.com/jtdaugherty/text-zipper/";
description = "A text editor zipper library";
@@ -166831,8 +171306,8 @@ self: {
}:
mkDerivation {
pname = "text1";
- version = "0.0.3";
- sha256 = "4ca7215f67aa347fbc26b266c1b8455d0e4eae8533523acc8a8ef7b221827d50";
+ version = "0.0.4";
+ sha256 = "17b1175bae397eb48ddeb750820d44d2ac819f79efc5f4d023a1bb00c9737bec";
libraryHaskellDepends = [ base binary lens semigroups text ];
testHaskellDepends = [
base directory doctest filepath QuickCheck template-haskell
@@ -167115,8 +171590,8 @@ self: {
({ mkDerivation, base, containers, syb, template-haskell }:
mkDerivation {
pname = "th-expand-syns";
- version = "0.4.0.0";
- sha256 = "59349f1999d72e4d0158de95c1ede5e8787d4c8c743ec4e6a2dbf37f823a5eea";
+ version = "0.4.1.0";
+ sha256 = "c198f592cc5cd644da97209f1aca0decd10e0847dd676195cb5dcb6abbbe48ea";
libraryHaskellDepends = [ base containers syb template-haskell ];
testHaskellDepends = [ base template-haskell ];
description = "Expands type synonyms in Template Haskell ASTs";
@@ -167152,8 +171627,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";
@@ -167253,8 +171728,8 @@ self: {
}:
mkDerivation {
pname = "th-lift-instances";
- version = "0.1.10";
- sha256 = "a3b8afd8789f508d9a421952994ff82cd33c40e99f81c85080fee07044ff2174";
+ version = "0.1.11";
+ sha256 = "1da46afabdc73c86f279a0557d5a8f9af1296f9f6043264ba354b1c9cc65a6b8";
libraryHaskellDepends = [
base bytestring containers template-haskell text th-lift vector
];
@@ -167272,8 +171747,8 @@ self: {
}:
mkDerivation {
pname = "th-orphans";
- version = "0.13.2";
- sha256 = "ac863234791b0860f7a33adc8656f0026698e1247c5fa4bd13d7befbfddc0204";
+ version = "0.13.3";
+ sha256 = "7380d5b66d0c754e383e7b16e982b5d9ddf5f45f5a33118a20023ec8af78c46d";
libraryHaskellDepends = [
base mtl template-haskell th-lift th-lift-instances th-reify-many
];
@@ -167342,6 +171817,19 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "th-to-exp" = callPackage
+ ({ mkDerivation, base, hspec, template-haskell }:
+ mkDerivation {
+ pname = "th-to-exp";
+ version = "0.0.1.0";
+ sha256 = "30283dcba984a48a048f77a5405be78df338050ad97da9df21fcfe49e519bf56";
+ libraryHaskellDepends = [ base template-haskell ];
+ testHaskellDepends = [ base hspec template-haskell ];
+ homepage = "https://github.com/lexi-lambda/th-to-exp#readme";
+ description = "Provides a way to persist data from compile-time to runtime";
+ license = stdenv.lib.licenses.isc;
+ }) {};
+
"th-traced" = callPackage
({ mkDerivation, base, containers, mtl, template-haskell }:
mkDerivation {
@@ -167515,10 +172003,8 @@ self: {
}:
mkDerivation {
pname = "these";
- version = "0.7.2";
- sha256 = "a1d22644ca30b0bf549ed9881fcadc9f93fac0ec4815008496ca16e83a966dc8";
- revision = "1";
- editedCabalFile = "f1720c052d70f405e05c3c7a022d25c20afc5391dfbe179e80d3e671311594d8";
+ version = "0.7.3";
+ sha256 = "14339c111ec2caffcb2a9f64164a5dc307a0afb716925ddcb1774d9d442a3d9b";
libraryHaskellDepends = [
aeson base bifunctors binary containers data-default-class deepseq
hashable keys mtl profunctors QuickCheck semigroupoids transformers
@@ -167912,12 +172398,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.0.0";
- sha256 = "f822b063d0c213ee931b75d13ec39a23f135fa08172bd6aeac3222db5cec9456";
+ version = "1.2.4";
+ sha256 = "f0b09681dcdad8ba282d8572227401008175b326998b20a1391b720a3087db00";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -167929,7 +172416,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
@@ -167941,7 +172428,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 }:
@@ -168018,8 +172505,8 @@ self: {
}:
mkDerivation {
pname = "tidal-midi";
- version = "0.8";
- sha256 = "dd8d39af0871a730017c712624fc86ba5c25add7737511610ac849d9d54bcd79";
+ version = "0.8.2";
+ sha256 = "3638e4d7f853d1a73929624ec34b2364469339b0c821567cf8b46c78971c8339";
libraryHaskellDepends = [
base containers PortMidi tidal time transformers
];
@@ -168178,14 +172665,14 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "time_1_6_0_1" = callPackage
+ "time_1_7_0_1" = callPackage
({ mkDerivation, base, deepseq, QuickCheck, test-framework
, test-framework-quickcheck2, unix
}:
mkDerivation {
pname = "time";
- version = "1.6.0.1";
- sha256 = "ff69b46f38f4d226b171d078b200f8a5a1e8cfeadfa543eabade51355d7c7fcb";
+ version = "1.7.0.1";
+ sha256 = "2730197c3665a1e5af87475de7a57cf0dd8ddbd339167251b4a44cb3b61407ca";
libraryHaskellDepends = [ base deepseq ];
testHaskellDepends = [
base deepseq QuickCheck test-framework test-framework-quickcheck2
@@ -168361,8 +172848,8 @@ self: {
}:
mkDerivation {
pname = "time-parsers";
- version = "0.1.1.0";
- sha256 = "872d2ad4727ed7ac00a06b2acb7d7965da04d432c2d45017805fd4e6975d6ab2";
+ version = "0.1.2.0";
+ sha256 = "4e50d40f13f8e6c5175be22b91586f909607ecb631f8209ff45bce2031bb3c24";
libraryHaskellDepends = [ base parsers template-haskell time ];
testHaskellDepends = [
attoparsec base bifunctors parsec parsers tasty tasty-hunit
@@ -168438,6 +172925,20 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "time-series-lib" = callPackage
+ ({ mkDerivation, base, Cabal, hspec, QuickCheck }:
+ mkDerivation {
+ pname = "time-series-lib";
+ version = "0.1.0";
+ sha256 = "91ae1189fb4579c217381514ca62bd028799a27f5ad7ae81c4acc3d0b7504fe0";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base Cabal hspec QuickCheck ];
+ doHaddock = false;
+ homepage = "https://github.com/klangner/time-series-lib";
+ description = "Library for Time Series processing";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"time-units" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -168463,6 +172964,44 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "time-warp" = callPackage
+ ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
+ , data-default, data-msgpack, exceptions, formatting, hslogger
+ , hspec, lens, lifted-base, monad-control, monad-loops, MonadRandom
+ , mtl, network-msgpack-rpc, pqueue, QuickCheck
+ , quickcheck-instances, random, safe, serokell-util, stm
+ , template-haskell, text, text-format, time, time-units
+ , transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "time-warp";
+ version = "0.1.1.2";
+ sha256 = "8a919958cbef95ff3960046f5854801b649b60c8e1fbd187ce1ae298c3c11187";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ ansi-terminal base bytestring containers data-default data-msgpack
+ exceptions formatting hslogger lens lifted-base monad-control
+ monad-loops MonadRandom mtl network-msgpack-rpc pqueue QuickCheck
+ quickcheck-instances random safe serokell-util stm template-haskell
+ text text-format time time-units transformers transformers-base
+ ];
+ executableHaskellDepends = [
+ async base data-default data-msgpack exceptions formatting hspec
+ lens MonadRandom mtl network-msgpack-rpc QuickCheck random
+ serokell-util stm text text-format time-units transformers
+ ];
+ testHaskellDepends = [
+ async base data-default data-msgpack exceptions hspec lens mtl
+ network-msgpack-rpc QuickCheck random serokell-util stm text
+ text-format time-units transformers
+ ];
+ homepage = "https://github.com/serokell/time-warp";
+ description = "Distributed systems execution emulation";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"timecalc" = callPackage
({ mkDerivation, base, haskeline, uu-parsinglib }:
mkDerivation {
@@ -168519,8 +173058,8 @@ self: {
({ mkDerivation, ansi-terminal, base, linear, time, transformers }:
mkDerivation {
pname = "timeless";
- version = "0.9.0.1";
- sha256 = "2dd43e752b92715d96e71dd82b65cfd6d9f89c808cb2bb70442d8b133cc01443";
+ version = "1.0.1.2";
+ sha256 = "f028c0d7deb751629c80c720d8b378b8fed3af68c4da28afbfbd1fa55d5acc70";
libraryHaskellDepends = [
ansi-terminal base linear time transformers
];
@@ -168529,6 +173068,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "timeless-tutorials" = callPackage
+ ({ mkDerivation, base, timeless }:
+ mkDerivation {
+ pname = "timeless-tutorials";
+ version = "1.0.0.0";
+ sha256 = "1b4631bde7afe9fcd49b22b7baf82927328981b49491f4d28ad39be3ec471e17";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base timeless ];
+ executableHaskellDepends = [ base ];
+ homepage = "https://github.com/carldong/timeless-tutorials#readme";
+ description = "Initial project template from stack";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"timelike" = callPackage
({ mkDerivation, base, transformers }:
mkDerivation {
@@ -168729,12 +173283,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "timeseries" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, cassava, hspec
+ , QuickCheck, statistics, text, text-time, time, vector
+ }:
+ mkDerivation {
+ pname = "timeseries";
+ version = "0.3.0";
+ sha256 = "0e59e55b0c1346593f752d88fa69ea9c35fb2942ef13f984727a26ede69d1896";
+ libraryHaskellDepends = [
+ base bytestring cassava statistics text text-time time vector
+ ];
+ testHaskellDepends = [
+ base bytestring Cabal cassava hspec QuickCheck statistics text
+ text-time time vector
+ ];
+ homepage = "https://github.com/klangner/timeseries";
+ description = "Library for Time Series processing";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"timespan" = callPackage
({ mkDerivation, base, time }:
mkDerivation {
pname = "timespan";
- version = "0.1.0.0";
- sha256 = "37500d586e16bad624a5a9419b750abf82e5107e3588dd873d6505e6e56253f8";
+ version = "0.2.0.0";
+ sha256 = "4e6ce1f32725700c4b78ed4806d90a5ce1275dce9504f78164a454a4ef4b8fe6";
libraryHaskellDepends = [ base time ];
homepage = "https://github.com/agrafix/timespan#readme";
description = "Useful timespan datatype and functions";
@@ -168820,6 +173395,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "timezone-unix" = callPackage
+ ({ mkDerivation, base, directory, filepath, leapseconds, tasty
+ , tasty-golden, tasty-hunit, time, timezone-olson, timezone-series
+ , unix
+ }:
+ mkDerivation {
+ pname = "timezone-unix";
+ version = "1.0";
+ sha256 = "d23f524eb3738a0ee21a168bb56e8dfe85e602edc80268027358deddae63c0ba";
+ libraryHaskellDepends = [
+ base directory filepath leapseconds time timezone-olson
+ timezone-series unix
+ ];
+ testHaskellDepends = [
+ base directory leapseconds tasty tasty-golden tasty-hunit time
+ timezone-series
+ ];
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"timing-convenience" = callPackage
({ mkDerivation, base, time }:
mkDerivation {
@@ -169052,6 +173648,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "tls_1_3_9" = callPackage
+ ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
+ , cereal, cryptonite, data-default-class, hourglass, memory, mtl
+ , network, QuickCheck, tasty, tasty-quickcheck, transformers, x509
+ , x509-store, x509-validation
+ }:
+ mkDerivation {
+ pname = "tls";
+ version = "1.3.9";
+ sha256 = "81355e16528796d3097719e74f7f1f8cae50daed06926d1995731bab8e02267b";
+ libraryHaskellDepends = [
+ asn1-encoding asn1-types async base bytestring cereal cryptonite
+ data-default-class memory mtl network transformers x509 x509-store
+ x509-validation
+ ];
+ testHaskellDepends = [
+ base bytestring cereal cryptonite data-default-class hourglass mtl
+ QuickCheck tasty tasty-quickcheck x509 x509-validation
+ ];
+ homepage = "http://github.com/vincenthz/hs-tls";
+ description = "TLS/SSL protocol native implementation (Server and Client)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tls-debug" = callPackage
({ mkDerivation, base, bytestring, cryptonite, data-default-class
, network, pem, time, tls, x509, x509-store, x509-system
@@ -169414,8 +174035,8 @@ self: {
}:
mkDerivation {
pname = "torrent";
- version = "10000.0.0";
- sha256 = "5914bc8b4c32c10dc82bfe373ba73745e1e785424a052b0ede5352802aa1140c";
+ version = "10000.0.1";
+ sha256 = "ba7c9565f5397f7603b924a67537abe6738cdc20649ff3fb510b5731d1e18725";
libraryHaskellDepends = [
base bencode binary bytestring containers filepath syb
];
@@ -169800,6 +174421,7 @@ self: {
];
description = "Text transformer and interpreter";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"transformations" = callPackage
@@ -169850,19 +174472,19 @@ self: {
}) {};
"transformers-abort" = callPackage
- ({ mkDerivation, base, data-default-class, monad-control, pointed
- , semigroupoids, transformers, transformers-base
+ ({ mkDerivation, base, monad-control, pointed, semigroupoids
+ , transformers, transformers-base
}:
mkDerivation {
pname = "transformers-abort";
- version = "0.5.0.1";
- sha256 = "f525bd66622ceb6dcdf38d7f96cc3fbcf5e9cc8bc1f5f126e2fbc011a3dc1b68";
+ version = "0.6.0.1";
+ sha256 = "4acca1807cc99bf4f366e25e7ab66069b7d19f5f4bedca675c75805bf3b7a461";
libraryHaskellDepends = [
- base data-default-class monad-control pointed semigroupoids
- transformers transformers-base
+ base monad-control pointed semigroupoids transformers
+ transformers-base
];
homepage = "https://github.com/mvv/transformers-abort";
- description = "A better error monad transformer";
+ description = "Error and short-circuit monad transformers";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -169994,8 +174616,8 @@ self: {
}:
mkDerivation {
pname = "transient";
- version = "0.4.4";
- sha256 = "da8d580e5fab1d43d791dbcc193fbe028925efdfb1b4bbcd017bccddff4dc382";
+ version = "0.4.4.1";
+ sha256 = "f1ad34b6c3d4044d294abf4b37f35efb764b710851eab6e58e1b9abb8a68d0ed";
libraryHaskellDepends = [
base containers directory mtl random stm time transformers
];
@@ -170012,8 +174634,8 @@ self: {
}:
mkDerivation {
pname = "transient-universe";
- version = "0.3.5";
- sha256 = "0a990737a635cad37e7530eb1abe295df7b72b24a066fd2891d943bf4a92bbfb";
+ version = "0.3.5.1";
+ sha256 = "7613bf9a99b111423649793f687b7a2b81241b89840a8046a316793ecc7df985";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -170023,9 +174645,15 @@ self: {
websockets
];
executableHaskellDepends = [ base transformers transient ];
+ testHaskellDepends = [
+ base bytestring case-insensitive containers directory filepath
+ hashable HTTP mtl network network-info network-uri process random
+ stm TCache text time transformers transient vector websockets
+ ];
homepage = "http://www.fpcomplete.com/user/agocorona";
description = "Remote execution and map-reduce: distributed computing for Transient";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"translatable-intset" = callPackage
@@ -170186,6 +174814,8 @@ self: {
pname = "tree-view";
version = "0.5";
sha256 = "2d0046df6a78bfc57c7d11736d3baf6e1e427e8eb944f408b80a9195b062dcab";
+ revision = "1";
+ editedCabalFile = "85fbc67b53c1ef47f020a69051e6a29b27481698fe802cd2ed8ab0108aa69a38";
libraryHaskellDepends = [ base containers mtl ];
description = "Render trees as foldable HTML and Unicode art";
license = stdenv.lib.licenses.bsd3;
@@ -170354,8 +174984,8 @@ self: {
}:
mkDerivation {
pname = "trifecta";
- version = "1.6";
- sha256 = "b302a69295fcb70f645e48b5005ded4f62a05ae11e4470f20ff4cc136ada7065";
+ version = "1.6.1";
+ sha256 = "854c2892ffddfa5315206a1ff94b4814517933c496acf5b7ae09fdde72a28cf7";
libraryHaskellDepends = [
ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
blaze-markup bytestring charset comonad containers deepseq
@@ -171000,6 +175630,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "turtle_1_3_0" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
+ , directory, doctest, foldl, hostname, managed, optional-args
+ , optparse-applicative, process, stm, system-fileio
+ , system-filepath, temporary, text, time, transformers, unix
+ , unix-compat
+ }:
+ mkDerivation {
+ pname = "turtle";
+ version = "1.3.0";
+ sha256 = "6004c179342c8b341f804046584d1ff6630483af5053d74603877df8d1699a47";
+ libraryHaskellDepends = [
+ ansi-wl-pprint async base bytestring clock directory foldl hostname
+ managed optional-args optparse-applicative process stm
+ system-fileio system-filepath temporary text time transformers unix
+ unix-compat
+ ];
+ testHaskellDepends = [ base doctest ];
+ description = "Shell programming, Haskell-style";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"turtle-options" = callPackage
({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle
}:
@@ -171631,6 +176284,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "type-assertions" = callPackage
+ ({ mkDerivation, base, hspec, test-fixture }:
+ mkDerivation {
+ pname = "type-assertions";
+ version = "0.1.0.0";
+ sha256 = "aac74571c99fa0170970716385570cf0e0bbb18fc93f1d7ad372824fe7a679bb";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base hspec test-fixture ];
+ homepage = "https://github.com/lexi-lambda/type-assertions#readme";
+ description = "Runtime type assertions for testing";
+ license = stdenv.lib.licenses.isc;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"type-booleans" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -172378,6 +177045,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "typesafe-precure" = callPackage
+ ({ mkDerivation, base, dlist, hspec, monad-skeleton
+ , template-haskell
+ }:
+ mkDerivation {
+ pname = "typesafe-precure";
+ version = "0.2.0.0";
+ sha256 = "f024a0c5a135b2ffbaf4ae97d9614d6f0d09652327061ba134f1c4b38e4b130e";
+ libraryHaskellDepends = [
+ base dlist monad-skeleton template-haskell
+ ];
+ testHaskellDepends = [ base hspec ];
+ homepage = "https://github.com/igrep/typesafe-precure#readme";
+ description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"typescript-docs" = callPackage
({ mkDerivation, base, blaze-html, cmdtheline, containers
, filemanip, filepath, language-typescript, parsec, split, syb
@@ -172510,19 +177194,19 @@ self: {
}) {};
"ua-parser" = callPackage
- ({ mkDerivation, aeson, base, bytestring, data-default, derive
- , file-embed, filepath, HUnit, pcre-light, tasty, tasty-hunit
- , tasty-quickcheck, text, yaml
+ ({ mkDerivation, aeson, base, bytestring, data-default, file-embed
+ , filepath, HUnit, pcre-light, tasty, tasty-hunit, tasty-quickcheck
+ , text, yaml
}:
mkDerivation {
pname = "ua-parser";
- version = "0.7.1";
- sha256 = "bfcfe7ea0cbeade0053dbdbbc8f4593283d17403058d754b00430edb1a0444b4";
+ version = "0.7.2";
+ sha256 = "469afe9d9c7d7de7405b316a388639858b515840f74ba0b4c48985559922df55";
libraryHaskellDepends = [
aeson base bytestring data-default file-embed pcre-light text yaml
];
testHaskellDepends = [
- aeson base bytestring data-default derive file-embed filepath HUnit
+ aeson base bytestring data-default file-embed filepath HUnit
pcre-light tasty tasty-hunit tasty-quickcheck text yaml
];
description = "A library for parsing User-Agent strings, official Haskell port of ua-parser";
@@ -173018,14 +177702,16 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "unfoldable_0_9" = callPackage
+ "unfoldable_0_9_1" = callPackage
({ mkDerivation, base, containers, ghc-prim, QuickCheck, random
, transformers
}:
mkDerivation {
pname = "unfoldable";
- version = "0.9";
- sha256 = "decb997909f9cd8c6ad618a46290c6df922e525361ec5d06e9db3b3822a40f77";
+ version = "0.9.1";
+ sha256 = "08e2565142d11f21242d631dfd78ad02da93fd6fa3e75af0df4c1024123db236";
+ revision = "1";
+ editedCabalFile = "6b047ce80f7c2eab1edef56df078b25bd86bcb496f1c8f9962758a229324ef7c";
libraryHaskellDepends = [
base containers ghc-prim QuickCheck random transformers
];
@@ -173286,6 +177972,8 @@ self: {
pname = "unicode-transforms";
version = "0.2.0";
sha256 = "3b27ca1ae8f0a906fbbefe1de819a80a01933610a4657ef6383db2590fdecb0e";
+ revision = "1";
+ editedCabalFile = "33480d6bb76758c9016397d10769d6ebf2db4004391961ad6dff05610a67d380";
libraryHaskellDepends = [ base bitarray bytestring text ];
testHaskellDepends = [
base deepseq getopt-generics QuickCheck split text
@@ -173350,8 +178038,8 @@ self: {
({ mkDerivation, base, deepseq, prelude-extras }:
mkDerivation {
pname = "uniform-pair";
- version = "0.1.12";
- sha256 = "91a4b9682568510ac79c66fff0c002c8994b5de6e09f42e93512188e293ffed0";
+ version = "0.1.13";
+ sha256 = "d31ea7498d3d317dbb22796fc4b26a06d16be5a398c2216ae9820b901503bf9d";
libraryHaskellDepends = [ base deepseq prelude-extras ];
homepage = "https://github.com/conal/uniform-pair/";
description = "Uniform pairs with class instances";
@@ -173723,12 +178411,14 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "unix_2_7_2_0" = callPackage
+ "unix_2_7_2_1" = callPackage
({ mkDerivation, base, bytestring, time }:
mkDerivation {
pname = "unix";
- version = "2.7.2.0";
- sha256 = "9444ea785b9f3547d3e04d2d42ead6bc3c2e0129390d9d41a655b18b0c322bf0";
+ version = "2.7.2.1";
+ sha256 = "fc05365594367779122465eee132162267c319c3679ff801f050ed30d18d099c";
+ revision = "1";
+ editedCabalFile = "3db1b6e8de36a36fc4f979e1045e82554f16c736961fa0392e42b7b3f4decfd4";
libraryHaskellDepends = [ base bytestring time ];
homepage = "https://github.com/haskell/unix";
description = "POSIX functionality";
@@ -173752,8 +178442,8 @@ self: {
({ mkDerivation, base, unix }:
mkDerivation {
pname = "unix-compat";
- version = "0.4.2.0";
- sha256 = "35f11770757853be6134b3e4d72a20ecd32c5b0326abebf2605d7ac00bd8d60c";
+ version = "0.4.3.1";
+ sha256 = "72801d5a654a6e108c153f412ebd54c37fb445643770e0b97701a59e109f7e27";
libraryHaskellDepends = [ base unix ];
homepage = "http://github.com/jystic/unix-compat";
description = "Portable POSIX-compatibility layer";
@@ -173906,8 +178596,8 @@ self: {
({ mkDerivation, base, directory, text }:
mkDerivation {
pname = "unlit";
- version = "0.3.2.1";
- sha256 = "b3cdceb5878989c323e0b45a1f08897d7e29e98a553ce59d694c3889aa5fa852";
+ version = "0.4.0.0";
+ sha256 = "489ecde4843f1911ebdaac3099241d703bb1161f3d386e2b5143f2fd6c355515";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base directory text ];
@@ -174285,20 +178975,20 @@ self: {
"uri-bytestring" = callPackage
({ mkDerivation, attoparsec, base, blaze-builder, bytestring
- , containers, derive, HUnit, lens-simple, QuickCheck
+ , containers, generics-sop, HUnit, lens-simple, QuickCheck
, quickcheck-instances, semigroups, tasty, tasty-hunit
, tasty-quickcheck
}:
mkDerivation {
pname = "uri-bytestring";
- version = "0.2.2.0";
- sha256 = "d7ab6d08e4c0b0ef2ed6ae47ec839cbc39734ea31af3178ce66a0b6896d14f0d";
+ version = "0.2.2.1";
+ sha256 = "9185e8f05d5c5154348c0d57d0df2b92ba6d09153fbdebded995b2f54e71c67e";
libraryHaskellDepends = [
attoparsec base blaze-builder bytestring containers
];
testHaskellDepends = [
- attoparsec base blaze-builder bytestring containers derive HUnit
- lens-simple QuickCheck quickcheck-instances semigroups tasty
+ attoparsec base blaze-builder bytestring containers generics-sop
+ HUnit lens-simple QuickCheck quickcheck-instances semigroups tasty
tasty-hunit tasty-quickcheck
];
homepage = "https://github.com/Soostone/uri-bytestring";
@@ -174398,8 +179088,8 @@ self: {
}:
mkDerivation {
pname = "uri-templater";
- version = "0.2.0.0";
- sha256 = "ba1c40d5c4cfc904ec355c0a179b38a4eebb9cd453b2d803df4fbaf37789fe7a";
+ version = "0.2.1.0";
+ sha256 = "b18621a1c4deed63e892395d4a2b0d20c7dbc81ecc8d977a18d99f23cc03943c";
libraryHaskellDepends = [
ansi-wl-pprint base charset containers dlist HTTP mtl parsers
template-haskell text trifecta unordered-containers vector
@@ -174407,7 +179097,7 @@ self: {
testHaskellDepends = [
ansi-wl-pprint base HUnit mtl template-haskell
];
- homepage = "http://github.com/sanetracker/uri-templater";
+ homepage = "http://github.com/iand675/uri-templater";
description = "Parsing & Quasiquoting for RFC 6570 URI Templates";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -174678,6 +179368,26 @@ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"users-persistent" = callPackage
({ mkDerivation, base, bytestring, esqueleto, hspec, monad-logger
, mtl, persistent, persistent-sqlite, persistent-template
@@ -175003,25 +179713,23 @@ self: {
}) {};
"uuid" = callPackage
- ({ mkDerivation, base, binary, bytestring, cryptonite, HUnit
- , memory, network-info, QuickCheck, random, tasty, tasty-hunit
- , tasty-quickcheck, text, time, uuid-types
+ ({ mkDerivation, base, binary, bytestring, cryptohash-md5
+ , cryptohash-sha1, entropy, HUnit, network-info, QuickCheck, random
+ , tasty, tasty-hunit, tasty-quickcheck, text, time, uuid-types
}:
mkDerivation {
pname = "uuid";
- version = "1.3.12";
- sha256 = "ed62f1b3f0b19f0d548655ffef5aff066ad5c430fe11e909a1a7e8fc115a89ee";
- revision = "2";
- editedCabalFile = "b4efa9a6c09c77d595c054fa1008820922c497e9063c3a8fe20c6949a20143f6";
+ version = "1.3.13";
+ sha256 = "dfac808a7026217d018b408eab18facc6a85c6183be308d4ac7877e80599b027";
libraryHaskellDepends = [
- base binary bytestring cryptonite memory network-info random text
- time uuid-types
+ base binary bytestring cryptohash-md5 cryptohash-sha1 entropy
+ network-info random text time uuid-types
];
testHaskellDepends = [
base bytestring HUnit QuickCheck random tasty tasty-hunit
tasty-quickcheck
];
- homepage = "https://github.com/aslatter/uuid";
+ homepage = "https://github.com/hvr/uuid";
description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -175354,8 +180062,8 @@ self: {
}:
mkDerivation {
pname = "validation";
- version = "0.5.3";
- sha256 = "481e01f8213e09d8b4a45f27e58921fe7da40a2b6ce15f0220d4efe210118f13";
+ version = "0.5.4";
+ sha256 = "8b785f5d9e35285b2fbc35039799410bf3a9c7179735c232e573485cb98f74a3";
libraryHaskellDepends = [
base bifunctors lens mtl semigroupoids semigroups transformers
];
@@ -175544,12 +180252,12 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "varying_0_6_0_0" = callPackage
+ "varying_0_7_0_3" = callPackage
({ mkDerivation, base, hspec, QuickCheck, time, transformers }:
mkDerivation {
pname = "varying";
- version = "0.6.0.0";
- sha256 = "f26af9b5a31095c8a8b8deabae2257a91ff749f99a0f5406b7c537a6e96b5c12";
+ version = "0.7.0.3";
+ sha256 = "6cd417fad6b30d8f9bd5a01dd21d059ecbc26cd1faf27bb7973eea43b5640309";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base transformers ];
@@ -175736,20 +180444,22 @@ self: {
}) {};
"vcsgui" = callPackage
- ({ mkDerivation, base, directory, filepath, gtk3, mtl, process
- , text, vcswrapper
+ ({ mkDerivation, base, directory, filepath, gi-gtk, gi-gtk-hs
+ , haskell-gi-base, mtl, process, text, vcswrapper
}:
mkDerivation {
pname = "vcsgui";
- version = "0.1.3.0";
- sha256 = "0d8997fec3f3a0025045408f8e619abd9568247a08228daa0ff7fa9508e7b06b";
+ version = "0.2.1.0";
+ sha256 = "ef43f033ca5ad099a48890bc0b29a881b846e94e0fad833d65091027243836b8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base directory filepath gtk3 mtl process text vcswrapper
+ base directory filepath gi-gtk gi-gtk-hs haskell-gi-base mtl
+ process text vcswrapper
];
executableHaskellDepends = [
- base directory filepath gtk3 mtl process text vcswrapper
+ base directory filepath gi-gtk gi-gtk-hs haskell-gi-base mtl
+ process text vcswrapper
];
homepage = "https://github.com/forste/haskellVCSGUI";
description = "GUI library for source code management systems";
@@ -175855,8 +180565,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
@@ -175900,8 +180610,8 @@ self: {
({ mkDerivation, base, binary, tasty, tasty-quickcheck, vector }:
mkDerivation {
pname = "vector-binary-instances";
- version = "0.2.3.2";
- sha256 = "e42cf4c80a69c6d661c6be152d43b39291fe22e7e55f4694709266692b50e049";
+ version = "0.2.3.3";
+ sha256 = "20158b1ab2fb8dd1bad57896fa3f75bb7fbc5354020c5715e997972b6ffb9f5c";
libraryHaskellDepends = [ base binary vector ];
testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
homepage = "https://github.com/bos/vector-binary-instances";
@@ -176124,8 +180834,8 @@ self: {
({ mkDerivation, base, deepseq, vector }:
mkDerivation {
pname = "vector-sized";
- version = "0.4.0.0";
- sha256 = "4f13d24329b6a60eebfe4d31026cf3b489c622b8afad4f30650f6664f61f1061";
+ version = "0.4.1.0";
+ sha256 = "19205fe36c63edfc52ea0f057bdf13ac22c71f5e40afc666bc9c6ff20846ca39";
libraryHaskellDepends = [ base deepseq vector ];
homepage = "http://github.com/expipiplus1/vector-sized#readme";
description = "Size tagged vectors";
@@ -176355,12 +181065,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 = [
@@ -176369,7 +181079,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
@@ -176547,8 +181257,8 @@ self: {
({ mkDerivation, base, doctest, ghc-prim, lens, singletons }:
mkDerivation {
pname = "vinyl";
- version = "0.5.2";
- sha256 = "93ac95aada665057df04bd1316c6eb5bef72479420199ebf34715684afe6a70b";
+ version = "0.5.3";
+ sha256 = "00f86a43def432c564226daae42b130a67c5fb413f3b097f43a14fbfb57608a6";
libraryHaskellDepends = [ base ghc-prim ];
testHaskellDepends = [ base doctest lens singletons ];
description = "Extensible Records";
@@ -176969,6 +181679,43 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "vty_5_14" = callPackage
+ ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
+ , data-default, deepseq, directory, filepath, hashable, HUnit
+ , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec
+ , QuickCheck, quickcheck-assertions, random, smallcheck, stm
+ , string-qq, terminfo, test-framework, test-framework-hunit
+ , test-framework-smallcheck, text, transformers, unix, utf8-string
+ , vector
+ }:
+ mkDerivation {
+ pname = "vty";
+ version = "5.14";
+ sha256 = "6f96be6c79c55850f09589b940bfebcc774adddf8a8258af2235320893c53912";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base blaze-builder bytestring containers data-default deepseq
+ directory filepath hashable microlens microlens-mtl microlens-th
+ mtl parallel parsec stm terminfo text transformers unix utf8-string
+ vector
+ ];
+ executableHaskellDepends = [
+ base containers data-default microlens microlens-mtl mtl
+ ];
+ testHaskellDepends = [
+ base blaze-builder bytestring Cabal containers data-default deepseq
+ HUnit microlens microlens-mtl mtl QuickCheck quickcheck-assertions
+ random smallcheck stm string-qq terminfo test-framework
+ test-framework-hunit test-framework-smallcheck text unix
+ utf8-string vector
+ ];
+ homepage = "https://github.com/coreyoconnor/vty";
+ description = "A simple terminal UI library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"vty-examples" = callPackage
({ mkDerivation, array, base, bytestring, Cabal, containers
, data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck
@@ -177377,8 +182124,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
@@ -178061,6 +182808,7 @@ self: {
homepage = "https://github.com/scotty-web/wai-middleware-static";
description = "WAI middleware that serves requests to static files";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wai-middleware-static-caching" = callPackage
@@ -178214,8 +182962,8 @@ self: {
}:
mkDerivation {
pname = "wai-routes";
- version = "0.9.8";
- sha256 = "4152d74a8b0b762b448b112d391e8b760efb7b71444c5b9f58ed714d87331071";
+ version = "0.9.9";
+ sha256 = "dea8b6b8163fe04bf0ffb9f5a81058eef2017591275735aba7ae448edf689cc9";
libraryHaskellDepends = [
aeson base blaze-builder bytestring case-insensitive containers
cookie data-default-class filepath http-types mime-types
@@ -178563,8 +183311,10 @@ self: {
}:
mkDerivation {
pname = "warc";
- version = "0.3.0";
- sha256 = "f1a2d1f51ec16ccf21b5fd0a74a5e485d3bc207deda8ba0e6944971688b19dfc";
+ version = "0.3.1";
+ sha256 = "2b8752553865feee48aa41d9940bc752e8d22dd866d1ba3e901fb3f7f9dd9510";
+ revision = "1";
+ editedCabalFile = "194f11d8f498f829f3f9dfd4ac145d1afbf6fdde1394fa4564377bcc47acbc76";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -178592,8 +183342,8 @@ self: {
}:
mkDerivation {
pname = "warp";
- version = "3.2.8";
- sha256 = "09de2d19cf0d1af8afe9f96e916aa7dafda82ddab3258fdec31963db81c2cf3c";
+ version = "3.2.9";
+ sha256 = "e2789a51b302dde7ab4145b5a0be745e1bdaae108761f9664718fbccbd55ebca";
libraryHaskellDepends = [
array async auto-update base blaze-builder bytestring
bytestring-builder case-insensitive containers ghc-prim hashable
@@ -178759,6 +183509,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "wave" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, containers
+ , data-default-class, hspec, QuickCheck, temporary, transformers
+ }:
+ mkDerivation {
+ pname = "wave";
+ version = "0.1.0";
+ sha256 = "93c38138c1e85124544eadf0d381ce4ce0505a441060d226e8f09baddc4c5915";
+ libraryHaskellDepends = [
+ base bytestring cereal containers data-default-class transformers
+ ];
+ testHaskellDepends = [
+ base bytestring containers data-default-class hspec QuickCheck
+ temporary
+ ];
+ homepage = "https://github.com/mrkkrp/wave";
+ description = "Work with WAVE and RF64 files";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"wavefront" = callPackage
({ mkDerivation, attoparsec, base, dlist, filepath, mtl, text
, transformers, vector
@@ -178927,10 +183698,8 @@ self: {
}:
mkDerivation {
pname = "web-inv-route";
- version = "0.1";
- sha256 = "8973080f0a59429cf97ed1ac0d1060b864f6a25f577c3e150ff0f0a3635ac8fa";
- revision = "1";
- editedCabalFile = "7e68be5f41dbc5f47d7f38f017f0f676eaf962a8fa56142ce491c8882165d28d";
+ version = "0.1.1";
+ sha256 = "ee4f71874d82c1868fff17a2276363454594f898f5db8c8c210479e5a5383b9a";
libraryHaskellDepends = [
base bytestring case-insensitive containers happstack-server
hashable http-types invertible network-uri snap-core text
@@ -179150,6 +183919,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "web3" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+ , bytestring, cryptonite, data-default-class, http-client, memory
+ , mtl, template-haskell, text, transformers, vector
+ }:
+ mkDerivation {
+ pname = "web3";
+ version = "0.3.4.0";
+ sha256 = "64218b2f2f2319fe137834bbb012e948444f80f88e3da03ee6ecff06b5ecfe27";
+ libraryHaskellDepends = [
+ aeson attoparsec base base16-bytestring bytestring cryptonite
+ data-default-class http-client memory mtl template-haskell text
+ transformers vector
+ ];
+ testHaskellDepends = [ base memory text ];
+ homepage = "https://github.com/airalab/hs-web3#readme";
+ description = "Ethereum API for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"webapi" = callPackage
({ mkDerivation, aeson, base, binary, blaze-builder, bytestring
, bytestring-lexing, bytestring-trie, case-insensitive, containers
@@ -179304,6 +184093,7 @@ self: {
homepage = "https://github.com/kallisti-dev/hs-webdriver";
description = "a Haskell client for the Selenium WebDriver protocol";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"webdriver-angular" = callPackage
@@ -179326,6 +184116,7 @@ self: {
homepage = "https://bitbucket.org/wuzzeb/webdriver-utils";
description = "Webdriver actions to assist with testing a webpage which uses Angular.Js";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"webdriver-snoy" = callPackage
@@ -179449,6 +184240,20 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {webkit = null;};
+ "webkit2gtk3-javascriptcore" = callPackage
+ ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit2gtk }:
+ mkDerivation {
+ pname = "webkit2gtk3-javascriptcore";
+ version = "0.14.2.1";
+ sha256 = "b24b110013f96c770a2c1683d3b35d73da31f9777dbe6e09ac704aff3ae442f8";
+ setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
+ libraryHaskellDepends = [ base ];
+ libraryPkgconfigDepends = [ webkit2gtk ];
+ description = "JavaScriptCore FFI from webkitgtk";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {webkit2gtk = null;};
+
"webkitgtk3" = callPackage
({ mkDerivation, base, bytestring, Cabal, cairo, glib
, gtk2hs-buildtools, gtk3, mtl, pango, text, transformers, webkit
@@ -179545,8 +184350,8 @@ self: {
}:
mkDerivation {
pname = "websockets";
- version = "0.9.7.0";
- sha256 = "07141953f005347214233617ce2654265dea67f63ffbcf4656fdea47066b7baa";
+ version = "0.9.8.2";
+ sha256 = "09ec17dfbf9f07da27575ce7853b0c80d87ad959c2b271f27be4c4e54615eca2";
libraryHaskellDepends = [
attoparsec base base64-bytestring binary blaze-builder bytestring
case-insensitive containers entropy network random SHA text
@@ -179563,16 +184368,44 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "websockets_0_10_0_0" = callPackage
+ ({ mkDerivation, attoparsec, base, base64-bytestring, binary
+ , blaze-builder, bytestring, case-insensitive, containers, entropy
+ , HUnit, network, QuickCheck, random, SHA, test-framework
+ , test-framework-hunit, test-framework-quickcheck2, text
+ }:
+ mkDerivation {
+ pname = "websockets";
+ version = "0.10.0.0";
+ sha256 = "3ee56fa6683912928a7d336d591c43e4948886037b5aa72cbab2f33fb43fa2eb";
+ libraryHaskellDepends = [
+ attoparsec base base64-bytestring binary blaze-builder bytestring
+ case-insensitive containers entropy network random SHA text
+ ];
+ testHaskellDepends = [
+ attoparsec base base64-bytestring binary blaze-builder bytestring
+ case-insensitive containers entropy HUnit network QuickCheck random
+ SHA test-framework test-framework-hunit test-framework-quickcheck2
+ text
+ ];
+ doCheck = false;
+ homepage = "http://jaspervdj.be/websockets";
+ description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"websockets-snap" = callPackage
- ({ mkDerivation, base, bytestring, io-streams, mtl, snap-core
- , snap-server, websockets
+ ({ mkDerivation, base, bytestring, bytestring-builder, io-streams
+ , mtl, snap-core, snap-server, websockets
}:
mkDerivation {
pname = "websockets-snap";
- version = "0.10.0.0";
- sha256 = "092328966679e2f2761acc06ab4236297e61eff8a2e8087470b6962238daf4fe";
+ version = "0.10.2.0";
+ sha256 = "294173c3dbc327ce3873ff310dcd14590d6a1ec05d54ea8d1a0cda0498dbe4a2";
libraryHaskellDepends = [
- base bytestring io-streams mtl snap-core snap-server websockets
+ base bytestring bytestring-builder io-streams mtl snap-core
+ snap-server websockets
];
description = "Snap integration for the websockets library";
license = stdenv.lib.licenses.bsd3;
@@ -179696,6 +184529,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "wembley" = callPackage
+ ({ mkDerivation, base, bytestring, filemanip, filepath
+ , optparse-applicative, split
+ }:
+ mkDerivation {
+ pname = "wembley";
+ version = "0.1.0.0";
+ sha256 = "608b999e650552af2f922611511d612da491c28d56900cf8a4a7e3458c49d510";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bytestring filemanip filepath optparse-applicative split
+ ];
+ homepage = "https://github.com/lovasko/wembley";
+ description = "Pretty-printing of codebases";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"werewolf" = callPackage
({ mkDerivation, aeson, base, containers, directory, extra
, filepath, interpolate, lens, MonadRandom, mtl
@@ -179890,8 +184741,8 @@ self: {
}:
mkDerivation {
pname = "wikicfp-scraper";
- version = "0.1.0.5";
- sha256 = "0a34feeaf03f5f98ebb4c43c9d711323814c0148e062f2eebacb524f489769ee";
+ version = "0.1.0.6";
+ sha256 = "8da3d67ee089342a9057e08b350896f278d404466e771757412ddcf1117270eb";
libraryHaskellDepends = [
attoparsec base bytestring scalpel text time
];
@@ -179978,8 +184829,8 @@ self: {
}:
mkDerivation {
pname = "wild-bind-x11";
- version = "0.1.0.2";
- sha256 = "dd31ca0fff07e5976076ed092ffb261ca438240fa33b25ba5ec3de66dcfd6d2d";
+ version = "0.1.0.4";
+ sha256 = "62b6ca3f4b6fdc19dae22126ff831b2633bf2d5e24c0c5bedc2757ea9a59e45a";
libraryHaskellDepends = [
base containers fold-debounce stm text transformers wild-bind X11
];
@@ -180226,6 +185077,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "wl-pprint-annotated" = callPackage
+ ({ mkDerivation, base, containers, deepseq, HUnit, test-framework
+ , test-framework-hunit, text
+ }:
+ mkDerivation {
+ pname = "wl-pprint-annotated";
+ version = "0.0.1.3";
+ sha256 = "f59627ca7e26bafee3954a0ce807243e93f38b229e7ecbb335d0e1fc32decae1";
+ libraryHaskellDepends = [ base containers deepseq text ];
+ testHaskellDepends = [
+ base containers deepseq HUnit test-framework test-framework-hunit
+ text
+ ];
+ homepage = "https://github.com/minad/wl-pprint-annotated#readme";
+ description = "Wadler/Leijen pretty printer with annotations and slightly modernized API";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"wl-pprint-ansiterm" = callPackage
({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl
, nats, semigroups, text, transformers, wl-pprint-extras
@@ -180244,6 +185113,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "wl-pprint-console" = callPackage
+ ({ mkDerivation, base, console-style, mtl, text
+ , wl-pprint-annotated
+ }:
+ mkDerivation {
+ pname = "wl-pprint-console";
+ version = "0.0.1.2";
+ sha256 = "dbef55503890a3d60c318084f2e857feba4529d458a17629f4ad00f13084ab3a";
+ revision = "2";
+ editedCabalFile = "560613daa268b1755476619a69dc7d343a52513b6bf2789ba25523afe9708917";
+ libraryHaskellDepends = [
+ base console-style mtl text wl-pprint-annotated
+ ];
+ homepage = "https://github.com/minad/wl-pprint-console#readme";
+ description = "Wadler/Leijen pretty printer supporting colorful console output";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"wl-pprint-extras" = callPackage
({ mkDerivation, base, containers, HUnit, nats, semigroupoids
, semigroups, test-framework, test-framework-hunit, text
@@ -180382,31 +185269,35 @@ self: {
"wolf" = callPackage
({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
, amazonka-swf, async, base, basic-prelude, bytestring, conduit
- , conduit-extra, exceptions, fast-logger, formatting, http-conduit
- , http-types, lens, monad-control, monad-logger, mtl, mtl-compat
- , optparse-applicative, regex-applicative, regex-compat, resourcet
- , safe, shelly, system-filepath, tasty, tasty-hunit, text, time
- , transformers, transformers-base, unordered-containers, uuid, yaml
- , zlib
+ , conduit-combinators, conduit-extra, directory, exceptions
+ , fast-logger, filemanip, formatting, http-conduit, http-types
+ , lens, lifted-async, lifted-base, monad-control, monad-logger, mtl
+ , mtl-compat, optparse-applicative, optparse-generic, preamble
+ , process, regex-applicative, regex-compat, resourcet, safe, shake
+ , shelly, system-filepath, tasty, tasty-hunit, template-haskell
+ , text, text-manipulate, time, transformers, transformers-base
+ , unordered-containers, uuid, yaml, zlib
}:
mkDerivation {
pname = "wolf";
- version = "0.2.12";
- sha256 = "fabd09aa41a108a0d10fbb2611c3a7c0faf123103809428e235d2dbfa8080ade";
+ version = "0.3.1";
+ sha256 = "441d7c82cca74e12fd097ebb3b4d5e3c7b2e3dff4145e65e00a9fd9f57ee224b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson amazonka amazonka-core amazonka-s3 amazonka-swf base
- basic-prelude bytestring conduit conduit-extra exceptions
- fast-logger formatting http-conduit http-types lens monad-control
- monad-logger mtl mtl-compat optparse-applicative regex-applicative
- regex-compat resourcet safe text time transformers
- transformers-base unordered-containers uuid yaml
+ basic-prelude bytestring conduit conduit-combinators conduit-extra
+ directory exceptions fast-logger filemanip formatting http-conduit
+ http-types lens lifted-async lifted-base monad-control monad-logger
+ mtl mtl-compat optparse-applicative preamble process
+ regex-applicative regex-compat resourcet safe template-haskell text
+ text-manipulate time transformers transformers-base
+ unordered-containers uuid yaml
];
executableHaskellDepends = [
- aeson amazonka-core async base basic-prelude bytestring
- optparse-applicative resourcet shelly system-filepath text
- transformers yaml zlib
+ aeson amazonka-core async base basic-prelude bytestring directory
+ optparse-applicative optparse-generic resourcet shake shelly
+ system-filepath text transformers yaml zlib
];
testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
homepage = "https://github.com/swift-nav/wolf";
@@ -180514,8 +185405,8 @@ self: {
}:
mkDerivation {
pname = "wordpass";
- version = "1.0.0.6";
- sha256 = "ef8888709fe0f0146b6cf3739191b4ca1c5df10f77a70da15d88deed1e925a37";
+ version = "1.0.0.7";
+ sha256 = "2283d16807261457c54022ca028e3c3a7fec1df6b66b9074ddbf0f14e721d9d8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -180580,8 +185471,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";
@@ -180862,10 +185753,8 @@ self: {
}:
mkDerivation {
pname = "writer-cps-mtl";
- version = "0.1.0.2";
- sha256 = "b77e45607d7bfde15758ae5223f79d846dc6adc7ab73b0d0b0df422daa1c7fce";
- revision = "1";
- editedCabalFile = "6c3b908440ba1217cb4b9724d5f3835ee370578b491c58f219e31193f36f9422";
+ version = "0.1.1.1";
+ sha256 = "db7f45ebceb3ecb166422c53d0a80a1c9bece8a958a3a9e4d15d75ada02bbf97";
libraryHaskellDepends = [
base mtl transformers writer-cps-transformers
];
@@ -180878,10 +185767,8 @@ self: {
({ mkDerivation, base, transformers }:
mkDerivation {
pname = "writer-cps-transformers";
- version = "0.1.0.2";
- sha256 = "037e74cb6c2780f151d937e15560a26c59c824f14c2c8f169971c76fcbd1dd4d";
- revision = "1";
- editedCabalFile = "07137b0cb53028a4025ed02c85863c91a3e6256f0f506261ec129ac347d9c619";
+ version = "0.1.1.0";
+ sha256 = "0a8663fe10576b659955fc3f9f816c776cc3a2cd9620e907d0e9ca1a8e88c62e";
libraryHaskellDepends = [ base transformers ];
homepage = "https://github.com/minad/writer-cps-transformers#readme";
description = "WriteT and RWST monad transformers";
@@ -181042,8 +185929,8 @@ self: {
}:
mkDerivation {
pname = "wuss";
- version = "1.1.1";
- sha256 = "285d9122bd2da4e6968d7c4f199858ccb2a6ea888f83cf7873f8cc651b755cdf";
+ version = "1.1.3";
+ sha256 = "691f03173df3b9af98760f27597318e3d028bef2d65ed58ea9e1fabf11bec8b0";
libraryHaskellDepends = [
base bytestring connection network websockets
];
@@ -181096,6 +185983,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "wxSimpleCanvas" = callPackage
+ ({ mkDerivation, base, cubicbezier, wx, wxcore }:
+ mkDerivation {
+ pname = "wxSimpleCanvas";
+ version = "0.0.0.0";
+ sha256 = "a2200569c49f7b6dcefe39ddc374d5325cb1fd9c001772edb340a8ba9b6c2061";
+ libraryHaskellDepends = [ base cubicbezier wx wxcore ];
+ description = "Simple zoomable canvas for wxHaskell";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"wxc" = callPackage
({ mkDerivation, base, libX11, mesa, split, wxdirect, wxGTK }:
mkDerivation {
@@ -181280,8 +186178,8 @@ self: {
}:
mkDerivation {
pname = "x509";
- version = "1.6.4";
- sha256 = "be0e7f9bddbd260cd247dce30c15f33a53937f51f304a05aec98accbcde93d42";
+ version = "1.6.5";
+ sha256 = "b53894214e23ab2795f2a9f4c885e37b35a223bbc03763b0017ce06dc8394783";
libraryHaskellDepends = [
asn1-encoding asn1-parse asn1-types base bytestring containers
cryptonite hourglass memory mtl pem
@@ -181894,7 +186792,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "xlsx_0_3_0" = callPackage
+ "xlsx_0_4_0" = callPackage
({ mkDerivation, base, base64-bytestring, binary-search, bytestring
, conduit, containers, data-default, Diff, errors, extra, filepath
, groom, lens, mtl, mtl-compat, network-uri, old-locale
@@ -181904,8 +186802,8 @@ self: {
}:
mkDerivation {
pname = "xlsx";
- version = "0.3.0";
- sha256 = "6d941e2fdc757384d417c50db35f84aa0413b940baf6ec49fdba597cd68c11b3";
+ version = "0.4.0";
+ sha256 = "1cb379b7cbc0783831f352d034c307a414bb2f1de158b5aec2a4c7cbebaee16a";
libraryHaskellDepends = [
base base64-bytestring binary-search bytestring conduit containers
data-default errors extra filepath lens mtl mtl-compat network-uri
@@ -181914,7 +186812,7 @@ self: {
];
testHaskellDepends = [
base bytestring containers Diff groom lens mtl raw-strings-qq
- smallcheck tasty tasty-hunit tasty-smallcheck time vector
+ smallcheck tasty tasty-hunit tasty-smallcheck text time vector
xml-conduit
];
homepage = "https://github.com/qrilka/xlsx";
@@ -182048,7 +186946,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
@@ -182056,8 +186954,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
@@ -182241,6 +187139,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "xml-isogen" = callPackage
+ ({ mkDerivation, base, dom-parser, lens, mtl, QuickCheck
+ , semigroups, template-haskell, text, xml-conduit-writer
+ }:
+ mkDerivation {
+ pname = "xml-isogen";
+ version = "0.1.0";
+ sha256 = "ae66671939e101c38154f04f603b00ed31451477a55d183ae299316315005eae";
+ libraryHaskellDepends = [
+ base dom-parser lens mtl QuickCheck semigroups template-haskell
+ text xml-conduit-writer
+ ];
+ description = "Generate XML-isomorphic types";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"xml-lens" = callPackage
({ mkDerivation, base, case-insensitive, containers, lens, text
, xml-conduit
@@ -183366,8 +188281,8 @@ self: {
}:
mkDerivation {
pname = "yaml";
- version = "0.8.20";
- sha256 = "d5cda5b2849afb9f0d7572759c3e006798d7efaeeb0bf0d3825f12832a0a3b11";
+ version = "0.8.21.1";
+ sha256 = "f9f8e801a215c65cf5eff6e3aa384060e60232521630495d13573bf0677a0db2";
configureFlags = [ "-fsystem-libyaml" ];
isLibrary = true;
isExecutable = true;
@@ -183810,8 +188725,8 @@ self: {
}:
mkDerivation {
pname = "yeshql";
- version = "0.3.0.2";
- sha256 = "644a83935a015b792d879dfa301bbb18beeea8515c2acd8d516a2cf6697fcbb7";
+ version = "1.0.0.1";
+ sha256 = "c535ab7797d2ad062a351f688d147908d79770c1e0881e4340c9d8ab25307bfc";
libraryHaskellDepends = [
base containers filepath HDBC parsec template-haskell
];
@@ -183825,22 +188740,24 @@ self: {
"yesod" = callPackage
({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
- , conduit-extra, data-default, directory, fast-logger
- , monad-control, monad-logger, safe, semigroups, shakespeare
- , streaming-commons, template-haskell, text, transformers, unix
- , unordered-containers, wai, wai-extra, wai-logger, warp, yaml
- , yesod-auth, yesod-core, yesod-form, yesod-persistent
+ , conduit, conduit-extra, data-default, directory, fast-logger
+ , monad-control, monad-logger, resourcet, safe, semigroups
+ , shakespeare, streaming-commons, template-haskell, text
+ , transformers, unix, unordered-containers, wai, wai-extra
+ , wai-logger, warp, yaml, yesod-auth, yesod-core, yesod-form
+ , yesod-persistent
}:
mkDerivation {
pname = "yesod";
- version = "1.4.3";
- sha256 = "13655ed28102b30f32a34fb1b30cf20c1d9bbd9f6f1c89f96643ea6d7bba74a3";
+ version = "1.4.3.1";
+ sha256 = "8ad23252817780afc10aee5cf1bd862b3cf46e08aabb884477e874caa351ab21";
libraryHaskellDepends = [
- aeson base blaze-html blaze-markup bytestring conduit-extra
- data-default directory fast-logger monad-control monad-logger safe
- semigroups shakespeare streaming-commons template-haskell text
- transformers unix unordered-containers wai wai-extra wai-logger
- warp yaml yesod-auth yesod-core yesod-form yesod-persistent
+ aeson base blaze-html blaze-markup bytestring conduit conduit-extra
+ data-default directory fast-logger monad-control monad-logger
+ resourcet safe semigroups shakespeare streaming-commons
+ template-haskell text transformers unix unordered-containers wai
+ wai-extra wai-logger warp yaml yesod-auth yesod-core yesod-form
+ yesod-persistent
];
homepage = "http://www.yesodweb.com/";
description = "Creation of type-safe, RESTful web applications";
@@ -183895,8 +188812,8 @@ self: {
}:
mkDerivation {
pname = "yesod-auth";
- version = "1.4.13.5";
- sha256 = "42bfdfe72f5ef9f9e43d12dcd47f5a3415e6b883d455a7ad4cbfb7e900e760bf";
+ version = "1.4.15";
+ sha256 = "a917b003c348aa4b3d8c673efb32e0ea0f9190affa86d435b9bea9f11ab85cfd";
libraryHaskellDepends = [
aeson authenticate base base16-bytestring base64-bytestring binary
blaze-builder blaze-html blaze-markup byteable bytestring conduit
@@ -184160,6 +189077,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "yesod-auth-nopassword" = callPackage
+ ({ mkDerivation, base, blaze-markup, http-types, pwstore-fast, text
+ , uuid, yesod-auth, yesod-core, yesod-form
+ }:
+ mkDerivation {
+ pname = "yesod-auth-nopassword";
+ version = "0.1.0.1";
+ sha256 = "a2ae8ba484ebd509eb8507b879eae29876ee9284facf1dfc4f94eea4f092106f";
+ libraryHaskellDepends = [
+ base blaze-markup http-types pwstore-fast text uuid yesod-auth
+ yesod-core yesod-form
+ ];
+ homepage = "https://github.com/danpalmer/yesod-auth-nopassword#readme";
+ description = "A plugin for Yesod to provide email-only authentication";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"yesod-auth-oauth" = callPackage
({ mkDerivation, authenticate-oauth, base, bytestring, lifted-base
, text, transformers, yesod-auth, yesod-core, yesod-form
@@ -184285,6 +189219,41 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "yesod-bin_1_5_0_1" = callPackage
+ ({ mkDerivation, async, attoparsec, base, base64-bytestring
+ , blaze-builder, bytestring, Cabal, conduit, conduit-extra
+ , containers, data-default-class, deepseq, directory, file-embed
+ , filepath, fsnotify, http-client, http-client-tls
+ , http-reverse-proxy, http-types, lifted-base, network
+ , optparse-applicative, parsec, process, project-template
+ , resourcet, safe-exceptions, say, shakespeare, split, stm
+ , streaming-commons, tar, template-haskell, text, time
+ , transformers, transformers-compat, typed-process, unix-compat
+ , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib
+ }:
+ mkDerivation {
+ pname = "yesod-bin";
+ version = "1.5.0.1";
+ sha256 = "5530506d1ddbe0b846f538b366645c416322046aa712d866c422e4778829d3e8";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ async attoparsec base base64-bytestring blaze-builder bytestring
+ Cabal conduit conduit-extra containers data-default-class deepseq
+ directory file-embed filepath fsnotify http-client http-client-tls
+ http-reverse-proxy http-types lifted-base network
+ optparse-applicative parsec process project-template resourcet
+ safe-exceptions say shakespeare split stm streaming-commons tar
+ template-haskell text time transformers transformers-compat
+ typed-process unix-compat unordered-containers wai wai-extra warp
+ warp-tls yaml zlib
+ ];
+ homepage = "http://www.yesodweb.com/";
+ description = "The yesod helper executable";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yesod-bootstrap" = callPackage
({ mkDerivation, base, blaze-html, blaze-markup, conduit
, conduit-extra, containers, either, email-validate
@@ -184397,8 +189366,8 @@ self: {
}:
mkDerivation {
pname = "yesod-core";
- version = "1.4.25";
- sha256 = "929b881c3bddf7f868ba44d8aed72e36163affb6f455dd0f4669c8451fe6c46b";
+ version = "1.4.30";
+ sha256 = "1136dbf0beacbb7ea18b73616e059aa85ec5fbbf0ecae88e7ff3ac8eb685f654";
libraryHaskellDepends = [
aeson auto-update base blaze-builder blaze-html blaze-markup
byteable bytestring case-insensitive cereal clientsession conduit
@@ -184549,6 +189518,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "yesod-elements" = callPackage
+ ({ mkDerivation, base, blaze-html, yesod-core }:
+ mkDerivation {
+ pname = "yesod-elements";
+ version = "1.0";
+ sha256 = "d4a0cf90675bb146acf2e7fa6e743501f20b8efc7b9beac53e6081e9c1851134";
+ libraryHaskellDepends = [ base blaze-html yesod-core ];
+ description = "Non template haskell markup building function in the spirit of lucid";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"yesod-eventsource" = callPackage
({ mkDerivation, base, blaze-builder, conduit, transformers, wai
, wai-eventsource, wai-extra, yesod-core
@@ -184635,8 +189615,8 @@ self: {
}:
mkDerivation {
pname = "yesod-form";
- version = "1.4.8";
- sha256 = "c6f2f83dd361569f830c95671b70c7510b485840d20b9ade6c747de127088f0b";
+ version = "1.4.9";
+ sha256 = "bd53f12d97a89e93b15fc6b06e63fbe041301635508f933203596f349a74110d";
libraryHaskellDepends = [
aeson attoparsec base blaze-builder blaze-html blaze-markup
byteable bytestring containers data-default email-validate
@@ -184740,6 +189720,8 @@ self: {
pname = "yesod-ip";
version = "0.5.0";
sha256 = "b6945480c694b48c03daceb6c286636f65ed9c442b7b94774814c1078418a029";
+ revision = "1";
+ editedCabalFile = "257cdc5ff06969dc0298e4b92be3907fce4e9ad20eefd132e2f634bab47d0a83";
libraryHaskellDepends = [
base http-api-data ip path-pieces persistent text yesod-core
yesod-form
@@ -184833,8 +189815,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
@@ -184935,8 +189917,8 @@ self: {
}:
mkDerivation {
pname = "yesod-persistent";
- version = "1.4.0.6";
- sha256 = "69c1261b49a6448795d569431691115fc6b86f7b296905573f5b2271465dee71";
+ version = "1.4.1.0";
+ sha256 = "98f422757210b30b2bd0d75828408a9fb1d67fa81e02ec304848c1922da4e91c";
libraryHaskellDepends = [
base blaze-builder conduit persistent persistent-template
resource-pool resourcet transformers yesod-core
@@ -184950,6 +189932,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "yesod-persistent_1_4_1_1" = callPackage
+ ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
+ , persistent-sqlite, persistent-template, resource-pool, resourcet
+ , text, transformers, wai-extra, yesod-core
+ }:
+ mkDerivation {
+ pname = "yesod-persistent";
+ version = "1.4.1.1";
+ sha256 = "dffd2604fc37a6b518c06391c44059df96895e3b484d4de8fbff9ff0869e7551";
+ libraryHaskellDepends = [
+ base blaze-builder conduit persistent persistent-template
+ resource-pool resourcet transformers yesod-core
+ ];
+ testHaskellDepends = [
+ base blaze-builder conduit hspec persistent persistent-sqlite text
+ wai-extra yesod-core
+ ];
+ homepage = "http://www.yesodweb.com/";
+ description = "Some helpers for using Persistent from Yesod";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yesod-platform" = callPackage
({ mkDerivation, ansi-terminal, ansi-wl-pprint, asn1-encoding
, asn1-parse, asn1-types, attoparsec-conduit, authenticate
@@ -185427,8 +190432,8 @@ self: {
}:
mkDerivation {
pname = "yesod-test";
- version = "1.5.3";
- sha256 = "4253af356d95fd1888501a640460a48b1ccc4fa81fdd2fd22dfa3c22dd44ab19";
+ version = "1.5.4.1";
+ sha256 = "36c08c34d5fef656bb3469194b77b0802c60db4120af0f6dfd2b08f4a9d9659d";
libraryHaskellDepends = [
attoparsec base blaze-builder blaze-html blaze-markup bytestring
case-insensitive containers cookie hspec-core html-conduit
@@ -185550,8 +190555,8 @@ self: {
}:
mkDerivation {
pname = "yesod-websockets";
- version = "0.2.4";
- sha256 = "7067115f0e7e282879718798bba627ab967eb38a419fc2180cc6b58259ea9adc";
+ version = "0.2.4.1";
+ sha256 = "795b497217dece919d4034bc4dfa84632d900798d1be9a423ce57409378cbccf";
libraryHaskellDepends = [
async base conduit enclosed-exceptions monad-control transformers
wai wai-websockets websockets yesod-core
@@ -185675,7 +190680,7 @@ self: {
license = stdenv.lib.licenses.gpl2;
}) {};
- "yi_0_13_3" = callPackage
+ "yi_0_13_5" = callPackage
({ mkDerivation, base, microlens-platform, mtl
, optparse-applicative, yi-core, yi-frontend-pango, yi-frontend-vty
, yi-keymap-emacs, yi-keymap-vim, yi-misc-modes, yi-mode-haskell
@@ -185683,8 +190688,8 @@ self: {
}:
mkDerivation {
pname = "yi";
- version = "0.13.3";
- sha256 = "e6caf353d17a18378a6a31a90f8b4130eab7ea51d548218d620e9037b0a01036";
+ version = "0.13.5";
+ sha256 = "902341a7927ee1d255d44286e46dc46b6c4282026c52c1c571d3999cf3a7259f";
configureFlags = [ "-fpango" "-fvty" ];
isLibrary = false;
isExecutable = true;
@@ -185731,8 +190736,8 @@ self: {
}:
mkDerivation {
pname = "yi-core";
- version = "0.13.3";
- sha256 = "41f2ace2aa9cdbcc8392ac007c5c94a2785a659acd50d8fb5b3a87a9f296948c";
+ version = "0.13.5";
+ sha256 = "b84b49f40b7cf9801a3d7fcf0bf11f4e828ecfc7cd20800d8b2f46fd596e8829";
libraryHaskellDepends = [
array attoparsec base binary bytestring containers data-default
directory dlist dynamic-state dyre exceptions filepath hashable
@@ -185774,8 +190779,8 @@ self: {
}:
mkDerivation {
pname = "yi-frontend-pango";
- version = "0.13.3";
- sha256 = "8da397739c5b448aa825f69bb2f0d085c68091540cc6e80fa09d384acc8a1cfd";
+ version = "0.13.5";
+ sha256 = "f2cf5d62e161d7edd1c664874daa5acdc2ec70d7e9b6cc7f688d2d02963272b0";
libraryHaskellDepends = [
base containers filepath glib gtk microlens-platform mtl
oo-prototypes pango pointedlist text transformers-base yi-core
@@ -185793,8 +190798,8 @@ self: {
}:
mkDerivation {
pname = "yi-frontend-vty";
- version = "0.13.3";
- sha256 = "3dd96a09085b7ad5375e9038af38fef7cb72c1c3dd9c7941fbe40d4ae43f5002";
+ version = "0.13.5";
+ sha256 = "5be74cdfd2e0ca9d0a8af5895013f8fee86e55e2a6484f66253f761090a137b3";
libraryHaskellDepends = [
base containers data-default dlist microlens-platform pointedlist
stm text vty yi-core yi-language
@@ -185822,15 +190827,15 @@ self: {
license = stdenv.lib.licenses.gpl2;
}) {};
- "yi-fuzzy-open_0_13_3" = callPackage
+ "yi-fuzzy-open_0_13_5" = callPackage
({ mkDerivation, base, binary, containers, data-default, directory
, filepath, mtl, text, transformers-base, vector, yi-core
, yi-language, yi-rope
}:
mkDerivation {
pname = "yi-fuzzy-open";
- version = "0.13.3";
- sha256 = "51f827d2d9deec703a0450f90aed40d2084379fc3ab59d51d13b444f316e893c";
+ version = "0.13.5";
+ sha256 = "a71c3fd14598bb153cb64d45cfa60c40c4e97e9ed74e422c6fac566330ed9e2d";
libraryHaskellDepends = [
base binary containers data-default directory filepath mtl text
transformers-base vector yi-core yi-language yi-rope
@@ -185859,8 +190864,8 @@ self: {
}:
mkDerivation {
pname = "yi-ireader";
- version = "0.13.3";
- sha256 = "7f8f3985386f3a64ad4de36c93b81183a08f9c0d5d9fbe4acfc47ac2a19cb2c7";
+ version = "0.13.5";
+ sha256 = "0ffe75cb958387aa4512cd07a40a25df4a68d2109b2d5530208ee291e03d7b48";
libraryHaskellDepends = [
base binary bytestring containers data-default microlens-platform
text yi-core yi-language yi-rope
@@ -185876,8 +190881,8 @@ self: {
}:
mkDerivation {
pname = "yi-keymap-cua";
- version = "0.13.3";
- sha256 = "ba7836bd5192212baa9b3ae5c7a839953be08be67aa5199068f472f9a24f5a54";
+ version = "0.13.5";
+ sha256 = "d49e00c8097e23d6626b58e6cfa875f76a3a215524d29bb11fef09f91f4d57c5";
libraryHaskellDepends = [
base microlens-platform text yi-core yi-keymap-emacs yi-rope
];
@@ -185894,8 +190899,8 @@ self: {
}:
mkDerivation {
pname = "yi-keymap-emacs";
- version = "0.13.3";
- sha256 = "3b2ee411a67904f011c6f5f9ac7739d7c4571c4a0c8deaef82aaeb44176cd1b2";
+ version = "0.13.5";
+ sha256 = "8019d069cc6f81a5c13b5429fd60db008ec224cc3df55c6384a0067edeeb0416";
libraryHaskellDepends = [
base containers filepath Hclip microlens-platform mtl oo-prototypes
semigroups text transformers-base yi-core yi-language yi-misc-modes
@@ -185916,8 +190921,8 @@ self: {
}:
mkDerivation {
pname = "yi-keymap-vim";
- version = "0.13.3";
- sha256 = "e81caeb7866e485a88ede2b88cfe7f6fbbc6ea9cd21424502d11150df64211b4";
+ version = "0.13.5";
+ sha256 = "c37a48f0915f4a1584ae684e227102bed334f64ceec851547b2789e645c74907";
libraryHaskellDepends = [
attoparsec base binary containers data-default directory filepath
Hclip microlens-platform mtl oo-prototypes pointedlist safe
@@ -185962,7 +190967,7 @@ self: {
license = stdenv.lib.licenses.gpl2;
}) {};
- "yi-language_0_13_3" = callPackage
+ "yi-language_0_13_5" = callPackage
({ mkDerivation, alex, array, base, binary, containers
, data-default, hashable, microlens-platform, oo-prototypes
, pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec
@@ -185971,8 +190976,8 @@ self: {
}:
mkDerivation {
pname = "yi-language";
- version = "0.13.3";
- sha256 = "06d3c328777bed0fb1c0ab8a7fabfed6603fa6cfc4d50f3195c85e9bae99cc5f";
+ version = "0.13.5";
+ sha256 = "d599c10c37cc829dba86c9e35da6d58a6e84c99aaab18a5a8418d4baab22fcfd";
libraryHaskellDepends = [
array base binary containers data-default hashable
microlens-platform oo-prototypes pointedlist regex-base regex-tdfa
@@ -185992,18 +190997,19 @@ self: {
}) {};
"yi-misc-modes" = callPackage
- ({ mkDerivation, array, base, binary, data-default, filepath
+ ({ mkDerivation, alex, array, base, binary, data-default, filepath
, microlens-platform, semigroups, text, yi-core, yi-language
, yi-rope
}:
mkDerivation {
pname = "yi-misc-modes";
- version = "0.13.3";
- sha256 = "94993c405dccbc2aa4f5077096560c68219414a2d747f84a195b4fd556f7e63e";
+ version = "0.13.5";
+ sha256 = "5889c2011813f37d58311a52714c5d8f165e6a0640b7af4752190d9d3db921a9";
libraryHaskellDepends = [
array base binary data-default filepath microlens-platform
semigroups text yi-core yi-language yi-rope
];
+ libraryToolDepends = [ alex ];
homepage = "https://github.com/yi-editor/yi#readme";
description = "Yi editor miscellaneous modes";
license = stdenv.lib.licenses.gpl2;
@@ -186011,20 +191017,21 @@ self: {
}) {};
"yi-mode-haskell" = callPackage
- ({ mkDerivation, array, base, binary, containers, data-default
- , filepath, hashable, hspec, microlens-platform, pointedlist
- , QuickCheck, regex-base, regex-tdfa, template-haskell, text
- , transformers-base, unordered-containers, yi-core, yi-language
- , yi-rope
+ ({ mkDerivation, alex, array, base, binary, containers
+ , data-default, filepath, hashable, hspec, microlens-platform
+ , pointedlist, QuickCheck, regex-base, regex-tdfa, template-haskell
+ , text, transformers-base, unordered-containers, yi-core
+ , yi-language, yi-rope
}:
mkDerivation {
pname = "yi-mode-haskell";
- version = "0.13.3";
- sha256 = "438ff92a24aef5e3cb7a8aa0046014b8f40927f046a612f830a20fb2ef9a6fde";
+ version = "0.13.5";
+ sha256 = "4323b34b6ae45391072300d9ba8350df8237fc5984fa4ad962bcfd20f2046f99";
libraryHaskellDepends = [
array base binary data-default microlens-platform text yi-core
yi-language yi-rope
];
+ libraryToolDepends = [ alex ];
testHaskellDepends = [
array base binary containers data-default filepath hashable hspec
microlens-platform pointedlist QuickCheck regex-base regex-tdfa
@@ -186038,17 +191045,19 @@ self: {
}) {};
"yi-mode-javascript" = callPackage
- ({ mkDerivation, array, base, binary, data-default, dlist, filepath
- , microlens-platform, mtl, text, yi-core, yi-language, yi-rope
+ ({ mkDerivation, alex, array, base, binary, data-default, dlist
+ , filepath, microlens-platform, mtl, text, yi-core, yi-language
+ , yi-rope
}:
mkDerivation {
pname = "yi-mode-javascript";
- version = "0.13.3";
- sha256 = "1a24664cf2d65732b5575bd4ab3bc92d3897a3c6af4bc93296945429b5c974f3";
+ version = "0.13.5";
+ sha256 = "156db2b03fb06ce12bb6e17a0b07c7acdac42a29734b714860777e234c86381c";
libraryHaskellDepends = [
array base binary data-default dlist filepath microlens-platform
mtl text yi-core yi-language yi-rope
];
+ libraryToolDepends = [ alex ];
homepage = "https://github.com/yi-editor/yi#readme";
description = "Yi editor javascript mode";
license = stdenv.lib.licenses.gpl2;
@@ -186114,8 +191123,8 @@ self: {
}:
mkDerivation {
pname = "yi-snippet";
- version = "0.13.3";
- sha256 = "0373adb2e93de479995cc64299106a3fb2ba2dbfb5abb87d811ef13f47a39077";
+ version = "0.13.5";
+ sha256 = "f3b67c88c01a6c190013870ae7dd371ccc77f619c73247effb9c3e2d36a6ab13";
libraryHaskellDepends = [
base binary containers data-default free lens mtl text vector
yi-core yi-rope
@@ -186812,8 +191821,8 @@ self: {
}:
mkDerivation {
pname = "zip";
- version = "0.1.3";
- sha256 = "9e7a79126ab12c198efcae67dd07f860213ce5a6afb2217053f0342ffdb9e6d1";
+ version = "0.1.4";
+ sha256 = "073c9f8320ed16048d099fbec10c42a76ae0bcbd13e344fd0ca99f3a6716db78";
libraryHaskellDepends = [
base bytestring bzlib-conduit case-insensitive cereal conduit
conduit-extra containers digest exceptions filepath mtl path
@@ -186917,6 +191926,7 @@ self: {
homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
description = "Generic zipper for families of recursive datatypes";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"zippers" = callPackage
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index bf7fd18f820..a0b90962829 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -23,8 +23,8 @@
# This will build mmorph and monadControl, and have the hoogle installation
# refer to their documentation via symlink so they are not garbage collected.
-{ lib, stdenv, hoogle, writeText
-, ghc, packages ? [ ghc.ghc ]
+{ lib, stdenv, hoogle, writeText, ghc
+, packages
}:
let
@@ -51,6 +51,9 @@ let
else writeText "ghcjs-prologue.txt" ''
This index includes documentation for many Haskell modules.
'';
+
+ docPackages = lib.closePropagation packages;
+
in
stdenv.mkDerivation {
name = "hoogle-local-0.1";
@@ -58,14 +61,9 @@ stdenv.mkDerivation {
phases = [ "buildPhase" ];
- docPackages = (lib.closePropagation packages);
+ inherit docPackages;
buildPhase = ''
- if [ -z "$docPackages" ]; then
- echo "ERROR: The packages attribute has not been set"
- exit 1
- fi
-
mkdir -p $out/share/doc/hoogle
echo importing builtin packages
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 66e151aefe3..7929d99de15 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/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index 1a05f19bd82..2386cc27155 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -26,7 +26,7 @@ assert x11Support -> (libX11 != null && libXau != null && libXt != null
stdenv.mkDerivation rec {
v = "2.49";
name = "clisp-${v}";
-
+
src = fetchurl {
url = "mirror://gnu/clisp/release/${v}/${name}.tar.bz2";
sha256 = "8132ff353afaa70e6b19367a25ae3d5a43627279c25647c220641fed00f8e890";
@@ -92,6 +92,7 @@ stdenv.mkDerivation rec {
description = "ANSI Common Lisp Implementation";
homepage = http://clisp.cons.org;
maintainers = with stdenv.lib.maintainers; [raskin tohl];
- platforms = stdenv.lib.platforms.unix;
+ # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
+ platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix
new file mode 100644
index 00000000000..5745ea5d98b
--- /dev/null
+++ b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix
@@ -0,0 +1,100 @@
+{ stdenv, fetchurl, fetchFromGitHub, 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 = "16B02";
+
+ src = fetchFromGitHub {
+ owner = "basho";
+ repo = "otp";
+ rev = "OTP_R16B02_basho8";
+ sha256 = "1w0hbm0axxxa45v3kl6bywc9ayir5vwqxjpnjlzc616ldszb2m0x";
+ };
+
+ debugInfo = enableDebugInfo;
+
+ buildInputs =
+ [ perl gnum4 ncurses openssl makeWrapper autoconf264 gcc
+ ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ]
+ ++ optional odbcSupport [ unixODBC ]
+ ++ optionals stdenv.isDarwin [ Carbon Cocoa ];
+
+ 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 = "12apxjmmd591y9g9bhr97z5jbd1jarqg7wj0y2sqhl21hc1yp75p";
+ };
+ 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 56b4626a212..57323a587f8 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 5d9c5dac3d8..f9b6edc3fa4 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 ddeccb29b59..824c6868880 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/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix
index bed5b0ef0b3..4c4a4a0c894 100644
--- a/pkgs/development/interpreters/falcon/default.nix
+++ b/pkgs/development/interpreters/falcon/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }:
stdenv.mkDerivation rec {
- name = "faclon-${version}";
+ name = "falcon-${version}";
version = "2013-09-19";
src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix
index 789f349fb16..bfb975f152a 100644
--- a/pkgs/development/interpreters/gnu-apl/default.nix
+++ b/pkgs/development/interpreters/gnu-apl/default.nix
@@ -11,6 +11,15 @@ stdenv.mkDerivation rec {
buildInputs = [ readline gettext ncurses ];
+ patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+ substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h"
+ '';
+
+ configureFlags = stdenv.lib.optionals stdenv.isDarwin [
+ "--disable-dependency-tracking"
+ "--disable-silent-rules"
+ ];
+
postInstall = ''
cp -r support-files/ $out/share/doc/
find $out/share/doc/support-files -name 'Makefile*' -delete
@@ -21,7 +30,7 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/apl/;
license = licenses.gpl3Plus;
maintainers = [ maintainers.kovirobi ];
- platforms = stdenv.lib.platforms.linux;
+ platforms = with stdenv.lib.platforms; linux ++ darwin;
inherit version;
longDescription = ''
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index 78d154bb654..a883080f58e 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/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 391885a4404..790951ff699 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
-, libffi, gawk, makeWrapper, coverageAnalysis ? null, gnu ? null }:
+, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null }:
# Do either a coverage analysis build or a standard build.
(if coverageAnalysis != null
@@ -53,7 +53,8 @@
'';
# make check doesn't work on darwin
- doCheck = !stdenv.isDarwin;
+ # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.
+ doCheck = false;
setupHook = ./setup-hook-2.0.sh;
diff --git a/pkgs/development/interpreters/lfe/default.nix b/pkgs/development/interpreters/lfe/default.nix
index c7957275f9e..cafcc4c28ee 100644
--- a/pkgs/development/interpreters/lfe/default.nix
+++ b/pkgs/development/interpreters/lfe/default.nix
@@ -1,19 +1,33 @@
-{ stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash }:
+{ stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, beamPackages }:
-stdenv.mkDerivation rec {
- name = "lfe-${version}";
- version = "1.1.1";
+let
+ inherit (beamPackages) buildRebar3 buildHex;
+ proper = buildHex rec {
+ name = "proper";
+ version = "1.1.1-beta";
+ sha256 = "0hnkhs761yjynw9382w8wm4j3x0r7lllzavaq2kh9n7qy3zc1rdx";
+
+ configurePhase = ''
+ ${erlang}/bin/escript write_compile_flags include/compile_flags.hrl
+ '';
+ };
+in
+buildRebar3 rec {
+ name = "lfe";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "rvirding";
- repo = "lfe";
+ repo = name;
rev = version;
- sha256 = "0w1vpjqj8ni43gi84i0mcml4gfaqhmmd9s46di37cngpdw86i3bz";
+ sha256 = "0j5gjlsk92y14kxgvd80q9vwyhmjkphpzadcswyjxikgahwg1avz";
};
- buildInputs = [ erlang makeWrapper ];
-
- setupHook = ./setup-hook.sh;
+ buildInputs = [ makeWrapper ];
+ beamDeps = [ proper ];
+ patches = [ ./no-test-deps.patch ];
+ doCheck = true;
+ checkTarget = "travis";
# These installPhase tricks are based on Elixir's Makefile.
# TODO: Make, upload, and apply a patch.
@@ -24,7 +38,7 @@ stdenv.mkDerivation rec {
rm -Rf $ebindir
install -m755 -d $ebindir
- install -m644 ebin/* $ebindir
+ install -m644 _build/default/lib/lfe/ebin/* $ebindir
install -m755 -d $bindir
for bin in bin/lfe{,c,doc,script}; do install -m755 $bin $bindir; done
diff --git a/pkgs/development/interpreters/lfe/no-test-deps.patch b/pkgs/development/interpreters/lfe/no-test-deps.patch
new file mode 100644
index 00000000000..8c3faf1ff40
--- /dev/null
+++ b/pkgs/development/interpreters/lfe/no-test-deps.patch
@@ -0,0 +1,13 @@
+diff --git a/rebar.config b/rebar.config
+index 1d5a68e..ca33be7 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -2,7 +2,7 @@
+
+ {erl_opts, [debug_info]}.
+
+-{profiles, [{test, [{deps, [proper]}]}]}.
++%% {profiles, [{test, [{deps, [proper]}]}]}.
+
+ {pre_hooks, [{"(linux|darwin|solaris|freebsd|netbsd|openbsd)", ct,
+ "bin/lfe bin/lfec"
diff --git a/pkgs/development/interpreters/lfe/setup-hook.sh b/pkgs/development/interpreters/lfe/setup-hook.sh
deleted file mode 100644
index 2405dcea15f..00000000000
--- a/pkgs/development/interpreters/lfe/setup-hook.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-addLfeLibPath() {
- addToSearchPath ERL_LIBS $1/lib/lfe/lib
-}
-
-envHooks+=(addLfeLibPath)
diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index adf743848d1..6da5c265aaf 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "luajit-${version}";
- version = "2.1.0-beta1";
+ version = "2.1.0-beta2";
luaversion = "5.1";
src = fetchurl {
url = "http://luajit.org/download/LuaJIT-${version}.tar.gz";
- sha256 = "06170d38387c59d1292001a166e7f5524f5c5deafa8705a49a46fa42905668dd";
+ sha256 = "0iyghj1xjlmd9ywa4flf9yszynf3jhbp0yqb9b49k7ab0g528fbi";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix
index b8359488725..0a87d037454 100644
--- a/pkgs/development/interpreters/mujs/default.nix
+++ b/pkgs/development/interpreters/mujs/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchgit, clang }:
stdenv.mkDerivation rec {
- name = "mujs-2016-09-21";
+ name = "mujs-2016-11-30";
src = fetchgit {
url = git://git.ghostscript.com/mujs.git;
- rev = "5c337af4b3df80cf967e4f9f6a21522de84b392a";
- sha256 = "1x5g6nycggc83md2dbr2nahjbkkmmn64bg25a8hih7z72sw41dgw";
+ rev = "a0ceaf5050faf419401fe1b83acfa950ec8a8a89";
+ sha256 = "13abghhqrivaip4h0fav80i8hid220dj0ddc1xnhn6w9rbnrriyg";
};
buildInputs = [ clang ];
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 96c85704f5e..1a5bed6d20b 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -302,12 +302,17 @@ let
in {
php56 = generic {
- version = "5.6.27";
- sha256 = "0g1adx231c738694gc4bh8x65c7fwsqdbm42n9xwrsdncyhd6xrv";
+ version = "5.6.29";
+ sha256 = "1fr530x1hxpaf0gb1ayrs9a4xa9v14dfb4hn2560dgm7i96896s9";
};
php70 = generic {
- version = "7.0.12";
- sha256 = "09va788b9zk5igzmsfxr593ly174qf9kmihd4fq3kclgzsa75i1q";
+ version = "7.0.14";
+ sha256 = "0d0596vzpyw86a77smk799sxl4mh2wylzsvmrv8mzda21nd3di7v";
+ };
+
+ php71 = generic {
+ version = "7.1.0";
+ sha256 = "0qcf4aahkiwypidw42pd5dz34n10296zgjfyh56lgcymxryzvg38";
};
}
diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix
index 9c669ceed68..04aca84f902 100644
--- a/pkgs/development/interpreters/picolisp/default.nix
+++ b/pkgs/development/interpreters/picolisp/default.nix
@@ -3,10 +3,10 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "picoLisp-${version}";
- version = "15.11";
+ version = "16.6";
src = fetchurl {
url = "http://www.software-lab.de/${name}.tgz";
- sha256 = "0gi1n7gl786wbz6sn0f0002h49f0zvfrzxlhabkghwlbva1rwp58";
+ sha256 = "0y9b4wqpgx0j0igbp4h7k0bw3hvp7dnrhl3fsaagjpp305b003z3";
};
buildInputs = optional stdenv.is64bit jdk;
patchPhase = optionalString stdenv.isArm ''
diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix
index c3da770a6e1..7cb2a356f95 100644
--- a/pkgs/development/interpreters/pixie/default.nix
+++ b/pkgs/development/interpreters/pixie/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchurl, python, makeWrapper, pkgconfig, gcc,
+{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkgconfig, gcc,
pypy, libffi, libedit, libuv, boost, zlib,
variant ? "jit", buildWithPypy ? false }:
@@ -36,7 +36,7 @@ let
buildInputs = [ pkgconfig makeWrapper ];
PYTHON = if buildWithPypy
then "${pypy}/pypy-c/.pypy-c-wrapped"
- else "${python}/bin/python";
+ else "${python2.interpreter}";
unpackPhase = ''
cp -R ${pixie-src} pixie-src
mkdir pypy-src
diff --git a/pkgs/development/interpreters/python/build-python-package-common.nix b/pkgs/development/interpreters/python/build-python-package-common.nix
new file mode 100644
index 00000000000..2b383fe985d
--- /dev/null
+++ b/pkgs/development/interpreters/python/build-python-package-common.nix
@@ -0,0 +1,32 @@
+# This function provides generic bits to install a Python wheel.
+
+{ python
+, bootstrapped-pip
+}:
+
+{ buildInputs ? []
+# Additional flags to pass to "pip install".
+, installFlags ? []
+, ... } @ attrs:
+
+attrs // {
+ buildInputs = buildInputs ++ [ bootstrapped-pip ];
+
+ configurePhase = attrs.configurePhase or ''
+ runHook preConfigure
+ runHook postConfigure
+ '';
+
+ installPhase = attrs.installPhase or ''
+ runHook preInstall
+
+ mkdir -p "$out/${python.sitePackages}"
+ export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"
+
+ pushd dist
+ ${bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out --no-cache ${toString installFlags} --build tmpbuild
+ popd
+
+ runHook postInstall
+ '';
+}
diff --git a/pkgs/development/interpreters/python/build-python-package-flit.nix b/pkgs/development/interpreters/python/build-python-package-flit.nix
new file mode 100644
index 00000000000..8628c3df769
--- /dev/null
+++ b/pkgs/development/interpreters/python/build-python-package-flit.nix
@@ -0,0 +1,19 @@
+# This function provides specific bits for building a flit-based Python package.
+
+{ flit
+}:
+
+{ ... } @ attrs:
+
+attrs // {
+ buildInputs = [ flit ];
+ buildPhase = attrs.buildPhase or ''
+ runHook preBuild
+ flit wheel
+ runHook postBuild
+ '';
+
+ # Flit packages do not come with tests.
+ installCheckPhase = attrs.checkPhase or ":";
+ doCheck = attrs.doCheck or false;
+}
\ No newline at end of file
diff --git a/pkgs/development/interpreters/python/build-python-package-setuptools.nix b/pkgs/development/interpreters/python/build-python-package-setuptools.nix
new file mode 100644
index 00000000000..f077533ecfe
--- /dev/null
+++ b/pkgs/development/interpreters/python/build-python-package-setuptools.nix
@@ -0,0 +1,56 @@
+# This function provides specific bits for building a setuptools-based Python package.
+
+{ lib
+, python
+, bootstrapped-pip
+}:
+
+{
+# passed to "python setup.py build_ext"
+# https://github.com/pypa/pip/issues/881
+ setupPyBuildFlags ? []
+# Execute before shell hook
+, preShellHook ? ""
+# Execute after shell hook
+, postShellHook ? ""
+, ... } @ attrs:
+
+let
+ # use setuptools shim (so that setuptools is imported before distutils)
+ # pip does the same thing: https://github.com/pypa/pip/pull/3265
+ setuppy = ./run_setup.py;
+
+in attrs // {
+ # we copy nix_run_setup.py over so it's executed relative to the root of the source
+ # many project make that assumption
+ buildPhase = attrs.buildPhase or ''
+ runHook preBuild
+ cp ${setuppy} nix_run_setup.py
+ ${python.interpreter} nix_run_setup.py ${lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags))} bdist_wheel
+ runHook postBuild
+ '';
+
+ installCheckPhase = attrs.checkPhase or ''
+ runHook preCheck
+ ${python.interpreter} nix_run_setup.py test
+ runHook postCheck
+ '';
+
+ # Python packages that are installed with setuptools
+ # are typically distributed with tests.
+ # With Python it's a common idiom to run the tests
+ # after the software has been installed.
+ doCheck = attrs.doCheck or true;
+
+ shellHook = attrs.shellHook or ''
+ ${preShellHook}
+ if test -e setup.py; then
+ tmp_path=$(mktemp -d)
+ export PATH="$tmp_path/bin:$PATH"
+ export PYTHONPATH="$tmp_path/${python.sitePackages}:$PYTHONPATH"
+ mkdir -p $tmp_path/${python.sitePackages}
+ ${bootstrapped-pip}/bin/pip install -e . --prefix $tmp_path
+ fi
+ ${postShellHook}
+ '';
+}
\ No newline at end of file
diff --git a/pkgs/development/interpreters/python/build-python-package-wheel.nix b/pkgs/development/interpreters/python/build-python-package-wheel.nix
new file mode 100644
index 00000000000..7be0a4c304a
--- /dev/null
+++ b/pkgs/development/interpreters/python/build-python-package-wheel.nix
@@ -0,0 +1,20 @@
+# This function provides specific bits for building a wheel-based Python package.
+
+{
+}:
+
+{ ... } @ attrs:
+
+attrs // {
+ unpackPhase = ''
+ mkdir dist
+ cp $src dist/"''${src#*-}"
+ '';
+
+ # Wheels are pre-compiled
+ buildPhase = attrs.buildPhase or ":";
+ installCheckPhase = attrs.checkPhase or ":";
+
+ # Wheels don't have any checks to run
+ doCheck = attrs.doCheck or false;
+}
\ No newline at end of file
diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix
index a92296cedba..e15405e2981 100644
--- a/pkgs/development/interpreters/python/build-python-package.nix
+++ b/pkgs/development/interpreters/python/build-python-package.nix
@@ -7,120 +7,31 @@
, python
, mkPythonDerivation
, bootstrapped-pip
+, flit
}:
-{ buildInputs ? []
-
-# propagate build dependencies so in case we have A -> B -> C,
-# C can import package A propagated by B
-#, propagatedBuildInputs ? []
-
-# passed to "python setup.py build_ext"
-# https://github.com/pypa/pip/issues/881
-, setupPyBuildFlags ? []
-
-# Execute before shell hook
-, preShellHook ? ""
-
-# Execute after shell hook
-, postShellHook ? ""
-
-# Additional flags to pass to "pip install".
-, installFlags ? []
-
-, format ? "setup"
+let
+ setuptools-specific = import ./build-python-package-setuptools.nix { inherit lib python bootstrapped-pip; };
+ flit-specific = import ./build-python-package-flit.nix { inherit flit; };
+ wheel-specific = import ./build-python-package-wheel.nix { };
+ common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; };
+in
+{
+# Several package formats are supported.
+# "setuptools" : Install a common setuptools/distutils based package. This builds a wheel.
+# "wheel" : Install from a pre-compiled wheel.
+# "flit" : Install a flit package. This builds a wheel.
+# "other" : Provide your own buildPhase and installPhase.
+format ? "setuptools"
, ... } @ attrs:
-
-
-
let
- # use setuptools shim (so that setuptools is imported before distutils)
- # pip does the same thing: https://github.com/pypa/pip/pull/3265
- setuppy = ./run_setup.py;
-
formatspecific =
- if format == "wheel" then
- {
- unpackPhase = ''
- mkdir dist
- cp $src dist/"''${src#*-}"
- '';
+ if format == "setuptools" then common (setuptools-specific attrs)
+ else if format == "flit" then common (flit-specific attrs)
+ else if format == "wheel" then common (wheel-specific attrs)
+ else if format == "other" then {}
+ else throw "Unsupported format ${format}";
- # Wheels are pre-compiled
- buildPhase = attrs.buildPhase or ":";
- installCheckPhase = attrs.checkPhase or ":";
-
- # Wheels don't have any checks to run
- doCheck = attrs.doCheck or false;
- }
- else if format == "setup" then
- {
- # we copy nix_run_setup.py over so it's executed relative to the root of the source
- # many project make that assumption
- buildPhase = attrs.buildPhase or ''
- runHook preBuild
- cp ${setuppy} nix_run_setup.py
- ${python.interpreter} nix_run_setup.py ${lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags))} bdist_wheel
- runHook postBuild
- '';
-
- installCheckPhase = attrs.checkPhase or ''
- runHook preCheck
- ${python.interpreter} nix_run_setup.py test
- runHook postCheck
- '';
-
- # Python packages that are installed with setuptools
- # are typically distributed with tests.
- # With Python it's a common idiom to run the tests
- # after the software has been installed.
- doCheck = attrs.doCheck or true;
- }
- else
- throw "Unsupported format ${format}";
-
-in mkPythonDerivation ( attrs // {
-
- # To build and install a wheel we need pip
- buildInputs = buildInputs ++ [ bootstrapped-pip ];
-
-#inherit propagatedBuildInputs;
-
- configurePhase = attrs.configurePhase or ''
- runHook preConfigure
-
- # patch python interpreter to write null timestamps when compiling python files
- # this way python doesn't try to update them when we freeze timestamps in nix store
- export DETERMINISTIC_BUILD=1
-
- runHook postConfigure
- '';
-
- installPhase = attrs.installPhase or ''
- runHook preInstall
-
- mkdir -p "$out/${python.sitePackages}"
- export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"
-
- pushd dist
- ${bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out --no-cache ${toString installFlags}
- popd
-
- runHook postInstall
- '';
-
- shellHook = attrs.shellHook or ''
- ${preShellHook}
- if test -e setup.py; then
- tmp_path=$(mktemp -d)
- export PATH="$tmp_path/bin:$PATH"
- export PYTHONPATH="$tmp_path/${python.sitePackages}:$PYTHONPATH"
- mkdir -p $tmp_path/${python.sitePackages}
- ${bootstrapped-pip}/bin/pip install -e . --prefix $tmp_path
- fi
- ${postShellHook}
- '';
-
-} // formatspecific)
+in mkPythonDerivation ( attrs // formatspecific )
\ No newline at end of file
diff --git a/pkgs/development/interpreters/python/cpython/2.6/default.nix b/pkgs/development/interpreters/python/cpython/2.6/default.nix
index 64f2b80d09f..9a4c2d5b398 100644
--- a/pkgs/development/interpreters/python/cpython/2.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.6/default.nix
@@ -1,6 +1,8 @@
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false
, sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage
-, python26Packages }:
+# For the Python package set
+, pkgs, packageOverrides ? (self: super: {})
+}:
assert zlibSupport -> zlib != null;
@@ -100,13 +102,16 @@ let
${ optionalString includeModules "$out/bin/python ./setup.py build_ext"}
'';
- passthru = rec {
+ passthru = let
+ pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
+ in rec {
inherit libPrefix;
inherit zlibSupport;
isPy2 = true;
isPy26 = true;
buildEnv = callPackage ../../wrapper.nix { python = self; };
- withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python26Packages; };
+ withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
+ pkgs = pythonPackages;
executable = libPrefix;
sitePackages = "lib/${libPrefix}/site-packages";
interpreter = "${self}/bin/${executable}";
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index a6eeee25be9..4a25382997c 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -10,12 +10,13 @@
, zlib
, callPackage
, self
-, python27Packages
, gettext
, db
, expat
, libffi
, CF, configd, coreutils
+# For the Python package set
+, pkgs, packageOverrides ? (self: super: {})
}:
assert x11Support -> tcl != null
@@ -180,11 +181,14 @@ in stdenv.mkDerivation {
rm "$out"/lib/python*/plat-*/regen # refers to glibc.dev
'';
- passthru = rec {
+ passthru = let
+ pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
+ in rec {
inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch;
executable = libPrefix;
buildEnv = callPackage ../../wrapper.nix { python = self; };
- withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python27Packages; };
+ withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
+ pkgs = pythonPackages;
isPy2 = true;
isPy27 = true;
interpreter = "${self}/bin/${executable}";
diff --git a/pkgs/development/interpreters/python/cpython/3.3/default.nix b/pkgs/development/interpreters/python/cpython/3.3/default.nix
index b25e2ffd0cb..6a543a8a0ee 100644
--- a/pkgs/development/interpreters/python/cpython/3.3/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.3/default.nix
@@ -10,8 +10,9 @@
, zlib
, callPackage
, self
-, python33Packages
, CF, configd
+# For the Python package set
+, pkgs, packageOverrides ? (self: super: {})
}:
assert x11Support -> tcl != null
@@ -102,11 +103,14 @@ in stdenv.mkDerivation {
'';
- passthru = rec {
+ passthru = let
+ pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
+ in rec {
inherit libPrefix sitePackages x11Support;
executable = "${libPrefix}m";
buildEnv = callPackage ../../wrapper.nix { python = self; };
- withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python33Packages; };
+ withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
+ pkgs = pythonPackages;
isPy3 = true;
isPy33 = true;
is_py3k = true; # deprecated
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 43edce8a44c..623fa5d74f6 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -10,8 +10,9 @@
, zlib
, callPackage
, self
-, python34Packages
, CF, configd
+# For the Python package set
+, pkgs, packageOverrides ? (self: super: {})
}:
assert x11Support -> tcl != null
@@ -111,11 +112,14 @@ in stdenv.mkDerivation {
'';
- passthru = rec {
+ passthru = let
+ pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
+ in rec {
inherit libPrefix sitePackages x11Support;
executable = "${libPrefix}m";
buildEnv = callPackage ../../wrapper.nix { python = self; };
- withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python34Packages; };
+ withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
+ pkgs = pythonPackages;
isPy3 = true;
isPy34 = true;
is_py3k = true; # deprecated
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index dd2cce707ef..7172e429f23 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -10,8 +10,9 @@
, zlib
, callPackage
, self
-, python35Packages
, CF, configd
+# For the Python package set
+, pkgs, packageOverrides ? (self: super: {})
}:
assert x11Support -> tcl != null
@@ -110,11 +111,14 @@ in stdenv.mkDerivation {
rm $out/lib/python${majorVersion}/__pycache__/_sysconfigdata.cpython*
'';
- passthru = rec {
+ passthru = let
+ pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
+ in rec {
inherit libPrefix sitePackages x11Support;
executable = "${libPrefix}m";
buildEnv = callPackage ../../wrapper.nix { python = self; };
- withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python35Packages; };
+ withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
+ pkgs = pythonPackages;
isPy3 = true;
isPy35 = true;
interpreter = "${self}/bin/${executable}";
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index d5960ccde99..4654a6e1cb6 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -11,8 +11,9 @@
, zlib
, callPackage
, self
-, python36Packages
, CF, configd
+# For the Python package set
+, pkgs, packageOverrides ? (self: super: {})
}:
assert x11Support -> tcl != null
@@ -24,7 +25,7 @@ with stdenv.lib;
let
majorVersion = "3.6";
minorVersion = "0";
- minorVersionSuffix = "b2";
+ minorVersionSuffix = "rc1";
pythonVersion = majorVersion;
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
libPrefix = "python${majorVersion}";
@@ -44,7 +45,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
- sha256 = "1sk990n2xm5vhn3ys2cp427dx0z14cx3sz1za5f2fcwrp524bz9s";
+ sha256 = "01sqzz5iq7law93zgdxkb8sv98a493a2wzslynz64cl3hhdqr1pw";
};
NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
@@ -99,11 +100,14 @@ in stdenv.mkDerivation {
ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
'';
- passthru = rec {
+ passthru = let
+ pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
+ in rec {
inherit libPrefix sitePackages x11Support;
executable = "${libPrefix}m";
buildEnv = callPackage ../../wrapper.nix { python = self; };
- withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python36Packages; };
+ withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
+ pkgs = pythonPackages;
isPy3 = true;
isPy35 = true;
is_py3k = true; # deprecated
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 0f798c63e8f..c8fedaf75fc 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -57,6 +57,10 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
inherit pythonPath;
+ # patch python interpreter to write null timestamps when compiling python files
+ # this way python doesn't try to update them when we freeze timestamps in nix store
+ DETERMINISTIC_BUILD=1;
+
buildInputs = [ wrapPython ] ++ buildInputs ++ pythonPath
++ [ (ensureNewerSourcesHook { year = "1980"; }) ]
++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip)
diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix
index bce6d19d58d..1fd9eaee430 100644
--- a/pkgs/development/interpreters/python/pypy/2.7/default.nix
+++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix
@@ -1,6 +1,9 @@
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
, sqlite, openssl, ncurses, python, expat, tcl, tk, xlibsWrapper, libX11
-, makeWrapper, callPackage, self, pypyPackages, gdbm, db }:
+, makeWrapper, callPackage, self, gdbm, db
+# For the Python package set
+, pkgs, packageOverrides ? (self: super: {})
+}:
assert zlibSupport -> zlib != null;
@@ -120,14 +123,17 @@ let
echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py
'';
- passthru = rec {
+ passthru = let
+ pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
+ in rec {
inherit zlibSupport libPrefix;
executable = "pypy";
isPypy = true;
buildEnv = callPackage ../../wrapper.nix { python = self; };
interpreter = "${self}/bin/${executable}";
sitePackages = "site-packages";
- withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = pypyPackages; };
+ withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
+ pkgs = pythonPackages;
};
enableParallelBuilding = true; # almost no parallelization without STM
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 336c861bbdc..9486d030a8b 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -211,11 +211,11 @@ in {
};
};
- ruby_2_3_1 = generic {
- version = rubyVersion "2" "3" "1" "";
+ ruby_2_3_3 = generic {
+ version = rubyVersion "2" "3" "3" "";
sha256 = {
- src = "1kbxg72las93w0y553cxv3lymy2wvij3i3pg1y9g8aq3na676z5q";
- git = "0dv1rf5f9lj3icqs51bq7ljdcf17sdclmxm9hilwxps5l69v5q9r";
+ src = "1dqmh42p6siv9aqzdjldsnhljj3f2h30m0v8cf25icjmqp40h514";
+ git = "0cwjf0nrzaa5g81bw0qp65byyadhxvbnvprkshv3ckjl7yi46zf6";
};
};
}
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 4c1321b5b87..d21e7d669dc 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -60,4 +60,9 @@ rec {
"${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
];
+ "2.3.3" = ops useRailsExpress [
+ "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
+ "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
+ "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
+ ];
}
diff --git a/pkgs/development/interpreters/ruby/rubygems-src.nix b/pkgs/development/interpreters/ruby/rubygems-src.nix
index 59b2becdc6e..7ea52185d77 100644
--- a/pkgs/development/interpreters/ruby/rubygems-src.nix
+++ b/pkgs/development/interpreters/ruby/rubygems-src.nix
@@ -1,6 +1,6 @@
{ fetchurl
-, version ? "2.6.6"
-, sha256 ? "0x0ldlwr627d0brw96jdbscib6d2nk19izvnh8lzsasszi1k5rkq"
+, version ? "2.6.8"
+, sha256 ? "1v6n6s8cq5l0xyf1fbm1w4752b9vdk3p130ar59ig72p9vqvkbl1"
}:
fetchurl {
url = "http://production.cf.rubygems.org/rubygems/rubygems-${version}.tgz";
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 24ba479186e..00000000000
--- 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 582e7039d17..3c5eef01db0 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 279528e9e83..6e354c54296 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 f52d526e3fa..585ebc120d8 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 00000000000..89c02f26200
--- /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 a764cfc69cb..00000000000
--- 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 1fe4b90b2b8..00000000000
--- 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/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix
index 1f290bf7044..4875d9ab5a1 100644
--- a/pkgs/development/libraries/SDL_ttf/default.nix
+++ b/pkgs/development/libraries/SDL_ttf/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
description = "SDL TrueType library";
license = licenses.zlib;
platforms = platforms.all;
- homepage = https://www.libsdl.org/projects/SDL_ttf/release-1.2.html;
+ homepage = "https://www.libsdl.org/projects/SDL_ttf/release-1.2.html";
maintainers = with maintainers; [ abbradar ];
};
}
diff --git a/pkgs/development/libraries/allegro/5-unstable.nix b/pkgs/development/libraries/allegro/5-unstable.nix
deleted file mode 100644
index e5a2c38ddab..00000000000
--- a/pkgs/development/libraries/allegro/5-unstable.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto
-, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
-, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
-, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac
-, inputproto, libXi, fixesproto, libXfixes }:
-
-stdenv.mkDerivation rec {
- name = "allegro-${version}";
- version = "5.1.11";
-
- src = fetchurl {
- url = "http://download.gna.org/allegro/allegro-unstable/${version}/${name}.tar.gz";
- sha256 = "0zz07gdyc6xflpvkknwgzsyyyh9qiwd69j42rm9cw1ciwcsic1vs";
- };
-
- buildInputs = [
- texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor
- alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
- xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa
- kbproto libjpeg flac inputproto libXi fixesproto libXfixes
- ];
-
- patchPhase = ''
- sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c
- '';
-
- cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ];
-
- meta = with stdenv.lib; {
- description = "A game programming library";
- homepage = http://liballeg.org/;
- license = licenses.zlib;
- maintainers = [ maintainers.raskin ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 6f05afa4f48..7efccfad243 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -1,15 +1,19 @@
{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto
, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
-, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac }:
+, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac
+, inputproto, libXi, fixesproto, libXfixes, freetype, libopus, libtheora
+, physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs
+, libXdmcp
+}:
stdenv.mkDerivation rec {
name = "allegro-${version}";
- version = "5.0.11";
+ version = "5.2.1.1";
src = fetchurl {
url = "http://download.gna.org/allegro/allegro/${version}/${name}.tar.gz";
- sha256 = "0cd51qrh97jrr0xdmnivqgwljpmizg8pixsgvc4blqqlaz4i9zj9";
+ sha256 = "0waalic7lyaf6i33nikmkc29bndci5c5090c4ra2vmy67cqdzndm";
};
buildInputs = [
@@ -17,8 +21,15 @@ stdenv.mkDerivation rec {
alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa
kbproto libjpeg flac
+ inputproto libXi fixesproto libXfixes
+ enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp
+ libpulseaudio libpthreadstubs
];
+ patchPhase = ''
+ sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c
+ '';
+
cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ];
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index 34d6f23699f..e44ad424e0c 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }:
let
- ver_maj = "2.20";
+ ver_maj = "2.22";
ver_min = "0";
in
stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz";
- sha256 = "493a50f6c4a025f588d380a551ec277e070b28a82e63ef8e3c06b3ee7c1238f0";
+ sha256 = "d349f5ca4974c9c76a4963e5b254720523b0c78672cbc0e1a3475dbd9b3d44b6";
};
enableParallelBuilding = true;
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib gobjectIntrospection /*ToDo: why propagate*/ ];
- #doCheck = true; # no checks in there (2.10.0)
+ #doCheck = true; # no checks in there (2.22.0)
meta = {
description = "Accessibility toolkit";
diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix
index a10d730d06e..e1cfb488be8 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/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 948cbacf876..d5d7371aebf 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, curl
+{ lib, stdenv, fetchFromGitHub, cmake, curl, libuuid, openssl, zlib
, # Allow building a limited set of APIs, e.g. ["s3" "ec2"].
apis ? ["*"]
, # Whether to enable AWS' custom memory management.
@@ -7,25 +7,25 @@
stdenv.mkDerivation rec {
name = "aws-sdk-cpp-${version}";
- version = "0.10.6";
+ version = "1.0.34";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-sdk-cpp";
rev = version;
- sha256 = "1x3xam7vprlld6iqhqgdhgmqyclfy8dvzgy3375cijy9akhvv67i";
+ sha256 = "09vag1ybfqvw37djmd9g740iqjvg8nwr4p0xb21rfj06vazrdg4b";
};
- buildInputs = [ cmake curl ];
+ # FIXME: might be nice to put different APIs in different outputs
+ # (e.g. libaws-cpp-sdk-s3.so in output "s3").
+ outputs = [ "out" "dev" ];
+
+ buildInputs = [ cmake curl libuuid ];
cmakeFlags =
lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0"
++ lib.optional (apis != ["*"])
- "-DBUILD_ONLY=${lib.concatMapStringsSep ";" (api: "aws-cpp-sdk-" + api) apis}";
-
- # curl upgrade to 7.50.0 (#17152) changes the libcurl headers slightly and
- # therefore requires the followin flag until this package gets updated
- NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
+ "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}";
enableParallelBuilding = true;
@@ -37,12 +37,9 @@ stdenv.mkDerivation rec {
done
'';
- postInstall =
- ''
- # Move the .so files to a more reasonable location.
- mv $out/lib/linux/*/Release/*.so $out/lib
- rm -rf $out/lib/linux
- '';
+ NIX_LDFLAGS = lib.concatStringsSep " " (
+ (map (pkg: "-rpath ${lib.getOutput "lib" pkg}/lib"))
+ [ libuuid curl openssl zlib stdenv.cc.cc ]);
meta = {
description = "A C++ interface for Amazon Web Services";
diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index fbc7df68d44..dcd35613d54 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
name = "bobcat-${version}";
- version = "4.02.00";
+ version = "4.03.00";
src = fetchFromGitHub {
- sha256 = "1hl5b2g4cmxcafkcpr4vs0c705cy254g0h410zi5wxnygjam8adn";
+ sha256 = "0jkwq3f6g3vbim2jg5wfzhin89r4crnypqggp8cqimjmpkyfqnv0";
rev = version;
repo = "bobcat";
owner = "fbb-git";
diff --git a/pkgs/development/libraries/boehm-gc/cygwin.patch b/pkgs/development/libraries/boehm-gc/cygwin.patch
deleted file mode 100644
index 25c6b9f06f3..00000000000
--- a/pkgs/development/libraries/boehm-gc/cygwin.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- gc-7.2/include/gc.h 2014-06-01 19:00:48.000000000 +0200
-+++ gc-7.2/include/gc.h 2015-05-27 12:55:42.248984200 +0200
-@@ -1386,7 +1386,14 @@
- /* THREAD_LOCAL_ALLOC defined and the initial allocation call is not */
- /* to GC_malloc() or GC_malloc_atomic(). */
-
--#ifdef __CYGWIN32__
-+#ifdef __CYGWIN__
-+#ifdef __x86_64__
-+ extern int __data_start__[], __data_end__[], __bss_start__[], __bss_end__[];
-+#define GC_DATASTART (__data_start__ < __bss_start__ ?\
-+ (void *)__data_start__ : (void *)__bss_start__)
-+#define GC_DATAEND (__data_end__ < __bss_end__ ?\
-+ (void *)__data_end__ : (void *)__bss_end__)
-+#else
- /* Similarly gnu-win32 DLLs need explicit initialization from the */
- /* main program, as does AIX. */
- extern int _data_start__[], _data_end__[], _bss_start__[], _bss_end__[];
-@@ -1394,6 +1401,7 @@
- (void *)_data_start__ : (void *)_bss_start__)
- # define GC_DATAEND (_data_end__ > _bss_end__ ? \
- (void *)_data_end__ : (void *)_bss_end__)
-+#endif
- # define GC_INIT_CONF_ROOTS GC_add_roots(GC_DATASTART, GC_DATAEND); \
- GC_gcollect() /* For blacklisting. */
- /* Required at least if GC is in a DLL. And doesn't hurt. */
---- gc-7.2/include/private/gcconfig.h 2014-06-01 19:00:48.000000000 +0200
-+++ gc-7.2/include/private/gcconfig.h 2015-05-27 12:46:01.864338700 +0200
-@@ -441,10 +441,20 @@
- # endif
- # define mach_type_known
- # endif
--# if defined(__CYGWIN32__) || defined(__CYGWIN__)
-+# if defined(__CYGWIN32__)
- # define I386
- # define CYGWIN32
- # define mach_type_known
-+#if defined(__CYGWIN__)
-+# if defined(__LP64__)
-+# define X86_64
-+# define mach_type_known
-+# else
-+# define I386
-+# endif
-+# define CYGWIN32
-+# define mach_type_known
-+#endif
- # endif
- # if defined(__MINGW32__) && !defined(mach_type_known)
- # define I386
-@@ -511,6 +521,16 @@
- # define mach_type_known
- # endif
-
-+#if defined(__CYGWIN__)
-+# if defined(__LP64__)
-+# define X86_64
-+# define mach_type_known
-+# else
-+# define I386
-+# endif
-+# define CYGWIN32
-+# define mach_type_known
-+#endif
- /* Feel free to add more clauses here */
-
- /* Or manually define the machine type here. A machine type is */
-@@ -2279,6 +2299,20 @@
- # define GWW_VDB
- # define DATAEND /* not needed */
- # endif
-+
-+# ifdef CYGWIN32
-+# define OS_TYPE "CYGWIN32"
-+# define DATASTART ((ptr_t)GC_DATASTART) /* From gc.h */
-+# define DATAEND ((ptr_t)GC_DATAEND)
-+# define ALIGNMENT 8
-+# undef STACK_GRAN
-+# define STACK_GRAN 0x10000
-+# ifdef USE_MMAP
-+# define NEED_FIND_LIMIT
-+# define USE_MMAP_ANON
-+# endif
-+# endif
-+
- # endif /* X86_64 */
-
- # ifdef HEXAGON
---- gc-7.2/os_dep.c 2015-05-27 12:25:29.097698800 +0200
-+++ gc-7.2/os_dep.c 2015-05-27 12:48:23.714600800 +0200
-@@ -764,10 +764,16 @@
- /* gcc version of boehm-gc). */
- GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb)
- {
-+# ifdef __x86_64__
-+ PNT_TIB pTib = NtCurrentTeb();
-+ void * _tlsbase = pTib->StackBase;
-+ /*void * _tlsbase = NtCurrentTeb()->pTib.StackBase;*/
-+ /*extern void * _tlsbase __asm__ ("%gs:8");*/
-+# else
- void * _tlsbase;
--
- __asm__ ("movl %%fs:4, %0"
- : "=r" (_tlsbase));
-+# endif
- sb -> mem_base = _tlsbase;
- return GC_SUCCESS;
- }
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index b0eec4e130b..96e41790aac 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -1,13 +1,15 @@
-{ lib, stdenv, fetchurl, enableLargeConfig ? false }:
+{ lib, stdenv, fetchurl, pkgconfig, libatomic_ops, enableLargeConfig ? false }:
stdenv.mkDerivation rec {
- name = "boehm-gc-7.2f";
+ name = "boehm-gc-7.6.0";
src = fetchurl {
- url = http://www.hboehm.info/gc/gc_source/gc-7.2f.tar.gz;
- sha256 = "119x7p1cqw40mpwj80xfq879l9m1dkc7vbc1f3bz3kvkf8bf6p16";
+ url = http://www.hboehm.info/gc/gc_source/gc-7.6.0.tar.gz;
+ sha256 = "143x7g0d0k6250ai6m2x3l4y352mzizi4wbgrmahxscv2aqjhjm1";
};
- patches = if stdenv.isCygwin then [ ./cygwin.patch ] else null;
+
+ buildInputs = [ libatomic_ops ];
+ nativeBuildInputs = [ pkgconfig ];
outputs = [ "out" "dev" "doc" ];
diff --git a/pkgs/development/libraries/boost/1.62.nix b/pkgs/development/libraries/boost/1.62.nix
new file mode 100644
index 00000000000..871ef392c1a
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.62.nix
@@ -0,0 +1,12 @@
+{ stdenv, callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+ version = "1.62.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/boost/boost_1_62_0.tar.bz2";
+ # long-form SHA256 from www.boost.org
+ sha256 = "36c96b0f6155c98404091d8ceb48319a28279ca0333fba1ad8611eb90afb2ca0";
+ };
+
+})
diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix
index 37b403548c9..a8d350d9e37 100644
--- a/pkgs/development/libraries/bullet/default.nix
+++ b/pkgs/development/libraries/bullet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, mesa, freeglut }:
+{ stdenv, fetchFromGitHub, cmake, mesa, freeglut, darwin }:
stdenv.mkDerivation rec {
name = "bullet-${version}";
@@ -11,9 +11,24 @@ stdenv.mkDerivation rec {
sha256 = "1zz3vs6i5975y9mgb1k1vxrjbf1028v0nc11p646dsvv2vplxx5r";
};
- buildInputs = [ cmake mesa freeglut ];
+ buildInputs = [ cmake ] ++
+ (if stdenv.isDarwin
+ then with darwin.apple_sdk.frameworks; [ Cocoa OpenGL ]
+ else [mesa freeglut]);
- cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" ];
+ postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+ sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt
+ sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt
+ '';
+
+ cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" ] ++
+ stdenv.lib.optionals stdenv.isDarwin [
+ "-DMACOSX_DEPLOYMENT_TARGET=\"10.9\""
+ "-DOPENGL_FOUND=true"
+ "-DOPENGL_LIBRARIES=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework"
+ "-DOPENGL_INCLUDE_DIR=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework"
+ "-DOPENGL_gl_LIBRARY=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework"
+ "-DCOCOA_LIBRARY=${darwin.apple_sdk.frameworks.Cocoa}/Library/Frameworks/Cocoa.framework"];
enableParallelBuilding = true;
@@ -21,11 +36,11 @@ stdenv.mkDerivation rec {
description = "A professional free 3D Game Multiphysics Library";
longDescription = ''
Bullet 3D Game Multiphysics Library provides state of the art collision
- detection, soft body and rigid body dynamics.
+ detection, soft body and rigid body dynamics.
'';
homepage = http://code.google.com/p/bullet/;
license = stdenv.lib.licenses.zlib;
maintainers = with stdenv.lib.maintainers; [ aforemny ];
- platforms = with stdenv.lib.platforms; linux;
+ platforms = with stdenv.lib.platforms; unix;
};
}
diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix
index fbf3cd57e3b..b1ee0b8d273 100644
--- a/pkgs/development/libraries/cairomm/default.nix
+++ b/pkgs/development/libraries/cairomm/default.nix
@@ -7,10 +7,14 @@ stdenv.mkDerivation rec {
name = "cairomm-${ver_maj}.${ver_min}";
src = fetchurl {
+ #url = "http://www.cairographics.org/releases/${name}.tar.gz";
+ # gnome doesn't have the latest version ATM; beware: same name but different hash
url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz";
sha256 = "a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6";
};
+ outputs = [ "out" "dev" ];
+
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ cairo libsigcxx ];
buildInputs = [ fontconfig freetype ]
diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix
index 24d30937204..7cd848e602a 100644
--- a/pkgs/development/libraries/ceres-solver/default.nix
+++ b/pkgs/development/libraries/ceres-solver/default.nix
@@ -3,7 +3,7 @@
, fetchurl
, cmake
, google-gflags ? null
-, glog ? null
+, glog
, runTests ? false
}:
@@ -12,11 +12,6 @@ assert runTests -> google-gflags != null;
let
version = "1.10.0";
-
- # glog currently doesn't build on darwin
- # Issue: https://code.google.com/p/google-glog/issues/detail?id=121
- useGlog = glog != null && !stdenv.isDarwin;
-
in
stdenv.mkDerivation {
name = "ceres-solver-${version}";
@@ -26,8 +21,7 @@ stdenv.mkDerivation {
sha256 = "20bb5db05c3e3e14a4062e2cf2b0742d2653359549ecded3e0653104ef3deb17";
};
- buildInputs = [ cmake ]
- ++ stdenv.lib.optional useGlog glog
+ buildInputs = [ cmake glog ]
++ stdenv.lib.optional (google-gflags != null) google-gflags;
inherit eigen;
@@ -38,7 +32,6 @@ stdenv.mkDerivation {
cmakeFlags = "
-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3
- ${if !useGlog then "-DMINIGLOG=ON" else ""}
";
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix
new file mode 100644
index 00000000000..2c9d36154a2
--- /dev/null
+++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }:
+
+stdenv.mkDerivation rec {
+ name = "cpp-ipfs-api-${version}";
+ version = "2016-11-09";
+
+ src = fetchFromGitHub {
+ owner = "vasild";
+ repo = "cpp-ipfs-api";
+ rev = "46e473e49ede4fd829235f1d4930754d5356a747";
+ sha256 = "10c5hmg9857zb0fp262ca4a42gq9iqdyqz7f975cp3qs70x12q08";
+ };
+
+ buildInputs = [ cmake curl ];
+ propagatedBuildInputs = [ nlohmann_json ];
+
+ meta = with stdenv.lib; {
+ description = "IPFS C++ API client library";
+ homepage = https://github.com/vasild/cpp-ipfs-api;
+ license = licenses.mit;
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix
index 9da83ca913e..b1860872df3 100644
--- a/pkgs/development/libraries/cppzmq/default.nix
+++ b/pkgs/development/libraries/cppzmq/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "cppzmq-${version}";
- version = "2016-07-18";
+ version = "2016-11-16";
src = fetchFromGitHub {
owner = "zeromq";
repo = "cppzmq";
- rev = "92d2af6def80a01b76d5e73f073c439ad00ab757";
- sha256 = "0lnwh314hh5ifad2sa2nz1g1ld1jc4vplm7clyvx304sjjvbvl27";
+ rev = "8b52a6ffacce27bac9b81c852b81539a77b0a6e5";
+ sha256 = "12accjyjzfw1wqzbj1qn6q99bj5ba05flsvbanyzflr3b4971s4p";
};
installPhase = ''
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = https://github.com/zeromq/cppzmq;
+ homepage = "https://github.com/zeromq/cppzmq";
license = licenses.bsd2;
description = "C++ binding for 0MQ";
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix
index ebf21c13010..91fb94ec048 100644
--- a/pkgs/development/libraries/cxxtest/default.nix
+++ b/pkgs/development/libraries/cxxtest/default.nix
@@ -1,28 +1,19 @@
-{ stdenv, fetchFromGitHub, pythonPackages}:
+{ stdenv, fetchFromGitHub, python2Packages}:
-stdenv.mkDerivation rec {
+let
+ pname = "cxxtest";
version = "4.4";
- name = "cxxtest";
+in python2Packages.buildPythonApplication rec {
+ name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "CxxTest";
- repo = name;
+ repo = pname;
rev = version;
sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17";
};
- buildInputs = with pythonPackages; [ python wrapPython ];
-
- installPhase = ''
- cd python
- python setup.py install --prefix=$out
- cd ..
-
- mkdir -p $out/include
- cp -R cxxtest $out/include/
-
- wrapPythonProgramsIn $out/bin "$out $pythonPath"
- '';
+ sourceRoot = "${name}-src/python";
meta = with stdenv.lib; {
homepage = "http://cxxtest.com";
diff --git a/pkgs/development/libraries/db/clang-4.8.patch b/pkgs/development/libraries/db/clang-4.8.patch
index c53160a8297..bbb77891497 100644
--- a/pkgs/development/libraries/db/clang-4.8.patch
+++ b/pkgs/development/libraries/db/clang-4.8.patch
@@ -1,13 +1,22 @@
diff --git a/dbinc/atomic.h b/dbinc/atomic.h
-index 0034dcc..fa7ba93 100644
+index 0034dcc..160c8ea 100644
--- a/dbinc/atomic.h
+++ b/dbinc/atomic.h
+@@ -70,7 +70,7 @@ typedef struct {
+ * These have no memory barriers; the caller must include them when necessary.
+ */
+ #define atomic_read(p) ((p)->value)
+-#define atomic_init(p, val) ((p)->value = (val))
++#define atomic_init_db(p, val) ((p)->value = (val))
+
+ #ifdef HAVE_ATOMIC_SUPPORT
+
@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
#define atomic_inc(env, p) __atomic_inc(p)
#define atomic_dec(env, p) __atomic_dec(p)
#define atomic_compare_exchange(env, p, o, n) \
- __atomic_compare_exchange((p), (o), (n))
-+ __db_atomic_compare_exchange((p), (o), (n))
++ __atomic_compare_exchange_int((p), (o), (n))
static inline int __atomic_inc(db_atomic_t *p)
{
int temp;
@@ -16,7 +25,130 @@ index 0034dcc..fa7ba93 100644
* which configure could be changed to use.
*/
-static inline int __atomic_compare_exchange(
-+static inline int __db_atomic_compare_exchange(
++static inline int __atomic_compare_exchange_int(
db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
{
atomic_value_t was;
+@@ -206,7 +206,7 @@ static inline int __atomic_compare_exchange(
+ #define atomic_dec(env, p) (--(p)->value)
+ #define atomic_compare_exchange(env, p, oldval, newval) \
+ (DB_ASSERT(env, atomic_read(p) == (oldval)), \
+- atomic_init(p, (newval)), 1)
++ atomic_init_db(p, (newval)), 1)
+ #else
+ #define atomic_inc(env, p) __atomic_inc(env, p)
+ #define atomic_dec(env, p) __atomic_dec(env, p)
+diff --git a/dbinc/db.in b/dbinc/db.in
+index 9fc6712..7428e0a 100644
+--- a/dbinc/db.in
++++ b/dbinc/db.in
+@@ -2413,7 +2413,7 @@ typedef struct {
+ #define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a)
+ #define firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@
+ #define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a)
+-#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
++#define store_db(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
+
+ /*******************************************************
+ * Hsearch historic interface.
+diff --git a/mp/mp_fget.c b/mp/mp_fget.c
+index 5fdee5a..0b75f57 100644
+--- a/mp/mp_fget.c
++++ b/mp/mp_fget.c
+@@ -617,7 +617,7 @@ alloc: /* Allocate a new buffer header and data space. */
+
+ /* Initialize enough so we can call __memp_bhfree. */
+ alloc_bhp->flags = 0;
+- atomic_init(&alloc_bhp->ref, 1);
++ atomic_init_db(&alloc_bhp->ref, 1);
+ #ifdef DIAGNOSTIC
+ if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) {
+ __db_errx(env,
+@@ -911,7 +911,7 @@ alloc: /* Allocate a new buffer header and data space. */
+ MVCC_MPROTECT(bhp->buf, mfp->stat.st_pagesize,
+ PROT_READ);
+
+- atomic_init(&alloc_bhp->ref, 1);
++ atomic_init_db(&alloc_bhp->ref, 1);
+ MUTEX_LOCK(env, alloc_bhp->mtx_buf);
+ alloc_bhp->priority = bhp->priority;
+ alloc_bhp->pgno = bhp->pgno;
+diff --git a/mp/mp_mvcc.c b/mp/mp_mvcc.c
+index 34467d2..f05aa0c 100644
+--- a/mp/mp_mvcc.c
++++ b/mp/mp_mvcc.c
+@@ -276,7 +276,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, need_frozenp)
+ #else
+ memcpy(frozen_bhp, bhp, SSZA(BH, buf));
+ #endif
+- atomic_init(&frozen_bhp->ref, 0);
++ atomic_init_db(&frozen_bhp->ref, 0);
+ if (mutex != MUTEX_INVALID)
+ frozen_bhp->mtx_buf = mutex;
+ else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH,
+@@ -428,7 +428,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_bhp, alloc_bhp)
+ #endif
+ alloc_bhp->mtx_buf = mutex;
+ MUTEX_LOCK(env, alloc_bhp->mtx_buf);
+- atomic_init(&alloc_bhp->ref, 1);
++ atomic_init_db(&alloc_bhp->ref, 1);
+ F_CLR(alloc_bhp, BH_FROZEN);
+ }
+
+diff --git a/mp/mp_region.c b/mp/mp_region.c
+index e6cece9..ddbe906 100644
+--- a/mp/mp_region.c
++++ b/mp/mp_region.c
+@@ -224,7 +224,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg)
+ MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0)
+ return (ret);
+ SH_TAILQ_INIT(&htab[i].hash_bucket);
+- atomic_init(&htab[i].hash_page_dirty, 0);
++ atomic_init_db(&htab[i].hash_page_dirty, 0);
+ }
+
+ /*
+@@ -269,7 +269,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg)
+ hp->mtx_hash = (mtx_base == MUTEX_INVALID) ? MUTEX_INVALID :
+ mtx_base + i;
+ SH_TAILQ_INIT(&hp->hash_bucket);
+- atomic_init(&hp->hash_page_dirty, 0);
++ atomic_init_db(&hp->hash_page_dirty, 0);
+ #ifdef HAVE_STATISTICS
+ hp->hash_io_wait = 0;
+ hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0;
+diff --git a/mutex/mut_method.c b/mutex/mut_method.c
+index 2588763..5c6d516 100644
+--- a/mutex/mut_method.c
++++ b/mutex/mut_method.c
+@@ -426,7 +426,7 @@ atomic_compare_exchange(env, v, oldval, newval)
+ MUTEX_LOCK(env, mtx);
+ ret = atomic_read(v) == oldval;
+ if (ret)
+- atomic_init(v, newval);
++ atomic_init_db(v, newval);
+ MUTEX_UNLOCK(env, mtx);
+
+ return (ret);
+diff --git a/mutex/mut_tas.c b/mutex/mut_tas.c
+index f3922e0..e40fcdf 100644
+--- a/mutex/mut_tas.c
++++ b/mutex/mut_tas.c
+@@ -46,7 +46,7 @@ __db_tas_mutex_init(env, mutex, flags)
+
+ #ifdef HAVE_SHARED_LATCHES
+ if (F_ISSET(mutexp, DB_MUTEX_SHARED))
+- atomic_init(&mutexp->sharecount, 0);
++ atomic_init_db(&mutexp->sharecount, 0);
+ else
+ #endif
+ if (MUTEX_INIT(&mutexp->tas)) {
+@@ -486,7 +486,7 @@ __db_tas_mutex_unlock(env, mutex)
+ F_CLR(mutexp, DB_MUTEX_LOCKED);
+ /* Flush flag update before zeroing count */
+ MEMBAR_EXIT();
+- atomic_init(&mutexp->sharecount, 0);
++ atomic_init_db(&mutexp->sharecount, 0);
+ } else {
+ DB_ASSERT(env, sharecount > 0);
+ MEMBAR_EXIT();
diff --git a/pkgs/development/libraries/db/clang-5.3.patch b/pkgs/development/libraries/db/clang-5.3.patch
index 0a0993da13e..1cfb13ca8e6 100644
--- a/pkgs/development/libraries/db/clang-5.3.patch
+++ b/pkgs/development/libraries/db/clang-5.3.patch
@@ -16,7 +16,7 @@ index 6a858f7..9f338dc 100644
#define atomic_dec(env, p) __atomic_dec(p)
#define atomic_compare_exchange(env, p, o, n) \
- __atomic_compare_exchange((p), (o), (n))
-+ __atomic_compare_exchange_db((p), (o), (n))
++ __atomic_compare_exchange_int((p), (o), (n))
static inline int __atomic_inc(db_atomic_t *p)
{
int temp;
@@ -25,7 +25,7 @@ index 6a858f7..9f338dc 100644
* which configure could be changed to use.
*/
-static inline int __atomic_compare_exchange(
-+static inline int __atomic_compare_exchange_db(
++static inline int __atomic_compare_exchange_int(
db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
{
atomic_value_t was;
diff --git a/pkgs/development/libraries/db/clang-6.0.patch b/pkgs/development/libraries/db/clang-6.0.patch
new file mode 100644
index 00000000000..5c1e8f506c4
--- /dev/null
+++ b/pkgs/development/libraries/db/clang-6.0.patch
@@ -0,0 +1,136 @@
+diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h
+index e4420aa..4799b5f 100644
+--- a/src/dbinc/atomic.h
++++ b/src/dbinc/atomic.h
+@@ -70,7 +70,7 @@ typedef struct {
+ * These have no memory barriers; the caller must include them when necessary.
+ */
+ #define atomic_read(p) ((p)->value)
+-#define atomic_init(p, val) ((p)->value = (val))
++#define atomic_init_db(p, val) ((p)->value = (val))
+
+ #ifdef HAVE_ATOMIC_SUPPORT
+
+@@ -225,7 +225,7 @@ static inline int __atomic_compare_exchange_int(
+ #define atomic_dec(env, p) (--(p)->value)
+ #define atomic_compare_exchange(env, p, oldval, newval) \
+ (DB_ASSERT(env, atomic_read(p) == (oldval)), \
+- atomic_init(p, (newval)), 1)
++ atomic_init_db(p, (newval)), 1)
+ #else
+ #define atomic_inc(env, p) __atomic_inc_int(env, p)
+ #define atomic_dec(env, p) __atomic_dec_int(env, p)
+diff --git a/src/dbinc/db.in b/src/dbinc/db.in
+index 3c2ad9b..3e46f02 100644
+--- a/src/dbinc/db.in
++++ b/src/dbinc/db.in
+@@ -2999,7 +2999,7 @@ typedef struct {
+ #define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a)
+ #define firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@
+ #define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a)
+-#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
++#define store_db(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
+
+ /*******************************************************
+ * Hsearch historic interface.
+diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c
+index 59fe9fe..fa4ced7 100644
+--- a/src/mp/mp_fget.c
++++ b/src/mp/mp_fget.c
+@@ -654,7 +654,7 @@ alloc: /* Allocate a new buffer header and data space. */
+
+ /* Initialize enough so we can call __memp_bhfree. */
+ alloc_bhp->flags = 0;
+- atomic_init(&alloc_bhp->ref, 1);
++ atomic_init_db(&alloc_bhp->ref, 1);
+ #ifdef DIAGNOSTIC
+ if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) {
+ __db_errx(env, DB_STR("3025",
+@@ -969,7 +969,7 @@ alloc: /* Allocate a new buffer header and data space. */
+ MVCC_MPROTECT(bhp->buf, mfp->pagesize,
+ PROT_READ);
+
+- atomic_init(&alloc_bhp->ref, 1);
++ atomic_init_db(&alloc_bhp->ref, 1);
+ MUTEX_LOCK(env, alloc_bhp->mtx_buf);
+ alloc_bhp->priority = bhp->priority;
+ alloc_bhp->pgno = bhp->pgno;
+diff --git a/src/mp/mp_mvcc.c b/src/mp/mp_mvcc.c
+index 83c4d72..0a47202 100644
+--- a/src/mp/mp_mvcc.c
++++ b/src/mp/mp_mvcc.c
+@@ -281,7 +281,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, need_frozenp)
+ #else
+ memcpy(frozen_bhp, bhp, SSZA(BH, buf));
+ #endif
+- atomic_init(&frozen_bhp->ref, 0);
++ atomic_init_db(&frozen_bhp->ref, 0);
+ if (mutex != MUTEX_INVALID)
+ frozen_bhp->mtx_buf = mutex;
+ else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH,
+@@ -440,7 +440,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_bhp, alloc_bhp)
+ #endif
+ alloc_bhp->mtx_buf = mutex;
+ MUTEX_LOCK(env, alloc_bhp->mtx_buf);
+- atomic_init(&alloc_bhp->ref, 1);
++ atomic_init_db(&alloc_bhp->ref, 1);
+ F_CLR(alloc_bhp, BH_FROZEN);
+ }
+
+diff --git a/src/mp/mp_region.c b/src/mp/mp_region.c
+index 4d95e4f..e97459c 100644
+--- a/src/mp/mp_region.c
++++ b/src/mp/mp_region.c
+@@ -278,7 +278,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg)
+ MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0)
+ return (ret);
+ SH_TAILQ_INIT(&htab[i].hash_bucket);
+- atomic_init(&htab[i].hash_page_dirty, 0);
++ atomic_init_db(&htab[i].hash_page_dirty, 0);
+ }
+
+ mtx_base = mtx_prev = MUTEX_INVALID;
+@@ -332,7 +332,7 @@ no_prealloc:
+ DB_MUTEX_SHARED, &hp->mtx_hash)) != 0)
+ return (ret);
+ SH_TAILQ_INIT(&hp->hash_bucket);
+- atomic_init(&hp->hash_page_dirty, 0);
++ atomic_init_db(&hp->hash_page_dirty, 0);
+ #ifdef HAVE_STATISTICS
+ hp->hash_io_wait = 0;
+ hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0;
+diff --git a/src/mutex/mut_method.c b/src/mutex/mut_method.c
+index 72b34de..a9f9868 100644
+--- a/src/mutex/mut_method.c
++++ b/src/mutex/mut_method.c
+@@ -501,7 +501,7 @@ __atomic_compare_exchange_int(env, v, oldval, newval)
+ MUTEX_LOCK(env, mtx);
+ ret = atomic_read(v) == oldval;
+ if (ret)
+- atomic_init(v, newval);
++ atomic_init_db(v, newval);
+ MUTEX_UNLOCK(env, mtx);
+
+ return (ret);
+diff --git a/src/mutex/mut_tas.c b/src/mutex/mut_tas.c
+index 7899c4b..d9420fa 100644
+--- a/src/mutex/mut_tas.c
++++ b/src/mutex/mut_tas.c
+@@ -47,7 +47,7 @@ __db_tas_mutex_init(env, mutex, flags)
+
+ #ifdef HAVE_SHARED_LATCHES
+ if (F_ISSET(mutexp, DB_MUTEX_SHARED))
+- atomic_init(&mutexp->sharecount, 0);
++ atomic_init_db(&mutexp->sharecount, 0);
+ else
+ #endif
+ if (MUTEX_INIT(&mutexp->tas)) {
+@@ -643,7 +643,7 @@ was_not_locked:
+ F_CLR(mutexp, DB_MUTEX_LOCKED);
+ /* Flush flag update before zeroing count */
+ MEMBAR_EXIT();
+- atomic_init(&mutexp->sharecount, 0);
++ atomic_init_db(&mutexp->sharecount, 0);
+ } else {
+ DB_ASSERT(env, sharecount > 0);
+ MEMBAR_EXIT();
diff --git a/pkgs/development/libraries/db/cygwin-4.4.patch b/pkgs/development/libraries/db/cygwin-4.4.patch
deleted file mode 100644
index 3f9d658b5da..00000000000
--- a/pkgs/development/libraries/db/cygwin-4.4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -rc db-4.4.20.NC-old/os/os_flock.c db-4.4.20.NC/os/os_flock.c
-*** db-4.4.20.NC-old/os/os_flock.c Mon Jun 20 16:59:01 2005
---- db-4.4.20.NC/os/os_flock.c Wed Jun 7 17:01:49 2006
-***************
-*** 36,41 ****
---- 36,50 ----
-
- DB_ASSERT(F_ISSET(fhp, DB_FH_OPENED) && fhp->fd != -1);
-
-+ #ifdef __CYGWIN__
-+ /*
-+ * Windows file locking interferes with read/write operations, so we
-+ * map the ranges to an area past the end of the file.
-+ */
-+ DB_ASSERT(offset < (off_t) 1 << 62);
-+ offset += (off_t) 1 << 62;
-+ #endif
-+
- #ifdef HAVE_FCNTL
- fl.l_start = offset;
- fl.l_len = 1;
diff --git a/pkgs/development/libraries/db/cygwin-4.5.patch b/pkgs/development/libraries/db/cygwin-4.5.patch
deleted file mode 100644
index 3f0ee78a708..00000000000
--- a/pkgs/development/libraries/db/cygwin-4.5.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -rc db-4.5.20-orig/os/os_flock.c db-4.5.20/os/os_flock.c
-*** db-4.5.20-orig/os/os_flock.c 2006-10-13 12:36:12.000000000 +0200
---- db-4.5.20/os/os_flock.c 2006-10-13 12:40:11.000000000 +0200
-***************
-*** 30,35 ****
---- 30,44 ----
-
- DB_ASSERT(dbenv, F_ISSET(fhp, DB_FH_OPENED) && fhp->fd != -1);
-
-+ #ifdef __CYGWIN__
-+ /*
-+ * Windows file locking interferes with read/write operations, so we
-+ * map the ranges to an area past the end of the file.
-+ */
-+ DB_ASSERT(dbenv, offset < (off_t) 1 << 62);
-+ offset += (off_t) 1 << 62;
-+ #endif
-+
- fl.l_start = offset;
- fl.l_len = 1;
- fl.l_type = acquire ? F_WRLCK : F_UNLCK;
-Only in db-4.5.20/os: os_flock.c~
diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix
index 40869a865ae..bce91e5a940 100644
--- a/pkgs/development/libraries/db/db-4.8.nix
+++ b/pkgs/development/libraries/db/db-4.8.nix
@@ -2,8 +2,9 @@
import ./generic.nix (args // rec {
version = "4.8.30";
- extraPatches = [ ./clang-4.8.patch ];
sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0";
- branch = "4.8";
- drvArgs = { hardeningDisable = [ "format" ]; };
+ extraPatches = [ ./clang-4.8.patch ];
+
+ drvArgs.hardeningDisable = [ "format" ];
+ drvArgs.doCheck = false;
})
diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix
index 91adfa24b58..d1d3c953fc9 100644
--- a/pkgs/development/libraries/db/db-5.3.nix
+++ b/pkgs/development/libraries/db/db-5.3.nix
@@ -3,9 +3,6 @@
import ./generic.nix (args // rec {
version = "5.3.28";
sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0";
- branch = "5.3";
- # https://community.oracle.com/thread/3952592
- # this patch renames some sybols that conflict with libc++-3.8
- # symbols: atomic_compare_exchange, atomic_init, store
+ license = stdenv.lib.licenses.agpl3;
extraPatches = [ ./clang-5.3.patch ];
})
diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix
index 716cad9ab07..b7c5667b883 100644
--- a/pkgs/development/libraries/db/db-6.0.nix
+++ b/pkgs/development/libraries/db/db-6.0.nix
@@ -4,5 +4,5 @@ import ./generic.nix (args // rec {
version = "6.0.20";
sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0";
license = stdenv.lib.licenses.agpl3;
- branch = "6.0";
+ extraPatches = [ ./clang-6.0.patch ];
})
diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
index fdc828effdf..a6f9c676bba 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/pkgs/development/libraries/db/generic.nix
@@ -4,9 +4,8 @@
# Options from inherited versions
, version, sha256
-, extraPatches ? [ ]
+, patchSrc ? "src", extraPatches ? [ ]
, license ? stdenv.lib.licenses.sleepycat
-, branch ? null
, drvArgs ? {}
}:
@@ -36,11 +35,16 @@ stdenv.mkDerivation (rec {
rm -rf $out/docs
'';
+ doCheck = true;
+
+ checkPhase = ''
+ make examples_c examples_cxx
+ '';
+
meta = with stdenv.lib; {
homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html";
description = "Berkeley DB";
license = license;
platforms = platforms.unix;
- branch = branch;
};
} // drvArgs)
diff --git a/pkgs/development/libraries/db/register-race-fix.patch b/pkgs/development/libraries/db/register-race-fix.patch
deleted file mode 100644
index bb05c966e5b..00000000000
--- a/pkgs/development/libraries/db/register-race-fix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -rc db-4.5.20-orig/env/env_register.c db-4.5.20/env/env_register.c
-*** db-4.5.20-orig/env/env_register.c 2006-09-09 16:29:04.000000000 +0200
---- db-4.5.20/env/env_register.c 2007-05-16 21:13:27.000000000 +0200
-***************
-*** 255,260 ****
---- 255,262 ----
- buf[nr - 1] = '\0';
- }
-
-+ //sleep(3);
-+
- pos = (off_t)lcnt * PID_LEN;
- if (REGISTRY_LOCK(dbenv, pos, 1) == 0) {
- if ((ret = REGISTRY_UNLOCK(dbenv, pos)) != 0)
-***************
-*** 361,366 ****
---- 363,392 ----
- if (recovery_failed)
- goto err;
-
-+ //sleep(5);
-+
-+ /*
-+ * Acquire an exclusive lock to prevent a race like this:
-+ *
-+ * 1) Process X is about to exit and process Y is just
-+ * starting.
-+ * 2) Process Y reads X's slot.
-+ * 3) Process X clears its slot.
-+ * 4) Process Y sees that X's slot isn't cleared yet (since it
-+ * just read the old value).
-+ * 5) Process X closes the registry, releases the lock on its
-+ * slot.
-+ * 6) Process Y tries to acquire X's slot and succeeds, so it
-+ * concludes that X died and recovery is needed.
-+ *
-+ * A more efficient solution to this problem would be to let
-+ * __envreg_add acquire the lock on a slot first, and *then*
-+ * read the slot (instead of the other way around). Then we
-+ * wouldn't need the exclusive lock here.
-+ */
-+ if ((ret = REGISTRY_EXCL_LOCK(dbenv, 0)) != 0)
-+ goto err;
-+
- /*
- * Why isn't an exclusive lock necessary to discard a DB_ENV handle?
- *
diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index c3386d3e1a6..df983ff3471 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }:
stdenv.mkDerivation rec {
- name = "dbus-glib-0.106";
+ name = "dbus-glib-0.108";
src = fetchurl {
url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz";
- sha256 = "0in0i6v68ixcy0ip28i84hdczf10ykq9x682qgcvls6gdmq552dk";
+ sha256 = "0b307hw9j41npzr6niw1bs6ryp87m5yafg492gqwvsaj4dz0qd4z";
};
outputs = [ "out" "dev" "devdoc" ];
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index a2586b011de..509e7dd00c8 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
&& libSM != null;
let
- version = "1.10.12";
- sha256 = "0pa71vf5c0d7k3gni06iascmplj0j5g70wbc833ayvi71d1pj2i1";
+ version = "1.10.14";
+ sha256 = "10x0wvv2ly4lyyfd42k4xw0ar5qdbi9cksw3l5fcwf1y6mq8y8r3";
self = stdenv.mkDerivation {
name = "dbus-${version}";
diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix
index 049a799c44f..c6f7684ecf3 100644
--- a/pkgs/development/libraries/double-conversion/default.nix
+++ b/pkgs/development/libraries/double-conversion/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- version = "2.0.1";
name = "double-conversion-${version}";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "google";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Binary-decimal and decimal-binary routines for IEEE doubles";
- homepage = https://github.com/google/double-conversion;
+ homepage = "https://github.com/google/double-conversion";
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/farsight2/default.nix b/pkgs/development/libraries/farsight2/default.nix
index 50f90c9d88a..b7a17c82beb 100644
--- a/pkgs/development/libraries/farsight2/default.nix
+++ b/pkgs/development/libraries/farsight2/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, libnice, pkgconfig, pythonPackages, gstreamer, gst_plugins_base
+{ stdenv, fetchurl, libnice, pkgconfig, python2Packages, gstreamer, gst_plugins_base
, gst_python, gupnp_igd }:
let
- inherit (pythonPackages) python pygobject2;
+ inherit (python2Packages) python pygobject2;
in stdenv.mkDerivation rec {
name = "farsight2-0.0.31";
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index f6c40fa5dd0..0ac82f98a24 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -148,7 +148,7 @@ stdenv.mkDerivation rec {
buildInputs = [
bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora
- libvdpau libvorbis lzma SDL soxr x264 x265 xvidcore zlib libopus
+ libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus
] ++ optional openglSupport mesa
++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM
++ optional ((isLinux || isFreeBSD) && !isArm) libva
diff --git a/pkgs/development/libraries/fmod/default.nix b/pkgs/development/libraries/fmod/default.nix
deleted file mode 100644
index af946019540..00000000000
--- a/pkgs/development/libraries/fmod/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl }:
-
-assert (stdenv.system == "x86_64-linux") || (stdenv.system == "i686-linux");
-let
- bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64";
-
- libPath = stdenv.lib.makeLibraryPath
- [ stdenv.cc.libc stdenv.cc.cc ] + ":${stdenv.cc.cc.lib}/lib64";
- patchLib = x: "patchelf --set-rpath ${libPath} ${x}";
-in
-stdenv.mkDerivation rec {
- name = "fmod-${version}";
- version = "4.44.41";
-
- src = fetchurl {
- url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi44441linux.tar.gz";
- sha256 = "0qjvbhx9g6ijv542n6w3ryv20f74p1qx6bbllda9hl14683z8r8p";
- };
-
- dontStrip = true;
- dontBuild = true;
-
- installPhase = ''
- mkdir -p $out/lib $out/include/fmodex
-
- cd api/inc && cp * $out/include/fmodex && cd ../lib
- cp libfmodex${bits}-${version}.so $out/lib/libfmodex.so
- cp libfmodexL${bits}-${version}.so $out/lib/libfmodexL.so
-
- ${patchLib "$out/lib/libfmodex.so"}
- ${patchLib "$out/lib/libfmodexL.so"}
- '';
-
- meta = {
- description = "Programming library and toolkit for the creation and playback of interactive audio";
- homepage = "http://www.fmod.org/";
- license = stdenv.lib.licenses.unfreeRedistributable;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
- };
-}
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index af8b1cb8737..1e070ca2599 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "folly-${version}";
- version = "2016.08.08.00";
+ version = "2016.11.21.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
- sha256 = "0f9xdi8w2mbn6gxjfvpzh8i22ca8p11a2ss6qkw31yhdgd3s9087";
+ sha256 = "1f7j73avj00mmzz8wyh9rl1k9i0cvk77d0nf9c80vzr2zfk9f31x";
};
nativeBuildInputs = [ autoreconfHook python pkgconfig ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An open-source C++ library developed and used at Facebook";
- homepage = https://github.com/facebook/folly;
+ homepage = "https://github.com/facebook/folly";
license = licenses.asl20;
# 32bit is not supported: https://github.com/facebook/folly/issues/103
platforms = [ "x86_64-linux" ];
diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix
index 4135c451eeb..6737e059b21 100644
--- a/pkgs/development/libraries/freeglut/default.nix
+++ b/pkgs/development/libraries/freeglut/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, xlibsWrapper, cmake }:
+{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa_noglu, mesa_glu, xlibsWrapper, cmake }:
let version = "3.0.0";
in stdenv.mkDerivation {
@@ -9,16 +9,20 @@ in stdenv.mkDerivation {
sha256 = "18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra";
};
- buildInputs = [ libXi libXrandr libXxf86vm mesa xlibsWrapper cmake ];
+ outputs = [ "out" "dev" ];
+
+ buildInputs = [ libXi libXrandr libXxf86vm mesa_noglu mesa_glu xlibsWrapper cmake ];
cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
- "-DOPENGL_INCLUDE_DIR=${mesa}/include"
- "-DOPENGL_gl_LIBRARY:FILEPATH=${mesa}/lib/libGL.dylib"
- "-DOPENGL_glu_LIBRARY:FILEPATH=${mesa}/lib/libGLU.dylib"
+ "-DOPENGL_INCLUDE_DIR=${mesa_noglu}/include"
+ "-DOPENGL_gl_LIBRARY:FILEPATH=${mesa_noglu}/lib/libGL.dylib"
+ "-DOPENGL_glu_LIBRARY:FILEPATH=${mesa_glu}/lib/libGLU.dylib"
"-DFREEGLUT_BUILD_DEMOS:BOOL=OFF"
"-DFREEGLUT_BUILD_STATIC:BOOL=OFF"
];
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "Create and manage windows containing OpenGL contexts";
longDescription = ''
diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix
index 2a75f7693e1..42105c7022c 100644
--- a/pkgs/development/libraries/freeimage/default.nix
+++ b/pkgs/development/libraries/freeimage/default.nix
@@ -1,31 +1,48 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchurl, unzip, darwin}:
stdenv.mkDerivation {
name = "freeimage-3.17.0";
src = fetchurl {
url = mirror://sourceforge/freeimage/FreeImage3170.zip;
sha256 = "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v";
};
- buildInputs = [ unzip ];
- prePatch = ''
- sed -e s@/usr/@$out/@ \
+ buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools;
+ prePatch = if stdenv.isDarwin
+ then ''
+ sed -e 's/gcc-4.0/clang/g' \
+ -e 's/g++-4.0/clang++/g' \
+ -e 's/COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS/COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__/' \
+ -e "s|PREFIX = /usr/local|PREFIX = $out|" \
+ -e 's|-Wl,-syslibroot /Developer/SDKs/MacOSX10.5.sdk||g' \
+ -e 's|-Wl,-syslibroot /Developer/SDKs/MacOSX10.6.sdk||g' \
+ -e 's|-isysroot /Developer/SDKs/MacOSX10.6.sdk||g' \
+ -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||g' \
+ -e 's| $(STATICLIB)-ppc $(STATICLIB)-i386||g' \
+ -e 's| $(SHAREDLIB)-ppc $(SHAREDLIB)-i386||g' \
+ -e 's| install -d -m 755 -o root -g wheel $(INCDIR) $(INSTALLDIR)||' \
+ -e 's| -m 644 -o root -g wheel||g' \
+ -i ./Makefile.osx
+ # Fix LibJXR performance timers
+ sed 's|^SRCS = \(.*\)$|SRCS = \1 Source/LibJXR/image/sys/perfTimerANSI.c|' -i ./Makefile.srcs
+ ''
+ else ''
+ sed -e s@/usr/@$out/@ \
-e 's@-o root -g root@@' \
-e 's@ldconfig@echo not running ldconfig@' \
-i Makefile.gnu Makefile.fip
-
- # Fix gcc 5.1 macro problems
- # https://chromium.googlesource.com/webm/libwebp/+/eebaf97f5a1cb713d81d311308d8a48c124e5aef%5E!/
- sed -i -e 's/"\(#[^"]*\)"/" \1 "/g' Source/LibWebP/src/dsp/*
+ # Fix gcc 5.1 macro problems
+ # https://chromium.googlesource.com/webm/libwebp/+/eebaf97f5a1cb713d81d311308d8a48c124e5aef%5E!/
+ sed -i -e 's/"\(#[^"]*\)"/" \1 "/g' Source/LibWebP/src/dsp/*
'';
- postBuild = "make -f Makefile.fip";
+ postBuild = stdenv.lib.optionalString (!stdenv.isDarwin) "make -f Makefile.fip";
preInstall = "mkdir -p $out/include $out/lib";
- postInstall = "make -f Makefile.fip install";
+ postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) "make -f Makefile.fip install";
meta = {
description = "Open Source library for accessing popular graphics image file formats";
homepage = http://freeimage.sourceforge.net/;
license = "GPL";
maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; linux;
+ platforms = with stdenv.lib.platforms; unix;
};
}
diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix
new file mode 100644
index 00000000000..8f532ae8e0b
--- /dev/null
+++ b/pkgs/development/libraries/gbenchmark/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, callPackage, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+ name = "gbenchmark-${version}";
+ version = "1.1.0";
+
+ src = fetchFromGitHub {
+ owner = "google";
+ repo = "benchmark";
+ rev = "v${version}";
+ sha256 = "1y7k73kyxx1jlph23csnhdac76px6ghhwwxbcf0133m4rg0wmpn5";
+ };
+
+ buildInputs = [ cmake ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "A microbenchmark support library";
+ homepage = "https://github.com/google/benchmark";
+ license = licenses.asl20;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ abbradar ];
+ };
+}
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index ce3e0f61972..173e6411182 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -20,14 +20,13 @@ composableDerivation.composableDerivation {} (fixed: rec {
hardeningDisable = [ "format" ];
- # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults.
# Unset CC and CXX as they confuse libtool.
- preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX";
+ preConfigure = "unset CC CXX";
configureFlags = [
"--with-jpeg=${libjpeg.dev}"
"--with-libtiff=${libtiff.dev}" # optional (without largetiff support)
- "--with-libpng=${libpng.dev}" # optional
+ "--with-png=${libpng.dev}" # optional
"--with-libz=${zlib.dev}" # optional
"--with-pg=${postgresql}/bin/pg_config"
@@ -53,6 +52,6 @@ composableDerivation.composableDerivation {} (fixed: rec {
homepage = http://www.gdal.org/;
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.marcweber ];
- platforms = stdenv.lib.platforms.linux;
+ platforms = with stdenv.lib.platforms; linux ++ darwin;
};
})
diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix
index 9a73b82f888..17847695f97 100644
--- a/pkgs/development/libraries/giblib/default.nix
+++ b/pkgs/development/libraries/giblib/default.nix
@@ -2,16 +2,19 @@
stdenv.mkDerivation rec {
name = "giblib-1.2.4";
-
+
src = fetchurl {
url = "http://linuxbrit.co.uk/downloads/${name}.tar.gz";
sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp";
};
-
- buildInputs = [xlibsWrapper imlib2];
+
+ buildInputs = [ xlibsWrapper ];
+ propagatedBuildInputs = [ imlib2 ];
meta = {
homepage = http://linuxbrit.co.uk/giblib/;
+ description = "wrapper library for imlib2, and other stuff";
platforms = stdenv.lib.platforms.unix;
+ license = stdenv.lib.licenses.mit;
};
}
diff --git a/pkgs/development/libraries/git2/0.23.nix b/pkgs/development/libraries/git2/0.23.nix
new file mode 100644
index 00000000000..3cf429ab1d7
--- /dev/null
+++ b/pkgs/development/libraries/git2/0.23.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser, libiconv }:
+
+stdenv.mkDerivation (rec {
+ version = "0.23.2";
+ name = "libgit2-${version}";
+
+ src = fetchurl {
+ name = "${name}.tar.gz";
+ url = "https://github.com/libgit2/libgit2/tarball/v${version}";
+ sha256 = "1d3901bmgvdnmzrx21afi1d0llsqmca3ckj942p0i2wpdpr1kbcp";
+ };
+
+ cmakeFlags = "-DTHREADSAFE=ON";
+
+ nativeBuildInputs = [ cmake python pkgconfig ];
+ buildInputs = [ zlib libssh2 openssl http-parser ];
+
+ meta = {
+ description = "the Git linkable library";
+ homepage = http://libgit2.github.com/;
+ license = stdenv.lib.licenses.gpl2;
+ platforms = with stdenv.lib.platforms; all;
+ };
+} // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
+ NIX_LDFLAGS = "-liconv";
+ propagatedBuildInputs = [ libiconv ];
+})
diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index c4487dca597..2bd500b9efb 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, curl, http-parser, libiconv }:
stdenv.mkDerivation (rec {
- version = "0.24.2";
+ version = "0.24.3";
name = "libgit2-${version}";
src = fetchurl {
name = "${name}.tar.gz";
url = "https://github.com/libgit2/libgit2/tarball/v${version}";
- sha256 = "0avijw83vfx64cn23vx2j1h14zmkx8silgjnq6q2qw2z3sh73hs1";
+ sha256 = "01jdp0i0nxhx8w2gjd75mwfy1d4z2c5xzz7q5jfypa6pkdi86dmh";
};
# TODO: `cargo` (rust's package manager) surfaced a serious bug in
diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix
index 3b015532ca8..feb769229c0 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/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 710b6550995..87c511f00dd 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -43,7 +43,7 @@ let
'';
ver_maj = "2.50";
- ver_min = "1";
+ ver_min = "2";
in
stdenv.mkDerivation rec {
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
- sha256 = "2ef87a78f37c1eb5b95f4cc95efd5b66f69afad9c9c0899918d04659cf6df7dd";
+ sha256 = "be68737c1f268c05493e503b3b654d2b7f43d7d0b8c5556f7e4651b870acfbf5";
};
patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;
diff --git a/pkgs/development/libraries/grantlee/5.x.nix b/pkgs/development/libraries/grantlee/5.x.nix
index 9e697a572b9..b4aa9414163 100644
--- a/pkgs/development/libraries/grantlee/5.x.nix
+++ b/pkgs/development/libraries/grantlee/5.x.nix
@@ -1,15 +1,13 @@
{ stdenv, fetchurl, qtbase, qtscript, cmake }:
stdenv.mkDerivation rec {
- name = "grantlee-5.0.0";
+ name = "grantlee-${version}";
+ version = "5.1.0";
-# Upstream download server has country code firewall, so I made a mirror.
src = fetchurl {
- urls = [
- "http://downloads.grantlee.org/${name}.tar.gz"
- "http://www.loegria.net/grantlee/${name}.tar.gz"
- ];
- sha256 = "0qdifp1sg87j3869xva5ai2d6d5ph7z4b85wv1fypf2k5sljpwpa";
+ url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz";
+ sha256 = "1lf9rkv0i0kd7fvpgg5l8jb87zw8dzcwd1liv6hji7g4wlpmfdiq";
+ name = "${name}.tar.gz";
};
buildInputs = [ qtbase qtscript ];
diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index 82e41329e00..d130a328dba 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, fetchpatch, stdenv }:
stdenv.mkDerivation rec {
- name = "gsl-2.2";
+ name = "gsl-2.3";
src = fetchurl {
url = "mirror://gnu/gsl/${name}.tar.gz";
- sha256 = "1pyq2c0j91z955746myn29c89jwkd435s2cbj8ks2hpag6d0mr2d";
+ sha256 = "1yxdzqjwmi2aid650fa9zyr8llw069x7lm489wx9nnfdi6vh09an";
};
patches = [
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index a91acdbb008..7479c153af2 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.2";
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 = "0fisnnfpp3s8pbm6hjrfi4wjpq2da8c6w3ns9pjcg7590f9wm587";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 00aa893bd33..c3e8f3c65a1 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.2";
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 = "086yjwmp4fykcqkj6zqhwrk2z49981kl8x545vz2wvblrc7x9h7v";
};
outputs = [ "out" "dev" ];
@@ -44,4 +44,3 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
}
-
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index da6a8c7a74a..8b27fa7ad3b 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.2";
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 = "0rcd4ya4k99x6ngm9v78as7ql0rqibkwshc13lb4rjdszs0qw3hm";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 5f60b9c03a3..a45c190b020 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.2";
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 = "0hx7bwj8li88qq09slvdxlnfq76hr35nyjvd4ixrz5gmkpmrl5fv";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index a44bdbcd08c..fbf67fb34f5 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.2";
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 = "04rksbhjj2yz32g523cfabwqn2s3byd94dpbxghxr0p9ridk53qr";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
index 176e19000e9..a1e28efbff4 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 788aacf03ec..447b679898a 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.2";
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 = "0g778j7w4vpbhwjzyrzpajvr26nxm6vqby84v8g1w1hz44v71pd3";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix
index 9d6fa94cf3a..880b5d734d4 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.2";
src = fetchurl {
urls = [
"${meta.homepage}/src/gst-python/${name}.tar.xz"
"mirror://gentoo/distfiles/${name}.tar.xz"
];
- sha256 = "15sdfa6lq5pswvi09vk51cs30yf8wr2rlm9myhb4q0c2jhiial2g";
+ sha256 = "1sljnqkxf2ix6yzghrapw5irl0rbp8aa8w2hggk7i6d9js10ls71";
};
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 ab6e1f9f4f1..981a05b4f1f 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.2";
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 = "17gc2zd3v6spmm2d6912sqfcyyv5f2ghdhq31f5kx5mw5r6ds0zk";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index 9972468f1b7..f136df099bf 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.2";
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 = "1abzaj9kczap1xmalgzid1k3gqcn1ghnn76cn2kclc1gbfwd4ccy";
};
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 2de3955ab06..a05bbd3e9a2 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.2";
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 = "1mwyk3b19aq78mjhmrpc7qqs9flrykrn1j763g5wx546swc489xy";
};
outputs = [ "out" "dev" ];
@@ -24,11 +24,10 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- python
+ python json_glib
];
propagatedBuildInputs = [ gstreamer gst-plugins-base ];
enableParallelBuilding = true;
}
-
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 9882cd7692c..b50264f3a02 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -13,7 +13,7 @@ with stdenv.lib;
let
ver_maj = "3.22";
- ver_min = "1";
+ ver_min = "4";
version = "${ver_maj}.${ver_min}";
in
stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
- sha256 = "127c8c5cfc32681f9ab3cb542eb0d5c16c1c02faba68bf8fcac9a3cf278ef471";
+ sha256 = "0zrq3wq4x0vcrzapps0608d5ywcrwk9xb2rmg32h2g8kzvyad53h";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix
index 119e3f77f67..1ec2a7cd6f0 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 8b2383f33cc..49055f6b4a9 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/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 14fd7cd07f0..b2edd39764c 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -5,7 +5,7 @@
}:
let
- version = "1.3.2";
+ version = "1.3.4";
inherit (stdenv.lib) optional optionals optionalString;
in
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
- sha256 = "09z0ki9w76v0bh4rdkds7zsb7vf721iaiyidcdy9ii885wvschw5";
+ sha256 = "0ava7y24797k5ps3ghq2ccjjds97ri1gx32v6546a6pgmpyad2ki";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch
index 2968d571bb3..72d3f67d3bc 100644
--- a/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch
+++ b/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj
source/config/mh-linux | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/config/mh-linux b/config/mh-linux
+diff --git a/source/config/mh-linux b/source/config/mh-linux
index 366f0cc..2689aab 100644
---- a/config/mh-linux
-+++ b/config/mh-linux
+--- a/source/config/mh-linux
++++ b/source/config/mh-linux
@@ -21,7 +21,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN
LD_RPATH_PRE = -Wl,-rpath,
diff --git a/pkgs/development/libraries/icu/54.1.nix b/pkgs/development/libraries/icu/54.1.nix
deleted file mode 100644
index cd4398b3cc0..00000000000
--- a/pkgs/development/libraries/icu/54.1.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, fetchurl, fixDarwinDylibNames }:
-
-let
- icu = import ./default.nix { inherit stdenv fetchurl fixDarwinDylibNames; };
-in
- stdenv.lib.overrideDerivation icu (attrs: {
- src = fetchurl {
- url = "http://download.icu-project.org/files/icu4c/54.1/icu4c-54_1-src.tgz";
- sha256 = "1cwapgjmvrcv1n2wjspj3vahidg596gjfp4jn1gcb4baralcjayl";
- };
- })
-
diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index a7bf4af99fb..d4a4c2a500c 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fixDarwinDylibNames }:
+{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }:
let
pname = "icu4c";
@@ -16,9 +16,6 @@ stdenv.mkDerivation ({
outputs = [ "out" "dev" ];
outputBin = "dev";
- makeFlags = stdenv.lib.optionalString stdenv.isDarwin
- "CXXFLAGS=-headerpad_max_install_names";
-
# FIXME: This fixes dylib references in the dylibs themselves, but
# not in the programs in $out/bin.
buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
@@ -28,6 +25,38 @@ stdenv.mkDerivation ({
echo Source root reset to ''${sourceRoot}
'';
+ # This pre/postPatch shenanigans is to handle that the patches expect
+ # to be outside of `source`.
+ prePatch = ''
+ pushd ..
+ '';
+ postPatch = ''
+ popd
+ '';
+
+ patches = [
+ (fetchpatch {
+ url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2014-6585.patch";
+ sha256 = "1s8kqax444pqf5chwxvgsx1n1dx7v74h34fqh08fyq57mcjnpj4d";
+ })
+ (fetchpatch {
+ url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2015-4760.patch";
+ sha256 = "08gawyqbylk28i9pxv9vsw2drdpd6i97q0aml4nmv2xyb1ala0wp";
+ })
+ (fetchpatch {
+ url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-0494.patch";
+ sha256 = "1741s8lpmnizjprzk3xb7zkm5fznzgk8hhlrs8a338c18nalvxay";
+ })
+ (fetchpatch {
+ url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-6293.patch";
+ sha256 = "01h4xcss1vmsr60ijkv4lxsgvspwimyss61zp9nq4xd5i3kk1f4b";
+ })
+ (fetchpatch {
+ url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-7415.patch";
+ sha256 = "01d070h8d7rkj55ac8isr64m999bv5znc8vnxa7aajglsfidzs2r";
+ })
+ ];
+
preConfigure = ''
sed -i -e "s|/bin/sh|${stdenv.shell}|" configure
'';
diff --git a/pkgs/development/libraries/ignition-math/default.nix b/pkgs/development/libraries/ignition-math/default.nix
index f71def55583..66b21b6fae6 100644
--- a/pkgs/development/libraries/ignition-math/default.nix
+++ b/pkgs/development/libraries/ignition-math/default.nix
@@ -1,17 +1,20 @@
{ stdenv, fetchurl, cmake }:
let
- version = "2.3.0";
+ version = "2.6.0";
in
stdenv.mkDerivation rec {
name = "ign-math2-${version}";
src = fetchurl {
url = "http://gazebosim.org/distributions/ign-math/releases/ignition-math2-${version}.tar.bz2";
- sha256 = "1a2jgq6allcxg62y0r61iv4hgxkfr1whpsxy75hg7k85s7da8dpl";
+ sha256 = "1d4naq0zp704c7ckj2wwmhplxmwkvcs1jib8bklnnd09lhg9j92j";
};
buildInputs = [ cmake ];
+ preConfigure = ''
+ cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_INCLUDEDIR=include -DCMAKE_INSTALL_LIBDIR=lib"
+ '';
meta = with stdenv.lib; {
homepage = http://ignitionrobotics.org/libraries/math;
diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix
index 85e9979ebb0..a6ad33d842c 100644
--- a/pkgs/development/libraries/imlib2/default.nix
+++ b/pkgs/development/libraries/imlib2/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, fetchurl, xlibsWrapper, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }:
+{ stdenv, fetchurl, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig
+, freetype
+, x11Support ? true, xlibsWrapper ? null }:
+
+with stdenv.lib;
stdenv.mkDerivation rec {
name = "imlib2-1.4.9";
@@ -8,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "08809xxk2555yj6glixzw9a0x3x8cx55imd89kj3r0h152bn8a3x";
};
- buildInputs = [ xlibsWrapper libjpeg libtiff giflib libpng bzip2 ];
+ buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype ]
+ ++ optional x11Support xlibsWrapper;
nativeBuildInputs = [ pkgconfig ];
@@ -21,7 +26,14 @@ stdenv.mkDerivation rec {
# Do not build amd64 assembly code on Darwin, because it fails to compile
# with unknow directive errors
- configureFlags = if stdenv.isDarwin then [ "--enable-amd64=no" ] else null;
+ configureFlags = optional stdenv.isDarwin "--enable-amd64=no"
+ ++ optional (!x11Support) "--without-x";
+
+ outputs = [ "out" "bin" "dev" ];
+
+ postInstall = ''
+ moveToOutput bin/imlib2-config "$dev"
+ '';
meta = {
description = "Image manipulation library";
@@ -34,8 +46,8 @@ stdenv.mkDerivation rec {
easily, without sacrificing speed.
'';
- license = stdenv.lib.licenses.free;
- platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ spwhitt ];
+ license = licenses.free;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ spwhitt ];
};
}
diff --git a/pkgs/development/libraries/isl/0.17.1.nix b/pkgs/development/libraries/isl/0.17.1.nix
new file mode 100644
index 00000000000..2136969c075
--- /dev/null
+++ b/pkgs/development/libraries/isl/0.17.1.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, gmp }:
+
+stdenv.mkDerivation rec {
+ name = "isl-0.17.1";
+
+ src = fetchurl {
+ url = "http://isl.gforge.inria.fr/${name}.tar.xz";
+ sha256 = "be152e5c816b477594f4c6194b5666d8129f3a27702756ae9ff60346a8731647";
+ };
+
+ buildInputs = [ gmp ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ homepage = http://www.kotnet.org/~skimo/isl/;
+ license = stdenv.lib.licenses.lgpl21;
+ description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index 895d72dd7a0..cf5c264fc8d 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -1,15 +1,18 @@
-{ stdenv, fetchurl, fetchpatch, libjpeg, autoreconfHook }:
+{ stdenv, fetchurl, fetchpatch, libjpeg, cmake }:
stdenv.mkDerivation rec {
- name = "jasper-1.900.21";
+ name = "jasper-2.0.6";
src = fetchurl {
+ # You can find this code on Github at https://github.com/mdadams/jasper
+ # however note at https://www.ece.uvic.ca/~frodo/jasper/#download
+ # not all tagged releases are for distribution.
url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.tar.gz";
- sha256 = "1cypmlzq5vmbacsn8n3ls9p7g64scv3fzx88qf8c270dz10s5j79";
+ sha256 = "0g6fl8rrbspa9vpswixmpxrg71l19kqgc2b5cak7vmwxphj01wbk";
};
# newer reconf to recognize a multiout flag
- nativeBuildInputs = [ autoreconfHook ];
+ nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ libjpeg ];
configureFlags = "--enable-shared";
@@ -18,6 +21,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ postInstall = ''
+ moveToOutput bin "$bin"
+ '';
+
meta = {
homepage = https://www.ece.uvic.ca/~frodo/jasper/;
description = "JPEG2000 Library";
diff --git a/pkgs/development/libraries/java/jdom/builder.sh b/pkgs/development/libraries/java/jdom/builder.sh
index d95feb5eeb4..dbec4b6f3e0 100755
--- a/pkgs/development/libraries/java/jdom/builder.sh
+++ b/pkgs/development/libraries/java/jdom/builder.sh
@@ -3,4 +3,4 @@ source $stdenv/setup
tar zxvf $src
mkdir -p $out
-mv $name/* $out
+mv * $out
diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix
index 9f0440f0304..99d213a01da 100644
--- a/pkgs/development/libraries/java/jdom/default.nix
+++ b/pkgs/development/libraries/java/jdom/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = http://www.jdom.org/dist/binary/jdom-1.0.tar.gz;
- md5 = "ce29ecc05d63fdb419737fd00c04c281";
+ sha256 = "1igmxzcy0s25zcy9vmcw0kd13lh60r0b4qg8lnp1jic33f427pxf";
};
meta = {
diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix
index d7316ba3927..eb440657278 100644
--- a/pkgs/development/libraries/java/jzmq/default.nix
+++ b/pkgs/development/libraries/java/jzmq/default.nix
@@ -1,29 +1,30 @@
-{stdenv, fetchgit, automake, autoconf, libtool, pkgconfig, zeromq2, jdk}:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zeromq3, jdk }:
stdenv.mkDerivation rec {
- name = "jzmq-2.1.0";
+ name = "jzmq-${version}";
+ version = "3.1.0";
- src = fetchgit {
- url = git://github.com/zeromq/jzmq.git;
- rev = "946fd39780423b2df6e5efd9fa2cd863fd79c9db";
- sha256 = "08pqh673fcqwm68hmnsmzrz4vzlwr0x9hdysic5k5mh7z411xzmp";
+ src = fetchFromGitHub {
+ owner = "zeromq";
+ repo = "jzmq";
+ rev = "v${version}";
+ sha256 = "1wlzs604mgmqmrgpk4pljx2nrlxzdfi3r8k59qlm90fx8qkqkc63";
};
- buildInputs = [ automake autoconf libtool pkgconfig zeromq2 jdk ];
+ nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = [ pkgconfig zeromq3 jdk ];
- preConfigurePhases = ["./autogen.sh"];
preConfigure = ''
- sed -i -e 's|(JAVAC)|(JAVAC) -encoding utf8|' src/Makefile.in
${if stdenv.system == "x86_64-darwin" then
'' sed -i -e 's~/Headers~/include~' -e 's~_JNI_INC_SUBDIRS=\".*\"~_JNI_INC_SUBDIRS=\"darwin\"~' configure
'' else ""}
'';
-
- maintainers = [ stdenv.lib.maintainers.vizanto ];
meta = {
homepage = "http://www.zeromq.org";
description = "Java bindings for ZeroMQ";
platforms = stdenv.lib.platforms.unix;
+ license = stdenv.lib.licenses.lgpl3;
+ maintainers = [ stdenv.lib.maintainers.vizanto ];
};
}
diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix
index 1677376230b..fcd884f0a41 100644
--- a/pkgs/development/libraries/java/saxon/default.nix
+++ b/pkgs/development/libraries/java/saxon/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
builder = ./unzip-builder.sh;
src = fetchurl {
url = mirror://sourceforge/saxon/saxon6_5_3.zip;
- md5 = "7b8c7c187473c04d2abdb40d8ddab5c6";
+ sha256 = "0l5y3y2z4wqgh80f26dwwxwncs8v3nkz3nidv14z024lmk730vs3";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/development/libraries/java/saxon/default8.nix b/pkgs/development/libraries/java/saxon/default8.nix
index 7f1f0e260c0..7728737977c 100644
--- a/pkgs/development/libraries/java/saxon/default8.nix
+++ b/pkgs/development/libraries/java/saxon/default8.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "saxonb-8.8";
src = fetchurl {
url = mirror://sourceforge/saxon/saxonb8-8j.zip;
- md5 = "35c4c376174cfe340f179d2e44dd84f0";
+ sha256 = "15bzrfyd2f1045rsp9dp4znyhmizh1pm97q8ji2bc0b43q23xsb8";
};
buildInputs = [unzip];
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 9453aa0635c..00000000000
--- 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/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix
index a332487d4ed..84638bc01ea 100644
--- a/pkgs/development/libraries/jemalloc/default.nix
+++ b/pkgs/development/libraries/jemalloc/default.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "jemalloc-4.1.1";
+ name = "jemalloc-${version}";
+ version = "4.3.1";
src = fetchurl {
- url = "http://www.canonware.com/download/jemalloc/${name}.tar.bz2";
- sha256 = "1bmdr51wxiir595k2r6z9a7rcgm42kkgnr586xir7vdcndr3pwf8";
+ url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${name}.tar.bz2";
+ sha256 = "12r71i8nm3vwz21fc16rwbb0pwcg5s05n1qg3rwl2s85v0x1ifzp";
};
# By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix=";
meta = with stdenv.lib; {
- homepage = http://www.canonware.com/jemalloc/index.html;
+ homepage = http://jemalloc.net;
description = "General purpose malloc(3) implementation";
longDescription = ''
malloc(3)-compatible memory allocator that emphasizes fragmentation
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 4b214c37a69..936a3953a51 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
@@ -144,6 +139,7 @@ let
plasma-framework = callPackage ./plasma-framework.nix {};
solid = callPackage ./solid.nix {};
sonnet = callPackage ./sonnet.nix {};
+ syntax-highlighting = callPackage ./syntax-highlighting.nix {};
threadweaver = callPackage ./threadweaver.nix {};
};
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 365d44c5e39..5ca0631730b 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/frameworks/5.27/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/frameworks/5.29/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
index 0a782ae177d..161ce52d4f2 100644
--- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
+++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
@@ -1,5 +1,5 @@
{ kdeFramework, lib, ecm, kbookmarks, kcompletion
-, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications
+, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications, kpackage
, kwidgetsaddons, libXcursor, qtx11extras
}:
@@ -8,7 +8,7 @@ kdeFramework {
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ ecm ];
propagatedBuildInputs = [
- kbookmarks kcompletion kconfig kconfigwidgets knotifications ki18n kio
- kiconthemes kwidgetsaddons libXcursor qtx11extras
+ kbookmarks kcompletion kconfig kconfigwidgets ki18n kio kiconthemes
+ knotifications kpackage kwidgetsaddons libXcursor qtx11extras
];
}
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 a48ba32be22..00000000000
--- a/pkgs/development/libraries/kde-frameworks/kde-env.nix
+++ /dev/null
@@ -1,40 +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
-
- for p in $propagated; do
- for s in applications dbus-1 desktop-directories icons mime polkit-1; do
- if [ -d "$p/share/$s" ]; then
- propagatedUserEnvPkgs+=" $p"
- break
- 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 d340a5edbf7..3591e20d11f 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,23 +18,49 @@ 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
fi
done
- mkdir -p "$out/nix-support"
- ln -s "$env/nix-support/propagated-user-env-packages" "$out/nix-support/"
+ if [ -a "$drv/share" ]; then
+ ln -s "$drv/share" "$out"
+ fi
+
+ if [ -a "$drv/nix-support/propagated-user-env-packages" ]; then
+ mkdir -p "$out/nix-support"
+ ln -s "$drv/nix-support/propagated-user-env-packages" "$out/nix-support/"
+ fi
'';
}
diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
index 76ab7dbe013..86ca5935a75 100644
--- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
@@ -1,10 +1,7 @@
-{ kdeFramework, lib, copyPathsToStore
-, ecm
-, karchive
-, kconfig
-, kcoreaddons
-, kdoctools
-, ki18n
+{
+ kdeFramework, fetchurl, lib, copyPathsToStore,
+ ecm, kdoctools,
+ karchive, kconfig, kcoreaddons, ki18n
}:
kdeFramework {
diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
index 8cd7e95b659..0e444cc8db6 100644
--- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
+++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
@@ -3,7 +3,7 @@
, karchive, kconfig, kguiaddons, kiconthemes, kparts
, libgit2
, qtscript, qtxmlpatterns
-, ki18n, kio, sonnet
+, ki18n, kio, sonnet, syntax-highlighting
}:
kdeFramework {
@@ -12,6 +12,6 @@ kdeFramework {
nativeBuildInputs = [ ecm perl ];
propagatedBuildInputs = [
karchive kconfig kguiaddons ki18n kiconthemes kio kparts libgit2 qtscript
- qtxmlpatterns sonnet
+ qtxmlpatterns sonnet syntax-highlighting
];
}
diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
index fe5ba503a40..963e9322727 100644
--- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
+++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
@@ -1,24 +1,17 @@
{ kdeFramework, lib, fetchurl, ecm, kactivities, karchive
, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio
-, knotifications, kpackage, kservice, kwindowsystem, kxmlgui
+, knotifications, kpackage, kservice, kwayland, kwindowsystem, kxmlgui
, qtscript, qtx11extras
}:
kdeFramework {
name = "plasma-framework";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
- patches = [
- (fetchurl {
- url = "https://cgit.kde.org/plasma-framework.git/patch/?id=62b0865492d863cd000814054681ba6a97972cd5";
- sha256 = "1ipz79apa9lkvcyfm5pap6v67hzncfz60z7s00zi6rnlbz96cy5f";
- name = "plasma-framework-osd-no-dialog.patch";
- })
- ];
nativeBuildInputs = [ ecm kdoctools ];
propagatedBuildInputs = [
kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons
kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications
- kpackage kservice kwindowsystem kxmlgui qtscript qtx11extras
+ kpackage kservice kwayland kwindowsystem kxmlgui qtscript qtx11extras
];
}
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 4891c1bc07b..7bc0f55dc8b 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,579 +3,595 @@
{
attica = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/attica-5.27.0.tar.xz";
- sha256 = "0w6dwq83vj70m8rf52x60a64f6s6h0y7c948j3hddfql7s3ghha7";
- name = "attica-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/attica-5.29.0.tar.xz";
+ sha256 = "1xiaqqq77w0hxr79rpixvy5kak2xgxwi5860qf3bbpz89bpyi5d1";
+ name = "attica-5.29.0.tar.xz";
};
};
baloo = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/baloo-5.27.0.tar.xz";
- sha256 = "0dqa5sxz2z440h6zry7s1x0r1d919qky69i5fv2nir7y844xx2cc";
- name = "baloo-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/baloo-5.29.0.tar.xz";
+ sha256 = "06zq0nnqm8qs4dx548l952i5hi6yazi4c3kb75d0k6jvjsfhgh3n";
+ name = "baloo-5.29.0.tar.xz";
};
};
bluez-qt = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/bluez-qt-5.27.0.tar.xz";
- sha256 = "111gqxw1bvazdhxk5rcfhi438i6bd92r3wvlkxsdqrp7ypcqdpig";
- name = "bluez-qt-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/bluez-qt-5.29.0.tar.xz";
+ sha256 = "15rnh8vnmxrq6phvk3g7x69pvsblhrr91z4ldd8x4q895dpwk3vg";
+ name = "bluez-qt-5.29.0.tar.xz";
};
};
breeze-icons = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/breeze-icons-5.27.0.tar.xz";
- sha256 = "12awfvka9sgdgh7dyg7cw7myw7fxrx1w93s1gyhdq2drjsdbghgz";
- name = "breeze-icons-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/breeze-icons-5.29.0.tar.xz";
+ sha256 = "1bpvpza0hm3krr4b6pp9aakmjs4vnmk2bbl9zirzsj7rg2nnrb8b";
+ name = "breeze-icons-5.29.0.tar.xz";
};
};
extra-cmake-modules = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/extra-cmake-modules-5.27.0.tar.xz";
- sha256 = "0n7vw2a4kxdgpsc1wn9f1d0y01p6qfk8ac360rq329bvdpigxmnj";
- name = "extra-cmake-modules-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/extra-cmake-modules-5.29.0.tar.xz";
+ sha256 = "1n4q1s9q3gnxp050s0kddabbhgl0rfxrpsmfci5vsd92dri6xxs8";
+ name = "extra-cmake-modules-5.29.0.tar.xz";
};
};
frameworkintegration = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/frameworkintegration-5.27.0.tar.xz";
- sha256 = "0zpv7wj2006f039wr1gp5bc4md8yq9ig5g3v5mx46sdjip5423p1";
- name = "frameworkintegration-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/frameworkintegration-5.29.0.tar.xz";
+ sha256 = "0ljsrz1yyj09k00q0xx0zps3wi6wrmkqvxrc81kw0qv14d5rxf7b";
+ name = "frameworkintegration-5.29.0.tar.xz";
};
};
kactivities = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kactivities-5.27.0.tar.xz";
- sha256 = "08x07rlf2gff1j9jahznz2838919vab1ay8jppz3bp5kywx104yk";
- name = "kactivities-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kactivities-5.29.0.tar.xz";
+ sha256 = "1mnpqwz6rfv07fmpdccp2fxxf0pdjp2b8jamjfn51zk4krz0vjrr";
+ name = "kactivities-5.29.0.tar.xz";
};
};
kactivities-stats = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kactivities-stats-5.27.0.tar.xz";
- sha256 = "134a3zgasza9wghp1lkiaar3sakag7vn82pm2kcrmr420a0jigsw";
- name = "kactivities-stats-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kactivities-stats-5.29.0.tar.xz";
+ sha256 = "16cxmp9pzmcap722fclx8xjap56ldslghcn8qj0n8ds5crcd6h80";
+ name = "kactivities-stats-5.29.0.tar.xz";
};
};
kapidox = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kapidox-5.27.0.tar.xz";
- sha256 = "193m0qpcqdkspdcwc8cwabjjcqyd9d0m5kl53mycyiv1m220x11l";
- name = "kapidox-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kapidox-5.29.0.tar.xz";
+ sha256 = "184jjm3kyb1m1mdqac8h37g4cibni86zan4d52ac00mz7lmibmhp";
+ name = "kapidox-5.29.0.tar.xz";
};
};
karchive = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/karchive-5.27.0.tar.xz";
- sha256 = "1c7bifmzyr398p1qx9qfxp893wbr44sjn3sda9q0hdpmw2i7yf3z";
- name = "karchive-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/karchive-5.29.0.tar.xz";
+ sha256 = "11i9kj890n2y4mgs3vykfg0r5iva4g3ydk3ywbkcmvryd2hvp4ch";
+ name = "karchive-5.29.0.tar.xz";
};
};
kauth = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kauth-5.27.0.tar.xz";
- sha256 = "17z6dh1qdpd490z84g6ynl8bcrr9naalvh34ybnpipvx3qs50kwl";
- name = "kauth-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kauth-5.29.0.tar.xz";
+ sha256 = "0789q90sk4203x94y508sd03zzd7pll9yg480kbfavqr8bxivigj";
+ name = "kauth-5.29.0.tar.xz";
};
};
kbookmarks = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kbookmarks-5.27.0.tar.xz";
- sha256 = "1lb20yn8s27h0965yf6w4v4wwlm80bl24mpsksp01z9f0711j8vm";
- name = "kbookmarks-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kbookmarks-5.29.0.tar.xz";
+ sha256 = "1ipziszcf7hddzi0kd41ddz56m79dy6jz325k37byzmc4xj15abi";
+ name = "kbookmarks-5.29.0.tar.xz";
};
};
kcmutils = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kcmutils-5.27.0.tar.xz";
- sha256 = "04nbd0836azs2i0pq8hq8ljnmfc45mqs022zdn84xd2q3npl3hfx";
- name = "kcmutils-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kcmutils-5.29.0.tar.xz";
+ sha256 = "1winmnr1pdspj3i3qwlblqsppb641yj3bcvl50xy8gh47w1n39q2";
+ name = "kcmutils-5.29.0.tar.xz";
};
};
kcodecs = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kcodecs-5.27.0.tar.xz";
- sha256 = "0f4k276sm0svh5y8yyq8hfc5vy60cpsrwany7kswyh22m57v5j8a";
- name = "kcodecs-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kcodecs-5.29.0.tar.xz";
+ sha256 = "0ki9aws9kfhcchp8qwl696qwcgz4a2z4w1f9rarl7hblhlly0mx7";
+ name = "kcodecs-5.29.0.tar.xz";
};
};
kcompletion = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kcompletion-5.27.0.tar.xz";
- sha256 = "1mb64ii4ilhqhy9p6cl3phs17bg3lr4b60jkkm71yn2wnd4wl47s";
- name = "kcompletion-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kcompletion-5.29.0.tar.xz";
+ sha256 = "1h2yd5gsb24h7k41fcmmbg96i4k3rmqc5pgp6vnb7m767mlcy6kb";
+ name = "kcompletion-5.29.0.tar.xz";
};
};
kconfig = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kconfig-5.27.0.tar.xz";
- sha256 = "18dpm0r4nnvmxrask6rv5dkniwna9hh72ffdnvjgrh8p5djs9szi";
- name = "kconfig-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kconfig-5.29.0.tar.xz";
+ sha256 = "0izss1hz41pbmfsxa8xlj5f6hx4r5jjpapp1km9926yy104jxhfn";
+ name = "kconfig-5.29.0.tar.xz";
};
};
kconfigwidgets = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kconfigwidgets-5.27.0.tar.xz";
- sha256 = "0sbhirfsjmsxiwaqqh5jh85bhwmij93gj5knnb0bs0al4hy29918";
- name = "kconfigwidgets-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kconfigwidgets-5.29.0.tar.xz";
+ sha256 = "0xay4kfz3cfhs82h0qp707qflb4vxrar7sh7b7wwkp4s0yhq15fa";
+ name = "kconfigwidgets-5.29.0.tar.xz";
};
};
kcoreaddons = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kcoreaddons-5.27.0.tar.xz";
- sha256 = "0rzpxajv041kdbk92rwxq1qnvzyrxfjy154d8257yj2fj76w1gnw";
- name = "kcoreaddons-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kcoreaddons-5.29.0.tar.xz";
+ sha256 = "1xmk9hqrzfn7bix9ch5v7nrl7ff16z1pmz3rghyb06cvvbx3k2z2";
+ name = "kcoreaddons-5.29.0.tar.xz";
};
};
kcrash = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kcrash-5.27.0.tar.xz";
- sha256 = "09wf4dzckc9l8dyl8qs1wc54h4rm38i2blzyyicm4iazi420lysk";
- name = "kcrash-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kcrash-5.29.0.tar.xz";
+ sha256 = "097294n52ac2mh55i8cwvx75rfgr12kvpf5zszha97whn0hm9nrv";
+ name = "kcrash-5.29.0.tar.xz";
};
};
kdbusaddons = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kdbusaddons-5.27.0.tar.xz";
- sha256 = "1vgdl9z5xyfr2b5z7n2vdh0s6zab6ccxp30p1cy8hhhrsf04663m";
- name = "kdbusaddons-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kdbusaddons-5.29.0.tar.xz";
+ sha256 = "15is9d0kmcwd7qy8annf2y1bqwq3vwcrlqym1pjsifyc5n226b0j";
+ name = "kdbusaddons-5.29.0.tar.xz";
};
};
kdeclarative = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kdeclarative-5.27.0.tar.xz";
- sha256 = "1a8pqwrwgmzarinhr9xxviqh9417p8icj8lwqg9ly0q0j3yv20dh";
- name = "kdeclarative-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kdeclarative-5.29.0.tar.xz";
+ sha256 = "0ki58bd97a7vw90989msxy9npgha6652qhydn8ks0x8gxd9zwcq3";
+ name = "kdeclarative-5.29.0.tar.xz";
};
};
kded = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kded-5.27.0.tar.xz";
- sha256 = "14f4qxia9p3vynv2ch9rs67zaxn9kpbas0fn0vwag1ikxb8qz0c2";
- name = "kded-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kded-5.29.0.tar.xz";
+ sha256 = "092j7a7jm0h4lc0yphy5z6mg3r29fxjvghajcdla5vfqha33j8pb";
+ name = "kded-5.29.0.tar.xz";
};
};
kdelibs4support = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/portingAids/kdelibs4support-5.27.0.tar.xz";
- sha256 = "17b8d5b9w27251k4r5xc17115nc3k1agv7j7gkmdiybjyilj1n91";
- name = "kdelibs4support-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/portingAids/kdelibs4support-5.29.0.tar.xz";
+ sha256 = "1wiilwgyk3rdxha076mz2wpwmpgaprv7j0c8bzk2qqmxph5n9hz1";
+ name = "kdelibs4support-5.29.0.tar.xz";
};
};
kdesignerplugin = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kdesignerplugin-5.27.0.tar.xz";
- sha256 = "157lny5v8js63nvw2iyc9j4cinqmyj75a389s46n8wqyygrz5v0v";
- name = "kdesignerplugin-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kdesignerplugin-5.29.0.tar.xz";
+ sha256 = "01x8i7rm0c71cql57s7ikwdb03n1i0hkhgf88w24dzwnv7b6l2yg";
+ name = "kdesignerplugin-5.29.0.tar.xz";
};
};
kdesu = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kdesu-5.27.0.tar.xz";
- sha256 = "1l501z102ygibz4000jnngm0cggh2kaf6hzra1ngv5nxqxzkh31a";
- name = "kdesu-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kdesu-5.29.0.tar.xz";
+ sha256 = "1lkxfss8i641k09h4b5qcf7xiybskfrp8z1zzllcmjfaqfcwwk45";
+ name = "kdesu-5.29.0.tar.xz";
};
};
kdewebkit = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kdewebkit-5.27.0.tar.xz";
- sha256 = "0ff6xnfc5airadk32s2d3jmmmzilgnwc9r6bvmvnai0f7c4db48f";
- name = "kdewebkit-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kdewebkit-5.29.0.tar.xz";
+ sha256 = "0xg41ij5in3n08np65wgf5h4qwy4p7y8nlrcn4qakiincif7xqs0";
+ name = "kdewebkit-5.29.0.tar.xz";
};
};
kdnssd = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kdnssd-5.27.0.tar.xz";
- sha256 = "0dq2i4f4ny5cwgd41mjw5i7cf23ns55s2m13cjvxvy90nwhlymqp";
- name = "kdnssd-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kdnssd-5.29.0.tar.xz";
+ sha256 = "1bg3z5ng43iy2v081n5ma8lk9qnhks2m95hmfn82wc19jb5lgvja";
+ name = "kdnssd-5.29.0.tar.xz";
};
};
kdoctools = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kdoctools-5.27.0.tar.xz";
- sha256 = "1hgg19da0918mx8z2614qljvj9j8bny78mwlyljf42814f3ycpam";
- name = "kdoctools-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kdoctools-5.29.0.tar.xz";
+ sha256 = "0zd3zc42avw4ml0i4ayvzif1s0lrg5770q8hvi7m2ycxip2xrfk0";
+ name = "kdoctools-5.29.0.tar.xz";
};
};
kemoticons = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kemoticons-5.27.0.tar.xz";
- sha256 = "0rjw2g3lfdxiy56x61d0sdcmcs8rml6h29a05fp6xww2bqcvr9wq";
- name = "kemoticons-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kemoticons-5.29.0.tar.xz";
+ sha256 = "0xxm4haxkyqb3sbifbp9k58vb9n79y8h3c5xfxwc3y7xiwbswaba";
+ name = "kemoticons-5.29.0.tar.xz";
};
};
kfilemetadata = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kfilemetadata-5.27.0.tar.xz";
- sha256 = "1la6h05izgnps10py2gcn4xnwz3fm7dyswib57flc8phzipxbg5q";
- name = "kfilemetadata-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kfilemetadata-5.29.0.tar.xz";
+ sha256 = "1hliggn5h3mi81hz6d4flrv5d25bqbih6xq6miysrr7ws5vg07c2";
+ name = "kfilemetadata-5.29.0.tar.xz";
};
};
kglobalaccel = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kglobalaccel-5.27.0.tar.xz";
- sha256 = "1z2knfxcla1f191cifij1fzw88b076yx6qjxraqfsmkc6g6i2bmj";
- name = "kglobalaccel-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kglobalaccel-5.29.0.tar.xz";
+ sha256 = "0wsmnwxnmcgi7rnkvh4vfcvv9pwq1kcd98j5l6h9xwbirz247caz";
+ name = "kglobalaccel-5.29.0.tar.xz";
};
};
kguiaddons = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kguiaddons-5.27.0.tar.xz";
- sha256 = "1skvlcj0fgb4am02vlm4fyd52f9yn4y0aj5arcfz3qps5cjzr6xg";
- name = "kguiaddons-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kguiaddons-5.29.0.tar.xz";
+ sha256 = "1cgq04k66xzmawqrgh2xhyl1dmylkcfsf1mgbilanq46niv6v47k";
+ name = "kguiaddons-5.29.0.tar.xz";
};
};
khtml = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/portingAids/khtml-5.27.0.tar.xz";
- sha256 = "05ssmgk2gr5v1x1lsvyyspvnlknmkxivgx1g210i9ayl08v8v3c0";
- name = "khtml-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/portingAids/khtml-5.29.0.tar.xz";
+ sha256 = "1rrhpx5ny868nhd2z52zf4n2kybxv8lciyi3wla0k87gwcdm3ryv";
+ name = "khtml-5.29.0.tar.xz";
};
};
ki18n = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/ki18n-5.27.0.tar.xz";
- sha256 = "0a66z325bvdv7g6ysml2bf8559nkjhv2fxwj1ja6vsxkn95d54ff";
- name = "ki18n-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/ki18n-5.29.0.tar.xz";
+ sha256 = "0w4nqyqi9p92vfi5b07s9k8hjmkj2qdclnyclsdy7lshkxsqfbm7";
+ name = "ki18n-5.29.0.tar.xz";
};
};
kiconthemes = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kiconthemes-5.27.0.tar.xz";
- sha256 = "0m70vcrxp0vvqw5grlsn19d2hgdhky8iv2pr0xwzw8v5yrnl1hh2";
- name = "kiconthemes-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kiconthemes-5.29.0.tar.xz";
+ sha256 = "09dj6v7mvmhbkax35884g729ikfdvazvnhz327vgsb3ybbmx475h";
+ name = "kiconthemes-5.29.0.tar.xz";
};
};
kidletime = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kidletime-5.27.0.tar.xz";
- sha256 = "1cv6d2vylz7vymn4v0brv2jp1kzscvm9wh1ylp3wyi1jqyblgjfw";
- name = "kidletime-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kidletime-5.29.0.tar.xz";
+ sha256 = "0nnrgi38jn5r2gvmsg3425y1k53g5n5bzbhcf71d484d00740rix";
+ name = "kidletime-5.29.0.tar.xz";
};
};
kimageformats = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kimageformats-5.27.0.tar.xz";
- sha256 = "0ijy7di9p37l6fjrmsday402vq4zibq1m37jghkvdymawxcrd22h";
- name = "kimageformats-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kimageformats-5.29.0.tar.xz";
+ sha256 = "0385al48zdnpv2d2g59ls8y8fljlfyflpvrladxcqr75ywsap7xa";
+ name = "kimageformats-5.29.0.tar.xz";
};
};
kinit = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kinit-5.27.0.tar.xz";
- sha256 = "0sbpl1sp1ajarjmnvx2l3dr09afsay28kp2sf4yacrm4lrmhwzip";
- name = "kinit-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kinit-5.29.0.tar.xz";
+ sha256 = "0cqh8dljgr72zny4hhypc4j7mc6lrplbdvw262vszq5hqn25dn6n";
+ name = "kinit-5.29.0.tar.xz";
};
};
kio = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kio-5.27.0.tar.xz";
- sha256 = "129sglaw1480v3i1xdyv6k1w3spbj8s00rkdr5mzlcdaqiig69rn";
- name = "kio-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kio-5.29.0.tar.xz";
+ sha256 = "0sswjmbjnfi7sh6j3qzc98jkpp3bwgmfmvg61r484sj65900xkjj";
+ name = "kio-5.29.0.tar.xz";
};
};
kitemmodels = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kitemmodels-5.27.0.tar.xz";
- sha256 = "00qgp5i35r7k9gy43wypn9fa7zxiqqip89dzbw8r6rabinihqzy2";
- name = "kitemmodels-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kitemmodels-5.29.0.tar.xz";
+ sha256 = "1ss291hkvyhkzm5v1klrbhkkvw0f35acdf7q2x04ggs06cvryxw3";
+ name = "kitemmodels-5.29.0.tar.xz";
};
};
kitemviews = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kitemviews-5.27.0.tar.xz";
- sha256 = "1469i10y2c3i1pdhzl9nk177y4n1mlc7p5w7kivdcrvf9ilxvbkx";
- name = "kitemviews-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kitemviews-5.29.0.tar.xz";
+ sha256 = "1872rynqi9pgc0670vhxa5n7r63arh4q1g62sw76xp5s0kzgxpvh";
+ name = "kitemviews-5.29.0.tar.xz";
};
};
kjobwidgets = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kjobwidgets-5.27.0.tar.xz";
- sha256 = "05c6jzl2a37bfz5i7hzsjmrhh8ajx1gbz7j05wgal811m5m4ww8l";
- name = "kjobwidgets-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kjobwidgets-5.29.0.tar.xz";
+ sha256 = "0sim3sxz02sg9y1vlp9d5xxby9anx2s10z80iys2mbhw1hw1ivn8";
+ name = "kjobwidgets-5.29.0.tar.xz";
};
};
kjs = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/portingAids/kjs-5.27.0.tar.xz";
- sha256 = "18x4az3v4pbg77sxhmrdrfwrc9d9fw7l40m6p18k1khxn86hsp9j";
- name = "kjs-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/portingAids/kjs-5.29.0.tar.xz";
+ sha256 = "196lnlynnc4kf7hy2zw2dyba5h1mn6l5d1000h50g62fbg8xwh7k";
+ name = "kjs-5.29.0.tar.xz";
};
};
kjsembed = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/portingAids/kjsembed-5.27.0.tar.xz";
- sha256 = "1j42v2l41mwn0ms29b94py21dh7kiipkgdnigpbn89v7nkhwlq2b";
- name = "kjsembed-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/portingAids/kjsembed-5.29.0.tar.xz";
+ sha256 = "1g5ppari446fa4ybjgj5j63fz4grj341019w2s4dqyp05l5sf197";
+ name = "kjsembed-5.29.0.tar.xz";
};
};
kmediaplayer = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/portingAids/kmediaplayer-5.27.0.tar.xz";
- sha256 = "003jvd2lzp70ywhnkpzgalzqkjpy3d9flkl144z2hfdwm011d58x";
- name = "kmediaplayer-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/portingAids/kmediaplayer-5.29.0.tar.xz";
+ sha256 = "0hs6vy28c0f41c8s0ip5ggy96rhrf3p3kb1d69v8z9yi1jd9jhaw";
+ name = "kmediaplayer-5.29.0.tar.xz";
};
};
knewstuff = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/knewstuff-5.27.0.tar.xz";
- sha256 = "05ikb7cvyx3cmrrjh2ss6439a49vmzbi3chjj23ffdz2nd2k7r2f";
- name = "knewstuff-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/knewstuff-5.29.0.tar.xz";
+ sha256 = "1cfkppd1p40lbadrj34lh7msix0bpqmnnc1xwh2wx35va58phrc1";
+ name = "knewstuff-5.29.0.tar.xz";
};
};
knotifications = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/knotifications-5.27.0.tar.xz";
- sha256 = "09v122nxfgqjzr2azfn2nh4q9l22i5wnsz9prs0i7s3m7y0d7pxn";
- name = "knotifications-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/knotifications-5.29.0.tar.xz";
+ sha256 = "0bb6s72p78wiq172fx5f07c55zvd3rackgh1fcgkzg84lnvzx938";
+ name = "knotifications-5.29.0.tar.xz";
};
};
knotifyconfig = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/knotifyconfig-5.27.0.tar.xz";
- sha256 = "088p19ynjs79zf7mq3gkds93dg72jj8pfya53xyhzdg8s6vyns9n";
- name = "knotifyconfig-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/knotifyconfig-5.29.0.tar.xz";
+ sha256 = "1kab22gfb12bc2dl87m13crcrwhf8djdr8cmwrykjdm1ln2a1d4w";
+ name = "knotifyconfig-5.29.0.tar.xz";
};
};
kpackage = {
- version = "5.27.0";
+ version = "5.29.1";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kpackage-5.27.0.tar.xz";
- sha256 = "0y07zh8ryibm69ljp9f169qfal6r4lngz1ljxgrr6qw15cjkjygk";
- name = "kpackage-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kpackage-5.29.1.tar.xz";
+ sha256 = "1vbwq5s1psii3qa6g260lpar37y19k8b2g5hn3pyx4llz5wnrali";
+ name = "kpackage-5.29.1.tar.xz";
};
};
kparts = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kparts-5.27.0.tar.xz";
- sha256 = "0rfsyr96s59ljp3jgmcwlvwzbgmlx7fvr62xswwmsnb8ah14k5rh";
- name = "kparts-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kparts-5.29.0.tar.xz";
+ sha256 = "0arpaz5qdswyj47z9craijsf4zafh50bw8vvklg1jc385bbgxhv1";
+ name = "kparts-5.29.0.tar.xz";
};
};
kpeople = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kpeople-5.27.0.tar.xz";
- sha256 = "1w6sbd6djcpv36m9my4drqkrs1l3cryshpz1dx9z8p7afr296n8j";
- name = "kpeople-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kpeople-5.29.0.tar.xz";
+ sha256 = "19sb0j5qbi299f752z589cbbh3rjxkzm074v3rj9sqgah1hdssg8";
+ name = "kpeople-5.29.0.tar.xz";
};
};
kplotting = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kplotting-5.27.0.tar.xz";
- sha256 = "1qp9q8g9yxy359bylyqyqxjq9wjismajrg4xhxx5xn4s6znyrxny";
- name = "kplotting-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kplotting-5.29.0.tar.xz";
+ sha256 = "07yz1f5ifjvxsaphbyvbvqzvmc1w6rkb9fh8xglf8z9p9drz23qb";
+ name = "kplotting-5.29.0.tar.xz";
};
};
kpty = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kpty-5.27.0.tar.xz";
- sha256 = "06pka8cbw6a9rk2j5pkz34rfy10bv6il3wqyf7ala32ynv5rcgc3";
- name = "kpty-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kpty-5.29.0.tar.xz";
+ sha256 = "08b8qg35g9g4rkfn6zwv2kggh6y5wlg33zbj28n1idszq6qpgh7i";
+ name = "kpty-5.29.0.tar.xz";
};
};
kross = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/portingAids/kross-5.27.0.tar.xz";
- sha256 = "13karf890afk3dplxgsjx48vjz1ka12pgsi8qw369xbff5nqy2vj";
- name = "kross-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/portingAids/kross-5.29.0.tar.xz";
+ sha256 = "1q6pm6iv3896y1sj7b8p7agjlzfi9f5qmpbadk499d0rn9c6520v";
+ name = "kross-5.29.0.tar.xz";
};
};
krunner = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/krunner-5.27.0.tar.xz";
- sha256 = "1yyxyippmn0d9ycj1hdjvhl1zd31yxwg89a9zwmj8v8gdfr9flj9";
- name = "krunner-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/krunner-5.29.0.tar.xz";
+ sha256 = "1kjzl239a136p6zpkgj570s5i649hzwrgylq213jh31h251a93qx";
+ name = "krunner-5.29.0.tar.xz";
};
};
kservice = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kservice-5.27.0.tar.xz";
- sha256 = "129bjdr272qkz2inmagy8jnxasifrl4d82x8rp9akfar29qsj6x6";
- name = "kservice-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kservice-5.29.0.tar.xz";
+ sha256 = "0440hgcwm8p421y8xrlill9n2bzfrr0v8ln7pcm45b09bwsgz5l7";
+ name = "kservice-5.29.0.tar.xz";
};
};
ktexteditor = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/ktexteditor-5.27.0.tar.xz";
- sha256 = "127wp4dg72skd6abn2vqffxg91bn59z8yxwy6lxyzvck2pc5v1ss";
- name = "ktexteditor-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/ktexteditor-5.29.0.tar.xz";
+ sha256 = "19krz968bxyv9r43gw1nh7fkkfsgsidhg2k9z0p7cplm6asqvdas";
+ name = "ktexteditor-5.29.0.tar.xz";
};
};
ktextwidgets = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/ktextwidgets-5.27.0.tar.xz";
- sha256 = "0aq2qx64wylxj5q5sr0dxv9h8bmn725llxyi7iwz31dg2ngfr7m4";
- name = "ktextwidgets-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/ktextwidgets-5.29.0.tar.xz";
+ sha256 = "11iwcak2r12wxbkj8i7pg3g1cnymmgh8lvkpbsszkmyisqbyrz27";
+ name = "ktextwidgets-5.29.0.tar.xz";
};
};
kunitconversion = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kunitconversion-5.27.0.tar.xz";
- sha256 = "11rn6813jz7clb6fjp9nbdg1c350zh0yiprbr053wkdjrb3aca7c";
- name = "kunitconversion-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kunitconversion-5.29.0.tar.xz";
+ sha256 = "1vzmx3wiphi88xc5dh69vj5jdmz0pxzbiiqiqyi38a1nkq7a9pv7";
+ name = "kunitconversion-5.29.0.tar.xz";
};
};
kwallet = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kwallet-5.27.0.tar.xz";
- sha256 = "1mlrkzvbqk6r43yqrvv6jsc66brzjd321fp7mg7g3ny47va7hbc2";
- name = "kwallet-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kwallet-5.29.0.tar.xz";
+ sha256 = "15jcn8zg7bz2vn6kwxvj0b6k9kpnx48zrcfa2ibb1rjp71cxgwc1";
+ name = "kwallet-5.29.0.tar.xz";
};
};
kwayland = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kwayland-5.27.0.tar.xz";
- sha256 = "0va1kmki2xr4mx2918h333mfkqs5v1mhbzyf71hq190izdz0jdss";
- name = "kwayland-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kwayland-5.29.0.tar.xz";
+ sha256 = "0mz9v7g91im2xwdh5f4ym8z52ylva7kyr0hxl5p88b7y6azxqmz9";
+ name = "kwayland-5.29.0.tar.xz";
};
};
kwidgetsaddons = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kwidgetsaddons-5.27.0.tar.xz";
- sha256 = "0p9gxna7y7nigpi0ri7k45g4pf1svq0kxrhk4wf7rj58rilhcfrl";
- name = "kwidgetsaddons-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kwidgetsaddons-5.29.0.tar.xz";
+ sha256 = "19hvs3jqmj0jwsjszq6fn7m6d5d80bsd5wz4x8m39w1nmsgj032d";
+ name = "kwidgetsaddons-5.29.0.tar.xz";
};
};
kwindowsystem = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kwindowsystem-5.27.0.tar.xz";
- sha256 = "0w49lpwicl71gyyf2aisvmfjpvjl3w1rqpx4a42ph0aywjihjmhx";
- name = "kwindowsystem-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kwindowsystem-5.29.0.tar.xz";
+ sha256 = "19bzirhkjqn41f9n540wnhrc0y5qvxcbgi87np9ijc3mpkzfn7in";
+ name = "kwindowsystem-5.29.0.tar.xz";
};
};
kxmlgui = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kxmlgui-5.27.0.tar.xz";
- sha256 = "0hf55ip2irbsbg59r36njgb0h5ygpaspa4x6jfyi4bxj852c3hw1";
- name = "kxmlgui-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kxmlgui-5.29.0.tar.xz";
+ sha256 = "1h85hiy58jl25r7d9z43kkybfvd2hjk5l4nmcy9jw5lrmmgnrgq0";
+ name = "kxmlgui-5.29.0.tar.xz";
};
};
kxmlrpcclient = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/kxmlrpcclient-5.27.0.tar.xz";
- sha256 = "17bavm8qj4r1kc67x5g20v1pl8arjqpn69hg7icp2b1b0vnfvav1";
- name = "kxmlrpcclient-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/kxmlrpcclient-5.29.0.tar.xz";
+ sha256 = "09rw4id0lg5j4ql46vj2pvwnjcn5nk40s0bl03z8jkqygg8w57b2";
+ name = "kxmlrpcclient-5.29.0.tar.xz";
};
};
modemmanager-qt = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/modemmanager-qt-5.27.0.tar.xz";
- sha256 = "1zw5frscvbsp0jpb071ssqgvm097ylw3zy69y7f0dybhps6lv2jv";
- name = "modemmanager-qt-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/modemmanager-qt-5.29.0.tar.xz";
+ sha256 = "08imlqr8xxah58gcyqv968gbmamf2xkjg31cs32h79yqcddjpvrd";
+ name = "modemmanager-qt-5.29.0.tar.xz";
};
};
networkmanager-qt = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/networkmanager-qt-5.27.0.tar.xz";
- sha256 = "0fnj0b2j4v51f12b3v59psdza2krdkidj22b9a9jwn224lg4852y";
- name = "networkmanager-qt-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/networkmanager-qt-5.29.0.tar.xz";
+ sha256 = "0km2yv0gpl584n6vh27d0q0lrrmc79hpcfxwihwk6g5rrlv5qnba";
+ name = "networkmanager-qt-5.29.0.tar.xz";
};
};
oxygen-icons5 = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/oxygen-icons5-5.27.0.tar.xz";
- sha256 = "1lb09ykj5ayj5lv7w2k2pqis7z61clr3gkinf6n7jghnlc96222g";
- name = "oxygen-icons5-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/oxygen-icons5-5.29.0.tar.xz";
+ sha256 = "1j9jxlfzndzimvk0zvk5nqqnic5bj04yg4a0v9kqlmr8l1mj4g4k";
+ name = "oxygen-icons5-5.29.0.tar.xz";
};
};
plasma-framework = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/plasma-framework-5.27.0.tar.xz";
- sha256 = "11apg7h636dshswikjpz0qkapv8izqjjz47k7vs49x0byp802s5i";
- name = "plasma-framework-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/plasma-framework-5.29.0.tar.xz";
+ sha256 = "1c341i5gvm65mk8dhwn61fmw0hc1npvj3mcwz0gy1ynkgch6afrh";
+ name = "plasma-framework-5.29.0.tar.xz";
+ };
+ };
+ prison = {
+ version = "5.29.0";
+ src = fetchurl {
+ url = "${mirror}/stable/frameworks/5.29/prison-5.29.0.tar.xz";
+ sha256 = "0hc7gk1xxhk5s6fk6rm822kpbr2k0kc40xpjg07gpglbvnxdbr7l";
+ name = "prison-5.29.0.tar.xz";
};
};
solid = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/solid-5.27.0.tar.xz";
- sha256 = "01qlfj30n8sr8xd8l8fimg7hs7h70ynhalk2m9l8dz2qay2pdl27";
- name = "solid-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/solid-5.29.0.tar.xz";
+ sha256 = "01y9fqar113bjh5l8mh03xwgv1j88ivnb1rxjcpgilv63qx2cw9k";
+ name = "solid-5.29.0.tar.xz";
};
};
sonnet = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/sonnet-5.27.0.tar.xz";
- sha256 = "07i3gng309vsf5kp5dlwca0lpi3iqc0lp0ixdvx75q832gk8ivrv";
- name = "sonnet-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/sonnet-5.29.0.tar.xz";
+ sha256 = "0rb9fslf6y694cwbng198r21nrid07gzirn3c11g91skskh8sd90";
+ name = "sonnet-5.29.0.tar.xz";
+ };
+ };
+ syntax-highlighting = {
+ version = "5.29.0";
+ src = fetchurl {
+ url = "${mirror}/stable/frameworks/5.29/syntax-highlighting-5.29.0.tar.xz";
+ sha256 = "0fbqkj3qsai3m322d2qmvh93h35sx7wdc28jxp8v8yddl59a1k6b";
+ name = "syntax-highlighting-5.29.0.tar.xz";
};
};
threadweaver = {
- version = "5.27.0";
+ version = "5.29.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.27/threadweaver-5.27.0.tar.xz";
- sha256 = "0mg5i125b008x6162a5h2q14fg81m17md00017n09xljw3099kqy";
- name = "threadweaver-5.27.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.29/threadweaver-5.29.0.tar.xz";
+ sha256 = "0sl9r6dz4l63f40a15kzsgqrsvdaxnm1rqkj61za8cbdbk2q42g6";
+ name = "threadweaver-5.29.0.tar.xz";
};
};
}
diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
new file mode 100644
index 00000000000..24b1bbc4f67
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
@@ -0,0 +1,9 @@
+{ kdeFramework, lib
+, ecm, perl
+}:
+
+kdeFramework {
+ name = "syntax-highlighting";
+ meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+ nativeBuildInputs = [ ecm perl ];
+}
diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix
index c279d698e12..883625e551a 100644
--- a/pkgs/development/libraries/ldns/default.nix
+++ b/pkgs/development/libraries/ldns/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1kf8pkwhcssvgzhh6ha1pjjiziwvwmfaali7kaafh6118mcy124b";
};
+ outputs = [ "out" "dev" ];
+
patches = [ ./perl-5.22-compat.patch ];
postPatch = ''
@@ -19,6 +21,10 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-ssl=${openssl.dev}" "--with-drill" ];
+ postInstall = ''
+ moveToOutput "bin/ldns-config" "$dev"
+ '';
+
meta = with stdenv.lib; {
description = "Library with the aim of simplifying DNS programming in C";
license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix
index c67b3701ec9..20531adcd1c 100644
--- a/pkgs/development/libraries/libLAS/default.nix
+++ b/pkgs/development/libraries/libLAS/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip }:
stdenv.mkDerivation rec {
- name = "libLAS-1.8.0";
+ name = "libLAS-1.8.1";
src = fetchurl {
url = "http://download.osgeo.org/liblas/${name}.tar.bz2";
- md5 = "599881281d45db4ce9adb2d75458391e";
+ sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws";
};
- buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip];
+ buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip ];
meta = {
diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix
index 229eca5e597..fc27f3a2c6b 100644
--- a/pkgs/development/libraries/libaacs/default.nix
+++ b/pkgs/development/libraries/libaacs/default.nix
@@ -7,15 +7,12 @@
# http://vlc-bluray.whoknowsmy.name/
# https://wiki.archlinux.org/index.php/BluRay
-let baseName = "libaacs";
- version = "0.8.1";
-in
-
-stdenv.mkDerivation {
- name = "${baseName}-${version}";
+stdenv.mkDerivation rec {
+ name = "libaacs-${version}";
+ version = "0.8.1";
src = fetchurl {
- url = "http://get.videolan.org/${baseName}/${version}/${baseName}-${version}.tar.bz2";
+ url = "http://get.videolan.org/libaacs/${version}/${name}.tar.bz2";
sha256 = "1s5v075hnbs57995r6lljm79wgrip3gnyf55a0y7bja75jh49hwm";
};
@@ -24,7 +21,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ yacc flex ];
meta = with stdenv.lib; {
- homepage = https://www.videolan.org/developers/libaacs.html;
+ homepage = "https://www.videolan.org/developers/libaacs.html";
description = "Library to access AACS protected Blu-Ray disks";
license = licenses.lgpl21;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix
index 2717a326f4a..ff256fb73c8 100644
--- a/pkgs/development/libraries/libappindicator/default.nix
+++ b/pkgs/development/libraries/libappindicator/default.nix
@@ -5,14 +5,14 @@
, glib, dbus_glib, gtkVersion
, gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null
, gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null
-, pythonPackages, gobjectIntrospection, vala_0_23
+, python2Packages, gobjectIntrospection, vala_0_23
, monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null
}:
with lib;
let
- inherit (pythonPackages) python pygobject2 pygtk;
+ inherit (python2Packages) python pygobject2 pygtk;
in stdenv.mkDerivation rec {
name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}";
in "libappindicator-${postfix}-${version}";
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index b2b00776582..3ee35e5bf57 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -10,11 +10,11 @@ assert xarSupport -> libxml2 != null;
stdenv.mkDerivation rec {
name = "libarchive-${version}";
- version = "3.2.1";
+ version = "3.2.2";
src = fetchurl {
url = "${meta.homepage}/downloads/${name}.tar.gz";
- sha256 = "1lngng84k1kkljl74q0cdqc3s82vn2kimfm02dgm4d6m7x71mvkj";
+ sha256 = "03q6y428rg723c9fj1vidzjw46w1vf8z0h95lkvz1l9jw571j739";
};
outputs = [ "out" "lib" "dev" ];
diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix
index 1f47e5f8dcd..4531546f33f 100644
--- a/pkgs/development/libraries/libbdplus/default.nix
+++ b/pkgs/development/libraries/libbdplus/default.nix
@@ -7,16 +7,12 @@
# http://vlc-bluray.whoknowsmy.name/
# https://wiki.archlinux.org/index.php/BluRay
-
-let baseName = "libbdplus";
- version = "0.1.2";
-in
-
-stdenv.mkDerivation {
- name = "${baseName}-${version}";
+stdenv.mkDerivation rec {
+ name = "libbdplus-${version}";
+ version = "0.1.2";
src = fetchurl {
- url = "http://get.videolan.org/${baseName}/${version}/${baseName}-${version}.tar.bz2";
+ url = "http://get.videolan.org/libbdplus/${version}/${name}.tar.bz2";
sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6";
};
@@ -25,7 +21,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ ];
meta = with stdenv.lib; {
- homepage = http://www.videolan.org/developers/libbdplus.html;
+ homepage = "http://www.videolan.org/developers/libbdplus.html";
description = "Library to access BD+ protected Blu-Ray disks";
license = licenses.lgpl21;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index 729fc27a0d3..c5bf7fd7f98 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -18,12 +18,11 @@ assert withFonts -> freetype != null;
# https://wiki.archlinux.org/index.php/BluRay
stdenv.mkDerivation rec {
- baseName = "libbluray";
+ name = "libbluray-${version}";
version = "0.9.2";
- name = "${baseName}-${version}";
src = fetchurl {
- url = "http://get.videolan.org/${baseName}/${version}/${name}.tar.bz2";
+ url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2";
sha256 = "1sp71j4agcsg17g6b85cqz78pn5vknl5pl39rvr6mkib5ps99jgg";
};
@@ -55,7 +54,7 @@ stdenv.mkDerivation rec {
patches = stdenv.lib.optional withJava ./BDJ-JARFILE-path.patch;
meta = with stdenv.lib; {
- homepage = http://www.videolan.org/developers/libbluray.html;
+ homepage = "http://www.videolan.org/developers/libbluray.html";
description = "Library to access Blu-Ray disks for video playback";
license = licenses.lgpl21;
maintainers = [ maintainers.abbradar ];
diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix
index cedc376972b..5738245a0bd 100644
--- a/pkgs/development/libraries/libburn/default.nix
+++ b/pkgs/development/libraries/libburn/default.nix
@@ -2,15 +2,15 @@
stdenv.mkDerivation rec {
name = "libburn-${version}";
- version = "1.4.4";
+ version = "1.4.6";
src = fetchurl {
url = "http://files.libburnia-project.org/releases/${name}.tar.gz";
- sha256 = "053x1sj6r5pj5396g007v6l0s7942cy2mh5fd3caqx0jdw6h9xqv";
+ sha256 = "0wbh49s3az3sfpai09z1zdgynq7wnwrk31v5589033274nmzldlx";
};
meta = with stdenv.lib; {
- homepage = http://libburnia-project.org/;
+ homepage = "http://libburnia-project.org/";
description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ abbradar vrthra ];
diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix
index 3b63ba98f57..68bd72f3e0f 100644
--- a/pkgs/development/libraries/libdevil/default.nix
+++ b/pkgs/development/libraries/libdevil/default.nix
@@ -1,12 +1,10 @@
-{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa
-, libX11, pkgconfig
-
-, OpenGL
+{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa_noglu
+, libX11, pkgconfig, OpenGL
}:
stdenv.mkDerivation rec {
- name ="libdevil-${version}";
+ name = "libdevil-${version}";
version = "1.7.8";
src = fetchurl {
@@ -14,7 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8";
};
- buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa libX11 ]
+ outputs = [ "out" "dev" ];
+
+ buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa_noglu libX11 ]
++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL ];
nativeBuildInputs = [ pkgconfig ];
@@ -40,6 +40,8 @@ stdenv.mkDerivation rec {
./il_endian.h.patch
];
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
homepage = http://openil.sourceforge.net/;
description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats";
diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix
new file mode 100644
index 00000000000..23ab36fe09f
--- /dev/null
+++ b/pkgs/development/libraries/libdivecomputer/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "libdivecomputer-${version}";
+ version = "0.5.0";
+
+ src = fetchurl {
+ url = "http://www.libdivecomputer.org/releases/${name}.tar.gz";
+ sha256 = "11n2qpqg4b2h7mqifp9qm5gm1aqwy7wj1j4j5ha0wdjf55zzy30y";
+ };
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = http://www.libdivecomputer.org;
+ description = "A cross-platform and open source library for communication with dive computers from various manufacturers";
+ maintainers = [ maintainers.mguentner ];
+ license = licenses.lgpl21;
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index f2174470bec..38d072bc450 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev, valgrind }:
+{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind }:
stdenv.mkDerivation rec {
- name = "libdrm-2.4.71";
+ name = "libdrm-2.4.74";
src = fetchurl {
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
- sha256 = "c66287ddeee5f46ea8f8880b94b80acb3bbc33ba6321d17767eef145046df9b8";
+ sha256 = "d80dd5a76c401f4c8756dcccd999c63d7e0a3bad258d96a829055cfd86ef840b";
};
outputs = [ "out" "dev" ];
@@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libpthreadstubs libpciaccess ];
# libdrm as of 2.4.70 does not actually do anything with udev.
- #++ stdenv.lib.optional stdenv.isLinux udev;
patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch;
@@ -21,7 +20,6 @@ stdenv.mkDerivation rec {
"echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
configureFlags = [ "--enable-freedreno" "--disable-valgrind" ]
- ++ stdenv.lib.optional stdenv.isLinux "--enable-udev"
++ stdenv.lib.optional stdenv.isDarwin "-C";
crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ];
@@ -30,7 +28,6 @@ stdenv.mkDerivation rec {
homepage = http://dri.freedesktop.org/libdrm/;
description = "Library for accessing the kernel's Direct Rendering Manager";
license = "bsd";
- maintainers = [ stdenv.lib.maintainers.urkud ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix
index a064769ec84..48853b63c79 100644
--- a/pkgs/development/libraries/libdwarf/default.nix
+++ b/pkgs/development/libraries/libdwarf/default.nix
@@ -1,14 +1,15 @@
{ stdenv, fetchurl, libelf }:
stdenv.mkDerivation rec {
- name = "libdwarf-20161021";
+ name = "libdwarf-20161124";
src = fetchurl {
url = "http://www.prevanders.net/${name}.tar.gz";
- sha512 = "733523fd5c58f878d65949c1812b2f46b40c4cc3177bc780c703ec71f83675d4b84e81bc1bcca42adf69b5e122562e4ce8e9a8743af29cc6fafe78ed9f8213fd";
+ sha512 = "38e480bce5ae8273fd585ec1d8ba94dc3e865a0ef3fcfcf38b5d92fa1ce41f8b"
+ + "8c95a7cf8a6e69e7c6f638a3cc56ebbfb37b6317047309725fa17e7929096799";
};
- configureFlags = " --enable-shared --disable-nonshared";
+ configureFlags = [ "--enable-shared" "--disable-nonshared" ];
preConfigure = ''
cd libdwarf
@@ -17,12 +18,13 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/lib $out/include
- cp libdwarf.so $out/lib
+ cp libdwarf.so.1 $out/lib
+ ln -s libdwarf.so.1 $out/lib/libdwarf.so
cp libdwarf.h dwarf.h $out/include
'';
meta = {
- homepage = http://reality.sgiweb.org/davea/dwarf.html;
+ homepage = https://www.prevanders.net/dwarf.html;
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index 364ff28f9a6..17aeb1d4377 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, openssl, findutils }:
+{ stdenv, fetchurl, openssl, findutils }:
let version = "2.0.22"; in
stdenv.mkDerivation {
@@ -12,7 +12,6 @@ stdenv.mkDerivation {
outputs = [ "out" "dev" ];
outputBin = "dev";
- nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isCygwin findutils;
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix
index 49710339828..c620254aacd 100644
--- a/pkgs/development/libraries/libfaketime/default.nix
+++ b/pkgs/development/libraries/libfaketime/default.nix
@@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "1dw2lqsv2iqwxg51mdn25b4fjj3v357s0mc6ahxawqp210krg29s";
};
+ patches = [
+ ./no-date-in-gzip-man-page.patch
+ ];
+
preBuild = ''
makeFlagsArray+=(PREFIX="$out" LIBDIRNAME=/lib)
'';
diff --git a/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch b/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch
new file mode 100644
index 00000000000..7b7e362fbf0
--- /dev/null
+++ b/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch
@@ -0,0 +1,12 @@
+diff -ur libfaketime-0.9.5.orig/man/Makefile libfaketime-0.9.5/man/Makefile
+--- libfaketime-0.9.5.orig/man/Makefile 2013-10-13 11:19:30.000000000 +0200
++++ libfaketime-0.9.5/man/Makefile 2014-04-13 01:22:14.362296519 +0200
+@@ -6,7 +6,7 @@
+
+ install:
+ $(INSTALL) -Dm0644 faketime.1 "${DESTDIR}${PREFIX}/share/man/man1/faketime.1"
+- gzip -f "${DESTDIR}${PREFIX}/share/man/man1/faketime.1"
++ gzip -9nf "${DESTDIR}${PREFIX}/share/man/man1/faketime.1"
+
+ uninstall:
+ rm -f "${DESTDIR}${PREFIX}/share/man/man1/faketime.1.gz"
diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix
index 530b04e8b42..47814ef2f25 100644
--- a/pkgs/development/libraries/libffcall/default.nix
+++ b/pkgs/development/libraries/libffcall/default.nix
@@ -1,27 +1,29 @@
-{ stdenv, fetchcvs }:
+{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "libffcall-${version}";
- version = "2009-05-27";
- src = fetchcvs {
- cvsRoot = ":pserver:anonymous@cvs.savannah.gnu.org:/sources/libffcall";
- module = "ffcall";
- date = version;
- sha256 = "097pv94495njppl9iy2yk47z5wdwvf7swsl88nmwrac51jibbg4i";
+ version = "1.10";
+
+ src = fetchurl {
+ urls = [
+ # Europe
+ "http://www.haible.de/bruno/gnu/ffcall-${version}.tar.gz"
+ # USA
+ "ftp://ftp.santafe.edu/pub/gnu/ffcall-${version}.tar.gz"
+ ];
+ sha256 = "0gcqljx4f8wrq59y13zzigwzaxdrz3jf9cbzcd8h0b2br27mn6vg";
};
- configurePhase = ''
- for i in ./configure */configure; do
- cwd="$PWD"
- cd "$(dirname "$i")";
- ( test -f Makefile && make distclean ) || true
- ./configure --prefix=$out
- cd "$cwd"
- done
- '';
+ NIX_CFLAGS_COMPILE = "-Wa,--noexecstack";
+
+ configureFlags = [
+ "--enable-shared"
+ "--disable-static"
+ ];
meta = {
description = "Foreign function call library";
+ homepage = http://www.haible.de/bruno/packages-ffcall.html;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index 2158f26f285..4df326e278c 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.9.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 = "0340v5xs48f28q2d16ldb9359dkzlhl4l449mgyv3qabnlz2pl21";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix
index 496306c254d..389f899e3ef 100644
--- a/pkgs/development/libraries/libgeotiff/default.nix
+++ b/pkgs/development/libraries/libgeotiff/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
homepage = http://www.remotesensing.org/geotiff/geotiff.html;
license = stdenv.lib.licenses.mit;
maintainers = [stdenv.lib.maintainers.marcweber];
- platforms = stdenv.lib.platforms.linux;
+ platforms = with stdenv.lib.platforms; linux ++ darwin;
};
}
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index 25d1ceb40bd..a22b99be8da 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -4,11 +4,11 @@
with { inherit (stdenv.lib) optionals; };
stdenv.mkDerivation rec {
- name = "libgsf-1.14.36";
+ name = "libgsf-1.14.41";
src = fetchurl {
url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz";
- sha256 = "0h19ssxzz0cmznwga2xy55kjibm24mwxqarnpd0w7xy0hrzm1dvi";
+ sha256 = "1lq87wnrsjbjafpk3c8xwd56gqx319fhck9xkg2da88hd9c9h2qm";
};
nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/development/libraries/libibverbs/default.nix b/pkgs/development/libraries/libibverbs/default.nix
index 8e37648adfc..2243f832b7a 100644
--- a/pkgs/development/libraries/libibverbs/default.nix
+++ b/pkgs/development/libraries/libibverbs/default.nix
@@ -46,6 +46,20 @@ in stdenv.mkDerivation rec {
make -j$NIX_BUILD_CORES
make install
done
+
+ mkdir -p $out/lib/pkgconfig
+ cat >$out/lib/pkgconfig/ibverbs.pc <$out/lib/pkgconfig/rdmacm.pc < python2 != null;
+assert pythonSupport -> libxml2.pythonSupport;
+
+with stdenv.lib;
stdenv.mkDerivation rec {
name = "libxslt-1.1.29";
@@ -10,26 +18,33 @@ stdenv.mkDerivation rec {
patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch;
- outputs = [ "bin" "dev" "out" "doc" ];
+ outputs = [ "bin" "dev" "out" "doc" ] ++ stdenv.lib.optional pythonSupport "py";
- buildInputs = [ libxml2 ];
+ buildInputs = [ libxml2.dev ] ++ stdenv.lib.optionals pythonSupport [ libxml2.py python2 ];
propagatedBuildInputs = [ findXMLCatalogs ];
- configureFlags = [
- "--without-python"
- "--without-crypto"
+ # TODO move cryptoSupport as last flag, when upgrading libxslt
+ configureFlags = optional (!cryptoSupport) "--without-crypto" ++ [
"--without-debug"
"--without-mem-debug"
"--without-debugger"
- ];
+ ] ++ optional pythonSupport "--with-python=${python2}";
postFixup = ''
moveToOutput bin/xslt-config "$dev"
moveToOutput lib/xsltConf.sh "$dev"
moveToOutput share/man/man1 "$bin"
+ '' + optionalString pythonSupport ''
+ mkdir -p $py/nix-support
+ echo ${libxml2.py} >> $py/nix-support/propagated-native-build-inputs
+ moveToOutput lib/python2.7 "$py"
'';
+ passthru = {
+ inherit pythonSupport;
+ };
+
meta = with stdenv.lib; {
homepage = http://xmlsoft.org/XSLT/;
description = "A C library and tools to do XSL transformations";
diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index 1df9cf0492d..e5845fee304 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -24,7 +24,31 @@ stdenv.mkDerivation rec {
];
configurePhase = ''
- scons configure PREFIX="$out"
+ scons configure PREFIX="$out" BOOST_INCLUDES="${boost.dev}/include" \
+ BOOST_LIBS="${boost.out}/lib" \
+ CAIRO_INCLUDES="${cairo.dev}/include" \
+ CAIRO_LIBS="${cairo.out}/lib" \
+ FREETYPE_INCLUDES="${freetype.dev}/include" \
+ FREETYPE_LIBS="${freetype.out}/lib" \
+ GDAL_CONFIG="${gdal}/bin/gdal-config" \
+ HB_INCLUDES="${harfbuzz.dev}/include" \
+ HB_LIBS="${harfbuzz.out}/lib" \
+ ICU_INCLUDES="${icu.dev}/include" \
+ ICU_LIBS="${icu.out}/lib" \
+ JPEG_INCLUDES="${libjpeg.dev}/include" \
+ JPEG_LIBS="${libjpeg.out}/lib" \
+ PNG_INCLUDES="${libpng.dev}/include" \
+ PNG_LIBS="${libpng.out}/lib" \
+ PROJ_INCLUDES="${proj}/include" \
+ PROJ_LIBS="${proj}/lib" \
+ SQLITE_INCLUDES="${sqlite.dev}/include" \
+ SQLITE_LIBS="${sqlite.out}/lib" \
+ TIFF_INCLUDES="${libtiff.dev}/include" \
+ TIFF_LIBS="${libtiff.out}/lib" \
+ WEBP_INCLUDES="${libwebp}/include" \
+ WEBP_LIBS="${libwebp}/lib" \
+ XML2_INCLUDES="${libxml2.dev}/include" \
+ XML2_LIBS="${libxml2.out}/lib"
'';
buildPhase = false;
diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index b7d6fb25ecc..ebab4850be4 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -1,15 +1,22 @@
{ stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
- name = "mbedtls-2.3.0";
+ name = "mbedtls-2.4.0";
src = fetchurl {
url = "https://tls.mbed.org/download/${name}-gpl.tgz";
- sha256 = "0jfb20crlcp67shp9p8cy6vmwdjkxb0rqfbi5l5yggbrywa708r1";
+ sha256 = "0gwyxsz7av8fyzrz4zxhcy9jmszlvg9zskz3srar75lg0bhg1vw0";
};
nativeBuildInputs = [ perl ];
+ patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+ substituteInPlace library/Makefile --replace "-soname" "-install_name"
+ substituteInPlace tests/scripts/run-test-suites.pl --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH"
+ # Necessary for install_name_tool below
+ echo "LOCAL_LDFLAGS += -headerpad_max_install_names" >> programs/Makefile
+ '';
+
postPatch = ''
patchShebangs .
'';
@@ -22,6 +29,18 @@ stdenv.mkDerivation rec {
"DESTDIR=\${out}"
];
+ postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+ install_name_tool -change libmbedcrypto.so.0 $out/lib/libmbedcrypto.so.0 $out/lib/libmbedtls.so.10
+ install_name_tool -change libmbedcrypto.so.0 $out/lib/libmbedcrypto.so.0 $out/lib/libmbedx509.so.0
+ install_name_tool -change libmbedx509.so.0 $out/lib/libmbedx509.so.0 $out/lib/libmbedtls.so.10
+
+ for exe in $out/bin/*; do
+ install_name_tool -change libmbedtls.so.10 $out/lib/libmbedtls.so.10 $exe
+ install_name_tool -change libmbedx509.so.0 $out/lib/libmbedx509.so.0 $exe
+ install_name_tool -change libmbedcrypto.so.0 $out/lib/libmbedcrypto.so.0 $exe
+ done
+ '';
+
doCheck = true;
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix
index b6d187e7a0e..9b2fd805c31 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 5ff884fd3c1..c363cbcd371 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch
, pkgconfig, intltool, autoreconfHook, substituteAll
-, file, expat, libdrm, xorg, wayland, systemd, openssl
+, file, expat, libdrm, xorg, wayland, openssl
, llvmPackages, libffi, libomxil-bellagio, libva
, libelf, libvdpau, python2
, grsecEnabled ? false
@@ -26,7 +26,7 @@ if ! lists.elem stdenv.system platforms.mesaPlatforms then
else
let
- version = "12.0.3";
+ version = "13.0.2";
branch = head (splitString "." version);
driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
in
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
];
- sha256 = "1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1";
+ sha256 = "a6ed622645f4ed61da418bf65adde5bcc4bb79023c36ba7d6b45b389da4416d5";
};
prePatch = "patchShebangs .";
@@ -51,11 +51,7 @@ stdenv.mkDerivation {
patches = [
./glx_ro_text_segm.patch # fix for grsecurity/PaX
./symlink-drivers.patch
- ] ++ optional stdenv.isLinux
- (substituteAll {
- src = ./dlopen-absolute-paths.diff;
- libudev = systemd.lib;
- });
+ ];
postPatch = ''
substituteInPlace src/egl/main/egldriver.c \
@@ -116,7 +112,7 @@ stdenv.mkDerivation {
libffi wayland libvdpau libelf libXvMC
libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/
(python2.withPackages (ps: [ ps.Mako ]))
- ] ++ optional stdenv.isLinux systemd;
+ ];
enableParallelBuilding = true;
@@ -136,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/mesa/dlopen-absolute-paths.diff b/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff
deleted file mode 100644
index 9a522657223..00000000000
--- a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/loader.c b/loader.c
-index 4fdf3c2..69ea22d 100644
---- a/src/loader/loader.c
-+++ b/src/loader/loader.c
-@@ -112,7 +112,7 @@ static void *udev_handle = NULL;
- static void *
- udev_dlopen_handle(void)
- {
-- char name[80];
-+ char name[256];
- unsigned flags = RTLD_NOLOAD | RTLD_LOCAL | RTLD_LAZY;
- int version;
-
-@@ -126,7 +126,7 @@ udev_dlopen_handle(void)
- /* First try opening an already linked libudev, then try loading one */
- do {
- for (version = 1; version >= 0; version--) {
-- snprintf(name, sizeof(name), "libudev.so.%d", version);
-+ snprintf(name, sizeof(name), "@libudev@/lib/libudev.so.%d", version);
- udev_handle = dlopen(name, flags);
- if (udev_handle)
- return udev_handle;
diff --git "a/pkgs/development/libraries/mpir/\\" "b/pkgs/development/libraries/mpir/\\"
deleted file mode 100644
index b7872ece6ae..00000000000
--- "a/pkgs/development/libraries/mpir/\\"
+++ /dev/null
@@ -1,20 +0,0 @@
-{stdenv, fetchurl}:
-stdenv.mkDerivation rec {
- name = "mpir-${version}";
- version = "1";
- inherit buildInputs;
- src = fetchurl {
- url = "http://mpir.org/mpir-${version}.tar.bz2";
- sha256 = "0000000000000000000000000000000000000000000000000000000000000000";
- };
- meta = {
- inherit version;
- description = ''A highly optimised library for bignum arithmetic forked from GMP'';
- license = stdenv.lib.licenses. ;
- maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.linux;
- downloadPage = "http://mpir.org/downloads.html";
- homepage = "http://mpir.org/";
- updateWalker = true;
- };
-}
diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix
index 53b2b635864..35f675a305a 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/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix
index 152c592f591..3923daad6f4 100644
--- a/pkgs/development/libraries/nettle/default.nix
+++ b/pkgs/development/libraries/nettle/default.nix
@@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
- version = "3.2";
+ version = "3.3";
src = fetchurl {
url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
- sha256 = "15wxhk52yc62rx0pddmry66hqm6z5brrrkx4npd3wh9nybg86hpa";
+ sha256 = "07mif3af077763vc35s1x8vzhzlgqcgxh67c1xr13jnhslkjd526";
};
})
diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index a761106d9b1..080a3e35138 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
name = "nghttp2-${version}";
- version = "1.14.1";
+ version = "1.16.1";
# Don't use fetchFromGitHub since this needs a bootstrap curl
src = fetchurl {
url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
- sha256 = "0d7sk3pfkajhkmcqa7zx4rjg1pkwqraxxs7bxbwbm67r8wwqw87j";
+ sha256 = "069pw84f8gg21npapn7y1sizwn6w35692zaq5g45gy8hdbmcl8yc";
};
# Configure script searches for a symbol which does not exist in jemalloc on Darwin
diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix
index dcc0c781ee0..15ddbdaedef 100644
--- a/pkgs/development/libraries/nlohmann_json/default.nix
+++ b/pkgs/development/libraries/nlohmann_json/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "nlohmann_json-${version}";
- version = "2.0.3";
+ version = "2.0.7";
src = fetchFromGitHub {
owner = "nlohmann";
repo = "json";
rev = "v${version}";
- sha256 = "192mg2y93g9q0jdn3fdffydpxk19nsrcv92kfip6srkdkwja18ri";
+ sha256 = "03jklvlcsms09p79qz9piqrdy2vhn4rkwidwfgq6cpxm6anqyqjh";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/nss/85_security_load.patch b/pkgs/development/libraries/nss/85_security_load.patch
index 632cc418425..9e4be3bf282 100644
--- a/pkgs/development/libraries/nss/85_security_load.patch
+++ b/pkgs/development/libraries/nss/85_security_load.patch
@@ -1,8 +1,7 @@
-diff --git a/nss/cmd/shlibsign/shlibsign.c b/nss/cmd/shlibsign/shlibsign.c
-index 63a4836..a128c1d 100644
---- a/nss/cmd/shlibsign/shlibsign.c
-+++ b/nss/cmd/shlibsign/shlibsign.c
-@@ -862,6 +862,8 @@ int main(int argc, char **argv)
+diff -ru -x '*~' nss-3.27.1-orig/nss/cmd/shlibsign/shlibsign.c nss-3.27.1/nss/cmd/shlibsign/shlibsign.c
+--- nss-3.27.1-orig/nss/cmd/shlibsign/shlibsign.c 2016-10-03 16:55:58.000000000 +0200
++++ nss-3.27.1/nss/cmd/shlibsign/shlibsign.c 2016-11-15 16:28:07.308117900 +0100
+@@ -871,6 +871,8 @@
libname = PR_GetLibraryName(NULL, "softokn3");
assert(libname != NULL);
lib = PR_LoadLibrary(libname);
@@ -11,22 +10,20 @@ index 63a4836..a128c1d 100644
assert(lib != NULL);
PR_FreeLibraryName(libname);
-diff --git a/nss/coreconf/config.mk b/nss/coreconf/config.mk
-index 61d757b..b58a98b 100644
---- a/nss/coreconf/config.mk
-+++ b/nss/coreconf/config.mk
-@@ -205,3 +205,6 @@ $(error Setting NSS_ENABLE_TLS_1_3 and NSS_DISABLE_ECC isn't a good idea.)
- endif
- DEFINES += -DNSS_ENABLE_TLS_1_3
+diff -ru -x '*~' nss-3.27.1-orig/nss/coreconf/config.mk nss-3.27.1/nss/coreconf/config.mk
+--- nss-3.27.1-orig/nss/coreconf/config.mk 2016-10-03 16:55:58.000000000 +0200
++++ nss-3.27.1/nss/coreconf/config.mk 2016-11-15 16:28:07.308117900 +0100
+@@ -217,3 +217,6 @@
+ ifdef NSS_NO_PKCS11_BYPASS
+ DEFINES += -DNO_PKCS11_BYPASS
endif
+
+# Nix specific stuff.
+DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\"
-diff --git a/nss/lib/pk11wrap/pk11load.c b/nss/lib/pk11wrap/pk11load.c
-index 5c5d2ca..026e528 100644
---- a/nss/lib/pk11wrap/pk11load.c
-+++ b/nss/lib/pk11wrap/pk11load.c
-@@ -429,6 +429,13 @@ secmod_LoadPKCS11Module(SECMODModule *mod, SECMODModule **oldModule) {
+diff -ru -x '*~' nss-3.27.1-orig/nss/lib/pk11wrap/pk11load.c nss-3.27.1/nss/lib/pk11wrap/pk11load.c
+--- nss-3.27.1-orig/nss/lib/pk11wrap/pk11load.c 2016-10-03 16:55:58.000000000 +0200
++++ nss-3.27.1/nss/lib/pk11wrap/pk11load.c 2016-11-15 16:28:07.308117900 +0100
+@@ -429,6 +429,13 @@
* unload the library if anything goes wrong from here on out...
*/
library = PR_LoadLibrary(mod->dllName);
@@ -40,11 +37,10 @@ index 5c5d2ca..026e528 100644
mod->library = (void *)library;
if (library == NULL) {
-diff --git a/nss/lib/util/secload.c b/nss/lib/util/secload.c
-index eb8a9ec..f94f67d 100644
---- a/nss/lib/util/secload.c
-+++ b/nss/lib/util/secload.c
-@@ -69,9 +69,14 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name)
+diff -ru -x '*~' nss-3.27.1-orig/nss/lib/util/secload.c nss-3.27.1/nss/lib/util/secload.c
+--- nss-3.27.1-orig/nss/lib/util/secload.c 2016-10-03 16:55:58.000000000 +0200
++++ nss-3.27.1/nss/lib/util/secload.c 2016-11-15 16:29:50.482259746 +0100
+@@ -70,9 +70,14 @@
/* Remove the trailing filename from referencePath and add the new one */
c = strrchr(referencePath, PR_GetDirectorySeparator());
@@ -55,12 +51,12 @@ index eb8a9ec..f94f67d 100644
+ }
if (c) {
size_t referencePathSize = 1 + c - referencePath;
-- fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 1);
+- fullName = (char*)PORT_Alloc(strlen(name) + referencePathSize + 1);
+ fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 5);
if (fullName) {
memcpy(fullName, referencePath, referencePathSize);
- strcpy(fullName + referencePathSize, name);
-@@ -81,6 +86,11 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name)
+ strcpy(fullName + referencePathSize, name);
+@@ -82,6 +87,11 @@
#endif
libSpec.type = PR_LibSpec_Pathname;
libSpec.value.pathname = fullName;
@@ -71,9 +67,9 @@ index eb8a9ec..f94f67d 100644
+ strcpy(fullName + referencePathSize, name);
dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL
#ifdef PR_LD_ALT_SEARCH_PATH
- /* allow library's dependencies to be found in the same directory
-@@ -88,6 +98,10 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name)
- | PR_LD_ALT_SEARCH_PATH
+ /* allow library's dependencies to be found in the same directory
+@@ -89,6 +99,10 @@
+ | PR_LD_ALT_SEARCH_PATH
#endif
);
+ if (! dlh) {
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 84179538380..72f57dff1ce 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -9,11 +9,11 @@ let
in stdenv.mkDerivation rec {
name = "nss-${version}";
- version = "3.26";
+ version = "3.27.2";
src = fetchurl {
- url = "mirror://mozilla/security/nss/releases/NSS_3_26_RTM/src/${name}.tar.gz";
- sha256 = "0r65s5q8kk0vr48s0zr8xi610k7h072lgkkpp4z6jlxr19bkly4i";
+ url = "mirror://mozilla/security/nss/releases/NSS_3_27_2_RTM/src/${name}.tar.gz";
+ sha256 = "dc8ac8524469d0230274fd13a53fdcd74efe4aa67205dde1a4a92be87dc28524";
};
buildInputs = [ nspr perl zlib sqlite ];
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 0167011ed49..388167319c1 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, unzip
+{ lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, cmake, pkgconfig, unzip
, zlib
, enableIpp ? false
, enableContrib ? false
@@ -14,6 +14,7 @@
, enableFfmpeg ? false, ffmpeg
, enableGStreamer ? false, gst_all_1
, enableEigen ? false, eigen
+, enableCuda ? false, cudatoolkit, gcc5
}:
let
@@ -41,18 +42,30 @@ stdenv.mkDerivation rec {
sha256 = "1l0w12czavgs0wzw1c594g358ilvfg2fn32cn8z7pv84zxj4g429";
};
+ patches =
+ lib.optionals enableCuda [
+ (fetchpatch { # Patch for CUDA 8 compatibility
+ url = "https://github.com/opencv/opencv/commit/10896129b39655e19e4e7c529153cb5c2191a1db.patch";
+ sha256 = "0jka3kxxywgs3prqqgym5kav6p73rrblwj50k1nf3fvfpk194ah1";
+ })
+ (fetchpatch { # Patch to add CUDA Compute Capability compilation targets up to 6.0
+ url = "https://github.com/opencv/opencv/commit/d76f258aebdf63f979a205cabe6d3e81700a7cd8.patch";
+ sha256 = "00b3msfgrcw7laij6qafn4b18c1dl96xxpzwx05wxzrjldqb6kqg";
+ })
+ ];
+
preConfigure =
let ippicvVersion = "20151201";
ippicvPlatform = if stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux" then "linux"
else throw "ICV is not available for this platform (or not yet supported by this package)";
- ippicvHash = if ippicvPlatform == "linux" then "808b791a6eac9ed78d32a7666804320e"
+ ippicvHash = if ippicvPlatform == "linux" then "1nph0w0pdcxwhdb5lxkb8whpwd9ylvwl97hn0k425amg80z86cs3"
else throw "ippicvHash: impossible";
ippicvName = "ippicv_${ippicvPlatform}_${ippicvVersion}.tgz";
ippicvArchive = "3rdparty/ippicv/downloads/linux-${ippicvHash}/${ippicvName}";
ippicv = fetchurl {
url = "https://github.com/Itseez/opencv_3rdparty/raw/ippicv/master_${ippicvVersion}/ippicv/${ippicvName}";
- md5 = ippicvHash;
+ sha256 = ippicvHash;
};
in lib.optionalString enableIpp
''
@@ -74,6 +87,7 @@ stdenv.mkDerivation rec {
++ lib.optional enableFfmpeg ffmpeg
++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])
++ lib.optional enableEigen eigen
+ ++ lib.optional enableCuda [ cudatoolkit gcc5 ]
;
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
@@ -90,7 +104,10 @@ stdenv.mkDerivation rec {
(opencvFlag "JPEG" enableJPEG)
(opencvFlag "PNG" enablePNG)
(opencvFlag "OPENEXR" enableEXR)
- ] ++ lib.optionals enableContrib [ "-DOPENCV_EXTRA_MODULES_PATH=${contribSrc}/modules" ];
+ (opencvFlag "CUDA" enableCuda)
+ (opencvFlag "CUBLAS" enableCuda)
+ ] ++ lib.optionals enableContrib [ "-DOPENCV_EXTRA_MODULES_PATH=${contribSrc}/modules" ]
+ ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" ];
enableParallelBuilding = true;
@@ -102,7 +119,7 @@ stdenv.mkDerivation rec {
description = "Open Computer Vision Library with more than 500 algorithms";
homepage = http://opencv.org/;
license = stdenv.lib.licenses.bsd3;
- maintainers = with stdenv.lib.maintainers; [viric flosse];
+ maintainers = with stdenv.lib.maintainers; [viric flosse mdaiter];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix
index 7f4b5ba2e32..f412346456c 100644
--- a/pkgs/development/libraries/opendkim/default.nix
+++ b/pkgs/development/libraries/opendkim/default.nix
@@ -2,7 +2,9 @@
, perl, makeWrapper }:
stdenv.mkDerivation rec {
- name = "opendkim-2.10.3";
+ name = "opendkim-${version}";
+ version = "2.10.3";
+
src = fetchurl {
url = "mirror://sourceforge/opendkim/files/${name}.tar.gz";
sha256 = "06v8bqhh604sz9rh5bvw278issrwjgc4h1wx2pz9a84lpxbvm823";
@@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "C library for producing DKIM-aware applications and an open source milter for providing DKIM service";
- homepage = http://www.opendkim.org/;
+ homepage = "http://www.opendkim.org/";
maintainers = with maintainers; [ abbradar ];
license = licenses.bsd3;
platforms = platforms.unix;
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index ea89bb859e5..cd4a696b1d9 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -9,7 +9,7 @@ let
opensslCrossSystem = stdenv.cross.openssl.system or
(throw "openssl needs its platform name cross building");
- common = args@{ version, sha256, patches ? [] }: stdenv.mkDerivation rec {
+ common = args@{ version, sha256, patches ? [], configureFlags ? [], makeDepend ? false }: stdenv.mkDerivation rec {
name = "openssl-${version}";
src = fetchurl {
@@ -45,7 +45,10 @@ let
] ++ stdenv.lib.optionals withCryptodev [
"-DHAVE_CRYPTODEV"
"-DUSE_CRYPTODEV_DIGESTS"
- ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2";
+ ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2"
+ ++ args.configureFlags or [];
+
+ postConfigure = if makeDepend then "make depend" else null;
makeFlags = [ "MANDIR=$(man)/share/man" ];
@@ -117,8 +120,16 @@ in {
};
openssl_1_1_0 = common {
- version = "1.1.0b";
- sha256 = "1xznrqvb1dbngv2k2nb6da6fdw00c01sy2i36yjdxr4vpxrf0pd4";
+ version = "1.1.0c";
+ sha256 = "1xfn5ydl14myd9wgxm4nxy5a42cpp1g12ijf3g9m4mz0l90n8hzw";
+ };
+
+ openssl_1_0_2-steam = common {
+ version = "1.0.2j";
+ sha256 = "0cf4ar97ijfc7mg35zdgpad6x8ivkdx9qii6mz35khi1ps9g5bz7";
+ configureFlags = [ "no-engine" ];
+ makeDepend = true;
+ patches = [ ./openssl-fix-cpuid_setup.patch ];
};
}
diff --git a/pkgs/development/libraries/openssl/openssl-fix-cpuid_setup.patch b/pkgs/development/libraries/openssl/openssl-fix-cpuid_setup.patch
new file mode 100644
index 00000000000..4a2384ca3da
--- /dev/null
+++ b/pkgs/development/libraries/openssl/openssl-fix-cpuid_setup.patch
@@ -0,0 +1,105 @@
+diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
+index 1925428..d2e42d2 100644
+--- a/crypto/cryptlib.c
++++ b/crypto/cryptlib.c
+@@ -676,10 +676,15 @@ typedef unsigned __int64 IA32CAP;
+ # else
+ typedef unsigned long long IA32CAP;
+ # endif
++
++/* Compat function for STEAM */
++extern IA32CAP OPENSSL_ia32_cpuid_new(unsigned int*);
++IA32CAP OPENSSL_ia32_cpuid(void) { return OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P); }
++
+ void OPENSSL_cpuid_setup(void)
+ {
+ static int trigger = 0;
+- IA32CAP OPENSSL_ia32_cpuid(unsigned int *);
++ IA32CAP OPENSSL_ia32_cpuid_new(unsigned int *);
+ IA32CAP vec;
+ char *env;
+
+@@ -697,9 +702,9 @@ void OPENSSL_cpuid_setup(void)
+ vec = strtoul(env + off, NULL, 0);
+ # endif
+ if (off)
+- vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P) & ~vec;
++ vec = OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P) & ~vec;
+ else if (env[0] == ':')
+- vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P);
++ vec = OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P);
+
+ OPENSSL_ia32cap_P[2] = 0;
+ if ((env = strchr(env, ':'))) {
+@@ -713,7 +718,7 @@ void OPENSSL_cpuid_setup(void)
+ OPENSSL_ia32cap_P[2] = vecx;
+ }
+ } else
+- vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P);
++ vec = OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P);
+
+ /*
+ * |(1<<10) sets a reserved bit to signal that variable
+diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h
+index fba180a..b927c79 100644
+--- a/crypto/cryptlib.h
++++ b/crypto/cryptlib.h
+@@ -99,6 +99,9 @@ extern "C" {
+ # define HEX_SIZE(type) (sizeof(type)*2)
+
+ void OPENSSL_cpuid_setup(void);
++#pragma GCC visibility push(hidden)
++unsigned long long OPENSSL_ia32_cpuid(void);
++#pragma GCC visibility pop
+ extern unsigned int OPENSSL_ia32cap_P[];
+ void OPENSSL_showfatal(const char *fmta, ...);
+ void *OPENSSL_stderr(void);
+diff --git a/crypto/x86_64cpuid.pl b/crypto/x86_64cpuid.pl
+index d208d02..d4c0b24 100644
+--- a/crypto/x86_64cpuid.pl
++++ b/crypto/x86_64cpuid.pl
+@@ -52,10 +52,10 @@ OPENSSL_rdtsc:
+ ret
+ .size OPENSSL_rdtsc,.-OPENSSL_rdtsc
+
+-.globl OPENSSL_ia32_cpuid
+-.type OPENSSL_ia32_cpuid,\@function,1
++.globl OPENSSL_ia32_cpuid_new
++.type OPENSSL_ia32_cpuid_new,\@function,1
+ .align 16
+-OPENSSL_ia32_cpuid:
++OPENSSL_ia32_cpuid_new:
+ mov %rbx,%r8 # save %rbx
+
+ xor %eax,%eax
+@@ -181,7 +181,7 @@ OPENSSL_ia32_cpuid:
+ mov %r8,%rbx # restore %rbx
+ or %r9,%rax
+ ret
+-.size OPENSSL_ia32_cpuid,.-OPENSSL_ia32_cpuid
++.size OPENSSL_ia32_cpuid_new,.-OPENSSL_ia32_cpuid_new
+
+ .globl OPENSSL_cleanse
+ .type OPENSSL_cleanse,\@abi-omnipotent
+diff --git a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl
+index e95f627..0781010 100644
+--- a/crypto/x86cpuid.pl
++++ b/crypto/x86cpuid.pl
+@@ -8,7 +8,7 @@ require "x86asm.pl";
+
+ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
+
+-&function_begin("OPENSSL_ia32_cpuid");
++&function_begin("OPENSSL_ia32_cpuid_new");
+ &xor ("edx","edx");
+ &pushf ();
+ &pop ("eax");
+@@ -153,7 +153,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
+ &mov ("eax","esi");
+ &mov ("edx","ebp");
+ &set_label("nocpuid");
+-&function_end("OPENSSL_ia32_cpuid");
++&function_end("OPENSSL_ia32_cpuid_new");
+
+ &external_label("OPENSSL_ia32cap_P");
+
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index b2915d1c240..f39fc2afe7d 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -6,14 +6,14 @@ with stdenv.lib;
let
ver_maj = "1.40";
- ver_min = "2";
+ ver_min = "3";
in
stdenv.mkDerivation rec {
name = "pango-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
- sha256 = "90582a02bc89318d205814fc097f2e9dd164d26da5f27c53ea42d583b34c3cd1";
+ sha256 = "abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3";
};
outputs = [ "bin" "dev" "out" "devdoc" ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- doCheck = false; # test-layout fails on 1.38.0
+ doCheck = false; # test-layout fails on 1.40.3 (fails to find font config)
# jww (2014-05-05): The tests currently fail on Darwin:
#
# ERROR:testiter.c:139:iter_char_test: assertion failed: (extents.width == x1 - x0)
diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix
index 6850c13b44e..b99498f2013 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/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix
index 4a98704559b..38f1496062e 100644
--- a/pkgs/development/libraries/pangoxsl/default.nix
+++ b/pkgs/development/libraries/pangoxsl/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "pangoxsl-1.6.0.3";
src = fetchurl {
url = mirror://sourceforge/pangopdf/pangoxsl-1.6.0.3.tar.gz;
- md5 = "c98bad47ffa7de2e946a8e35d45e071c";
+ sha256 = "1wcd553nf4nwkrfrh765cyzwj9bsg7zpkndg2hjs8mhwgx04lm8n";
};
buildInputs = [
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index ab1943b8590..ff67ff8a1bb 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/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index fd3c063ed90..89368282f2c 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -3,13 +3,14 @@
, withData ? false, poppler_data
, qt4Support ? false, qt4 ? null
, qt5Support ? false, qtbase ? null
+, introspectionSupport ? false, gobjectIntrospection ? null
, utils ? false
, minimal ? false, suffix ? "glib"
}:
let # beware: updates often break cups-filters build
- version = "0.47.0"; # even major numbers are stable
- sha256 = "0hnjkcqqk87dw3hlda4gh4l7brkslniax9a79g772jn3iwiffwmq";
+ version = "0.50.0";
+ sha256 = "0dmwnh59m75vhii6dw63x8l0qa0ha733pb8bdqzr7lw9nwc37jf9";
in
stdenv.mkDerivation rec {
name = "poppler-${suffix}-${version}";
@@ -28,7 +29,8 @@ stdenv.mkDerivation rec {
[ zlib freetype fontconfig libjpeg openjpeg ]
++ optionals (!minimal) [ cairo lcms curl ]
++ optional qt4Support qt4
- ++ optional qt5Support qtbase;
+ ++ optional qt5Support qtbase
+ ++ optional introspectionSupport gobjectIntrospection;
nativeBuildInputs = [ pkgconfig ];
@@ -47,7 +49,8 @@ stdenv.mkDerivation rec {
"--disable-poppler-glib" "--disable-poppler-cpp"
"--disable-libcurl"
]
- ++ optional (!utils) "--disable-utils" ;
+ ++ optional (!utils) "--disable-utils"
+ ++ optional introspectionSupport "--enable-introspection";
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/portaudio/svn-head.nix b/pkgs/development/libraries/portaudio/svn-head.nix
deleted file mode 100644
index 12b8257084b..00000000000
--- a/pkgs/development/libraries/portaudio/svn-head.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchsvn, alsaLib, pkgconfig }:
-
-stdenv.mkDerivation rec {
- revision = "1788";
- name = "portaudio-svn-r${revision}";
-
- src = fetchsvn {
- url = "https://subversion.assembla.com/svn/portaudio/portaudio/trunk";
- rev = revision;
- sha256 = "0vhiy4lkmv0flhvkbbra71z5cfr3gbh27bbfcqqdc939b4z35lsi";
- };
-
- buildInputs = [ alsaLib pkgconfig ];
-
- meta = {
- description = "Portable cross-platform Audio API";
- homepage = http://www.portaudio.com/;
- # Not exactly a bsd license, but alike
- license = "BSD";
- };
-
- passthru = {
- api_version = 19;
- };
-}
diff --git a/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix b/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix
index a06d4cef968..26b829669b8 100644
--- a/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix
+++ b/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix
@@ -1,43 +1,6 @@
-{ stdenv, fetchFromGitHub , autoreconfHook, zlib, gmock }:
-
-stdenv.mkDerivation rec {
- name = "protobuf-${version}";
+{ callPackage, ... }:
+callPackage ./generic-v3.nix {
version = "3.0.0-beta-2";
- # make sure you test also -A pythonPackages.protobuf
- src = fetchFromGitHub {
- owner = "google";
- repo = "protobuf";
- rev = "v${version}";
- sha256 = "0cbr1glgma5vakabsjwcs41pcnn8yphhn037l0zd121zb9gdaqc1";
- };
-
- postPatch = ''
- rm -rf gmock
- cp -r ${gmock.source} gmock
- chmod -R a+w gmock
- '' + stdenv.lib.optionalString stdenv.isDarwin ''
- substituteInPlace src/google/protobuf/testing/googletest.cc \
- --replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
- '';
-
- buildInputs = [ autoreconfHook zlib ];
-
- enableParallelBuilding = true;
-
- doCheck = true;
-
- meta = {
- description = "Google's data interchange format";
- longDescription =
- ''Protocol Buffers are a way of encoding structured data in an efficient
- yet extensible format. Google uses Protocol Buffers for almost all of
- its internal RPC protocols and file formats.
- '';
- license = stdenv.lib.licenses.bsd3;
- platforms = stdenv.lib.platforms.unix;
- homepage = https://developers.google.com/protocol-buffers/;
- };
-
- passthru.version = version;
+ sha256 = "0cbr1glgma5vakabsjwcs41pcnn8yphhn037l0zd121zb9gdaqc1";
}
diff --git a/pkgs/development/libraries/protobuf/3.0.nix b/pkgs/development/libraries/protobuf/3.0.nix
index 16a39daf790..f80acf462b8 100644
--- a/pkgs/development/libraries/protobuf/3.0.nix
+++ b/pkgs/development/libraries/protobuf/3.0.nix
@@ -1,43 +1,6 @@
-{ stdenv, fetchFromGitHub , autoreconfHook, zlib, gmock }:
-
-stdenv.mkDerivation rec {
- name = "protobuf-${version}";
+{ callPackage, ... }:
+callPackage ./generic-v3.nix {
version = "3.0.0";
- # make sure you test also -A pythonPackages.protobuf
- src = fetchFromGitHub {
- owner = "google";
- repo = "protobuf";
- rev = "v${version}";
- sha256 = "05qkcl96lkdama848m7q3nzzzdckjc158iiyvgmln0zi232xx7g7";
- };
-
- postPatch = ''
- rm -rf gmock
- cp -r ${gmock.source} gmock
- chmod -R a+w gmock
- '' + stdenv.lib.optionalString stdenv.isDarwin ''
- substituteInPlace src/google/protobuf/testing/googletest.cc \
- --replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
- '';
-
- buildInputs = [ autoreconfHook zlib ];
-
- enableParallelBuilding = true;
-
- doCheck = true;
-
- meta = {
- description = "Google's data interchange format";
- longDescription =
- ''Protocol Buffers are a way of encoding structured data in an efficient
- yet extensible format. Google uses Protocol Buffers for almost all of
- its internal RPC protocols and file formats.
- '';
- license = stdenv.lib.licenses.bsd3;
- platforms = stdenv.lib.platforms.unix;
- homepage = https://developers.google.com/protocol-buffers/;
- };
-
- passthru.version = version;
+ sha256 = "05qkcl96lkdama848m7q3nzzzdckjc158iiyvgmln0zi232xx7g7";
}
diff --git a/pkgs/development/libraries/protobuf/3.1.nix b/pkgs/development/libraries/protobuf/3.1.nix
new file mode 100644
index 00000000000..91ef87512c8
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/3.1.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... }:
+
+callPackage ./generic-v3.nix {
+ version = "3.1.0";
+ sha256 = "0qlvpsmqgh9nw0k4zrxlxf75pafi3p0ahz99v6761b903y8qyv4i";
+}
diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
new file mode 100644
index 00000000000..5a3738564d7
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -0,0 +1,47 @@
+{ stdenv
+, fetchFromGitHub
+, autoreconfHook, zlib, gmock
+, version, sha256
+, ...
+}:
+
+stdenv.mkDerivation rec {
+ name = "protobuf-${version}";
+
+ # make sure you test also -A pythonPackages.protobuf
+ src = fetchFromGitHub {
+ owner = "google";
+ repo = "protobuf";
+ rev = "v${version}";
+ inherit sha256;
+ };
+
+ postPatch = ''
+ rm -rf gmock
+ cp -r ${gmock.source} gmock
+ chmod -R a+w gmock
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ substituteInPlace src/google/protobuf/testing/googletest.cc \
+ --replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
+ '';
+
+ buildInputs = [ autoreconfHook zlib ];
+
+ enableParallelBuilding = true;
+
+ doCheck = true;
+
+ meta = {
+ description = "Google's data interchange format";
+ longDescription =
+ ''Protocol Buffers are a way of encoding structured data in an efficient
+ yet extensible format. Google uses Protocol Buffers for almost all of
+ its internal RPC protocols and file formats.
+ '';
+ license = stdenv.lib.licenses.bsd3;
+ platforms = stdenv.lib.platforms.unix;
+ homepage = https://developers.google.com/protocol-buffers/;
+ };
+
+ passthru.version = version;
+}
diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix
index 6ce2d9e2ffe..8c40ff2be20 100644
--- a/pkgs/development/libraries/pugixml/default.nix
+++ b/pkgs/development/libraries/pugixml/default.nix
@@ -2,29 +2,30 @@
stdenv.mkDerivation rec {
name = "pugixml-${version}";
- version = "1.7";
+ version = "1.8.1";
src = fetchurl {
url = "https://github.com/zeux/pugixml/releases/download/v${version}/${name}.tar.gz";
- sha256 = "1jpml475kbhs1aqwa48g2cbfxlrb9qp115m2j9yryxhxyr30vqgv";
+ sha256 = "0fcgggry5x5bn0zhb09ij9hb0p45nb0sv0d9fw3cm1cf62hp9n80";
};
nativeBuildInputs = [ cmake ];
- sourceRoot = "${name}/scripts";
-
cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ];
preConfigure = ''
# Enable long long support (required for filezilla)
- sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' ../src/pugiconfig.hpp
+ sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp
'';
+ patches = []
+ ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-long-long.patch ];
+
meta = with stdenv.lib; {
description = "Light-weight, simple and fast XML parser for C++ with XPath support";
homepage = http://pugixml.org/;
license = licenses.mit;
maintainers = with maintainers; [ pSub ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/pugixml/no-long-long.patch b/pkgs/development/libraries/pugixml/no-long-long.patch
new file mode 100644
index 00000000000..46c54e85a1d
--- /dev/null
+++ b/pkgs/development/libraries/pugixml/no-long-long.patch
@@ -0,0 +1,19 @@
+Get rid of long-long feature. This breaks on AppleClang compilers.
+---
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 40a7ab0..c84f0f7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,9 +26,9 @@ else()
+ endif()
+
+ # Enable C++11 long long for compilers that are capable of it
+-if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1)
+- target_compile_features(pugixml PUBLIC cxx_long_long_type)
+-endif()
++# if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1)
++# target_compile_features(pugixml PUBLIC cxx_long_long_type)
++# endif()
+
+ set_target_properties(pugixml PROPERTIES VERSION 1.7 SOVERSION 1)
+
diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index 8f886421d55..5aa1d0350fc 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
- homepage = http://qpdf.sourceforge.net/;
+ homepage = "http://qpdf.sourceforge.net/";
description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files";
license = licenses.artistic2;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index fdeb4f7e6c9..6d27ed5a0d3 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -49,7 +49,7 @@ let
outputs = args.outputs or [ "out" "dev" ];
setOutputFlags = args.setOutputFlags or false;
- setupHook = ./setup-hook.sh;
+ setupHook = ../qtsubmodule-setup-hook.sh;
enableParallelBuilding = args.enableParallelBuilding or true;
@@ -112,8 +112,15 @@ let
qtxmlpatterns
];
- makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh;
- qmakeHook = makeSetupHook { substitutions = { qt_dev = qtbase.dev; lndir = pkgs.xorg.lndir; }; } ./qmake-hook.sh;
+ makeQtWrapper =
+ makeSetupHook
+ { deps = [ makeWrapper ]; }
+ ../make-qt-wrapper.sh;
+
+ qmakeHook =
+ makeSetupHook
+ { deps = [ self.qtbase.dev ]; }
+ ../qmake-hook.sh;
};
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 04d06b0fcd4..5a44ca89902 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -272,7 +272,7 @@ stdenv.mkDerivation {
'';
inherit lndir;
- setupHook = ./setup-hook.sh;
+ setupHook = ../../qtbase-setup-hook.sh;
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index 0e40a7ac96d..687708d98ef 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -50,7 +50,7 @@ let
outputs = args.outputs or [ "out" "dev" ];
setOutputFlags = args.setOutputFlags or false;
- setupHook = ./setup-hook.sh;
+ setupHook = ../qtsubmodule-setup-hook.sh;
enableParallelBuilding = args.enableParallelBuilding or true;
@@ -106,12 +106,18 @@ 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;
- qmakeHook = makeSetupHook { deps = [ self.qtbase.dev ]; } ./qmake-hook.sh;
+ makeQtWrapper =
+ makeSetupHook
+ { deps = [ makeWrapper ]; }
+ (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
+ qmakeHook =
+ makeSetupHook
+ { deps = [ self.qtbase.dev ]; }
+ (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh);
};
self = makeScope pkgs.newScope addPackages;
diff --git a/pkgs/development/libraries/qt-5/5.6/fetch.sh b/pkgs/development/libraries/qt-5/5.6/fetch.sh
index b5b76d3e674..3aa539cda03 100644
--- a/pkgs/development/libraries/qt-5/5.6/fetch.sh
+++ b/pkgs/development/libraries/qt-5/5.6/fetch.sh
@@ -1,3 +1,3 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/ \
- http://download.qt.io/community_releases/5.6/5.6.1/ \
+WGET_ARGS=( http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/ \
+ http://download.qt.io/community_releases/5.6/5.6.2/ \
-A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh b/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh
deleted file mode 100644
index 696b4ea8dad..00000000000
--- a/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-qmakeConfigurePhase() {
- runHook preConfigure
-
- qmake PREFIX=$out $qmakeFlags
-
- runHook postConfigure
-}
-
-if [ -z "$dontUseQmakeConfigure" -a -z "$configurePhase" ]; then
- configurePhase=qmakeConfigurePhase
-fi
-
-_qtModuleMultioutDevsPre() {
- # We cannot simply set these paths in configureFlags because libQtCore retains
- # references to the paths it was built with.
- moveToOutput "bin" "${!outputDev}"
- moveToOutput "include" "${!outputDev}"
-
- # The destination directory must exist or moveToOutput will do nothing
- mkdir -p "${!outputDev}/share"
- moveToOutput "share/doc" "${!outputDev}"
-}
-
-_qtModuleMultioutDevsPost() {
- # Move libtool archives and qmake project files to $dev/lib
- if [ "z${!outputLib}" != "z${!outputDev}" ]; then
- pushd "${!outputLib}"
- if [ -d "lib" ]; then
- find lib \( -name '*.a' -o -name '*.la' -o -name '*.prl' \) -print0 | \
- while read -r -d $'\0' file; do
- mkdir -p "${!outputDev}/$(dirname "$file")"
- mv "${!outputLib}/$file" "${!outputDev}/$file"
- done
- fi
- popd
- fi
-}
-
-if [ -n "$NIX_QT_SUBMODULE" ]; then
- preFixupHooks+=(_qtModuleMultioutDevsPre)
- postFixupHooks+=(_qtModuleMultioutDevsPost)
-fi
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths-darwin.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths-darwin.patch
new file mode 100644
index 00000000000..9d42314e4cc
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths-darwin.patch
@@ -0,0 +1,384 @@
+Index: qtbase-opensource-src-5.6.1/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.6.1.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ qtbase-opensource-src-5.6.1/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
+ endif()
+ !!ENDIF
+
+-!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
+-!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
+-!!ELSE
+-get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH)
+-# Use original install prefix when loaded through a
+-# cross-prefix symbolic link such as /lib -> /usr/lib.
+-get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH)
+-get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH)
+-if(_realCurr STREQUAL _realOrig)
+- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE)
+-else()
+- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
+-endif()
+-unset(_realOrig)
+-unset(_realCurr)
+-unset(_IMPORT_PREFIX)
+-!!ENDIF
+-!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
+-!!ELSE
+-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
+-!!ENDIF
+-
+ !!IF !equals(TEMPLATE, aux)
+ # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
+ set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
+@@ -59,7 +35,10 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
+ set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
+
+ !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
+- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
++ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
++ if(NOT EXISTS \"${imported_location}\")
++ set(imported_location \"@NIX_DEV@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
++ endif()
+ !!ELSE
+ set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
+ !!ENDIF
+@@ -74,45 +53,17 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
+ \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
+ )
+
+-!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
+-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
+-!!ELSE
+- set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
+-!!ENDIF
+- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
+- if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
+- set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
+- \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
+- )
+- endif()
+-!!ENDIF
+ endmacro()
+ !!ENDIF
+
+ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+
+ !!IF !no_module_headers
+-!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
+- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
+- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\"
+- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
+- )
+-!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
+- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
+- )
+-!!ELSE
+- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+-!!ENDIF
+-!!ELSE
+ !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
+- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
++ set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"@NIX_OUT@/lib\" \"@NIX_OUT@/lib/$${MODULE_INCNAME}.framework/Headers\")
+ !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+ set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
+- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
++ \"\"
+ )
+ !!ELSE
+ set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+@@ -128,7 +80,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
+ set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ENDIF
+-!!ENDIF
++
+ !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS)
+ include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
+ !!ENDIF
+@@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
+
+ !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
+ !!IF isEmpty(CMAKE_DEBUG_TYPE)
+-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
+-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
+- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
+- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
+-!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
+ if (EXISTS
+ !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
+- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
++ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
+ !!ELSE
+ \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
+ !!ENDIF
+ AND EXISTS
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
++ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+ !!ELSE
+ \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+ !!ENDIF
+ _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
+ endif()
+ !!ENDIF // CMAKE_DEBUG_TYPE
+ !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
+@@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
+ !!ENDIF // CMAKE_RELEASE_TYPE
+
+ !!IF !isEmpty(CMAKE_DEBUG_TYPE)
+-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
+- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
+-!!ELSE
+ _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
+
+ !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
+ !!IF isEmpty(CMAKE_RELEASE_TYPE)
+-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
+-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
+-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
+- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
+-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
+- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
+-!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
+ if (EXISTS
+ !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
+- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
++ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
+ !!ELSE
+ \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
+ !!ENDIF
+ AND EXISTS
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
++ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
+ !!ELSE
+ \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
+ !!ENDIF
+ _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
+-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
+ endif()
+ !!ENDIF // CMAKE_RELEASE_TYPE
+ !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
+@@ -328,11 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
+ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
+ set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
+
+-!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
+- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
+-!!ELSE
+- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
+-!!ENDIF
++ set(imported_location \"${PLUGIN_LOCATION}\")
+ _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
+ set_target_properties(Qt5::${Plugin} PROPERTIES
+ \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
+Index: qtbase-opensource-src-5.6.1/src/gui/Qt5GuiConfigExtras.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.6.1.orig/src/gui/Qt5GuiConfigExtras.cmake.in
++++ qtbase-opensource-src-5.6.1/src/gui/Qt5GuiConfigExtras.cmake.in
+@@ -2,7 +2,7 @@
+ !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
+
+ !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
+-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
++set(Qt5Gui_EGL_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR/QtANGLE\")
+ !!ELSE
+ set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
+ !!ENDIF
+@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_propert
+ set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
+
+ !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
+- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
++ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
+ !!ELSE
+ set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
+ !!ENDIF
+
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
++ set(imported_implib \"@NIX_DEV@/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
+ !!ELSE
+ set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
+ !!ENDIF
+Index: qtbase-opensource-src-5.6.1/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.6.1.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in
++++ qtbase-opensource-src-5.6.1/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)
+ add_executable(Qt5::uic IMPORTED)
+
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+ set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+Index: qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtras.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.6.1.orig/src/corelib/Qt5CoreConfigExtras.cmake.in
++++ qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtras.cmake.in
+@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
+ add_executable(Qt5::qmake IMPORTED)
+
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+ set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc)
+ add_executable(Qt5::moc IMPORTED)
+
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+ set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc)
+ add_executable(Qt5::rcc IMPORTED)
+
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+ set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+@@ -131,7 +131,7 @@ if (NOT TARGET Qt5::WinMain)
+ !!IF !isEmpty(CMAKE_RELEASE_TYPE)
+ set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
++ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
+ !!ELSE
+ set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
+ !!ENDIF
+@@ -145,7 +145,7 @@ if (NOT TARGET Qt5::WinMain)
+ set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
++ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
+ !!ELSE
+ set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
+ !!ENDIF
+Index: qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.6.1.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
++++ qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+@@ -1,6 +1,6 @@
+
+ !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)
+-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
++set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
+ !!ELSE
+ set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
+ !!ENDIF
+Index: qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.6.1.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
++++ qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+@@ -1,6 +1,6 @@
+
+ !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
+-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
++set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
+ !!ELSE
+ set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
+ !!ENDIF
+Index: qtbase-opensource-src-5.6.1/src/dbus/Qt5DBusConfigExtras.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.6.1.orig/src/dbus/Qt5DBusConfigExtras.cmake.in
++++ qtbase-opensource-src-5.6.1/src/dbus/Qt5DBusConfigExtras.cmake.in
+@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
+ add_executable(Qt5::qdbuscpp2xml IMPORTED)
+
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+ set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp)
+ add_executable(Qt5::qdbusxml2cpp IMPORTED)
+
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+ set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+Index: qtbase-opensource-src-5.6.1/mkspecs/features/create_cmake.prf
+===================================================================
+--- qtbase-opensource-src-5.6.1.orig/mkspecs/features/create_cmake.prf
++++ qtbase-opensource-src-5.6.1/mkspecs/features/create_cmake.prf
+@@ -136,28 +136,28 @@ contains(CONFIG, plugin) {
+
+ win32 {
+ isEmpty(CMAKE_STATIC_TYPE) {
+- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll
+- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.dll
++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.dll
++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.dll
+ } else:mingw {
+- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a
+- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a
++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}/$$PLUGIN_TYPE/lib$${TARGET}.a
++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}d.a
+ } else { # MSVC static
+- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib
+- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib
++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.lib
++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.lib
+ }
+ } else {
+ mac {
+ isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib
+ else: CMAKE_PlUGIN_EXT = .a
+
+- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
+- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
+ } else {
+ isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so
+ else: CMAKE_PlUGIN_EXT = .a
+
+- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
+- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
+ }
+ }
+ cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in
+Index: qtbase-opensource-src-5.6.1/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.6.1.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
++++ qtbase-opensource-src-5.6.1/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+@@ -2,10 +2,10 @@
+ add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
+
+ !!IF !isEmpty(CMAKE_RELEASE_TYPE)
+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
+ !!ENDIF
+ !!IF !isEmpty(CMAKE_DEBUG_TYPE)
+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
+ !!ENDIF
+
+ list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
index bb245548d5b..341ebe1198b 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
@@ -9,13 +9,15 @@
, coreutils, bison, flex, gdb, gperf, lndir
, patchelf, perl, pkgconfig, python2
+, darwin, libiconv
# optional dependencies
, cups ? null
, mysql ? null, postgresql ? null
# options
-, mesaSupported, mesa
+, mesaSupported ? (!stdenv.isDarwin)
+, mesa
, buildExamples ? false
, buildTests ? false
, developerBuild ? false
@@ -35,6 +37,7 @@ stdenv.mkDerivation {
patches =
copyPathsToStore (lib.readPathsFromFile ./. ./series)
+ ++ [(if stdenv.isDarwin then ./cmake-paths-darwin.patch else ./cmake-paths.patch)]
++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch
++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
@@ -54,11 +57,11 @@ stdenv.mkDerivation {
substituteInPlace src/network/kernel/qhostinfo_unix.cpp \
--replace "@glibc@" "${stdenv.cc.libc.out}"
- substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \
- --replace "@libXcursor@" "${libXcursor.out}"
-
substituteInPlace src/network/ssl/qsslsocket_openssl_symbols.cpp \
--replace "@openssl@" "${openssl.out}"
+ '' + lib.optionalString stdenv.isLinux ''
+ substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \
+ --replace "@libXcursor@" "${libXcursor.out}"
substituteInPlace src/dbus/qdbus_symbols.cpp \
--replace "@dbus_libs@" "${dbus.lib}"
@@ -66,16 +69,30 @@ stdenv.mkDerivation {
substituteInPlace \
src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
--replace "@libX11@" "${libX11.out}"
- ''
- + lib.optionalString mesaSupported ''
+ '' + lib.optionalString mesaSupported ''
substituteInPlace \
src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \
--replace "@mesa_lib@" "${mesa.out}"
substituteInPlace mkspecs/common/linux.conf \
--replace "@mesa_lib@" "${mesa.out}" \
--replace "@mesa_inc@" "${mesa.dev or mesa}"
+ '' + lib.optionalString stdenv.isDarwin ''
+ sed -i \
+ -e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \
+ -e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \
+ -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot="${darwin.apple_sdk.sdk}"|' \
+ -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \
+ -e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \
+ -e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \
+ -e 's#val=$(echo $sdk_val $(echo $val | cut -s -d \x27 \x27 -f 2-))##' \
+ ./configure
+ sed -i '3,$d' ./mkspecs/features/mac/default_pre.prf
+ sed -i '26,$d' ./mkspecs/features/mac/default_post.prf
+ sed -i '1,$d' ./mkspecs/features/mac/sdk.prf
+ sed 's/QMAKE_LFLAGS_RPATH = -Wl,-rpath,/QMAKE_LFLAGS_RPATH =/' -i ./mkspecs/common/mac.conf
'';
-
+ # Note on the above: \x27 is a way if including a single-quote
+ # character in the sed string arguments.
setOutputFlags = false;
preConfigure = ''
@@ -104,7 +121,6 @@ stdenv.mkDerivation {
${lib.optionalString developerBuild "-developer-build"}
-largefile
-accessibility
- -rpath
-optimized-qmake
-strip
-no-reduce-relocations
@@ -115,19 +131,9 @@ stdenv.mkDerivation {
-widgets
-opengl desktop
-qml-debug
- -nis
-iconv
-icu
-pch
- -glib
- -xcb
- -qpa xcb
- -${lib.optionalString (cups == null) "no-"}cups
-
- -no-eglfs
- -no-directfb
- -no-linuxfb
- -no-kms
${lib.optionalString (!system-x86_64) "-no-sse2"}
-no-sse3
@@ -143,11 +149,8 @@ stdenv.mkDerivation {
-system-libpng
-system-libjpeg
-system-harfbuzz
- -system-xcb
- -system-xkbcommon
-system-pcre
-openssl-linked
- -dbus-linked
-system-sqlite
-${if mysql != null then "plugin" else "no"}-sql-mysql
@@ -157,6 +160,27 @@ stdenv.mkDerivation {
-make tools
-${lib.optionalString (buildExamples == false) "no"}make examples
-${lib.optionalString (buildTests == false) "no"}make tests
+ '' + lib.optionalString (!stdenv.isDarwin) ''
+ -no-rpath
+ -glib
+ -xcb
+ -qpa xcb
+
+ -${lib.optionalString (cups == null) "no-"}cups
+
+ -no-eglfs
+ -no-directfb
+ -no-linuxfb
+ -no-kms
+
+ -system-xcb
+ -system-xkbcommon
+ -dbus-linked
+ '' + lib.optionalString stdenv.isDarwin ''
+ -platform macx-clang
+ -no-use-gold-linker
+ -no-fontconfig
+ -qt-freetype
'';
# PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
@@ -165,19 +189,27 @@ stdenv.mkDerivation {
PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
propagatedBuildInputs = [
- dbus glib libxml2 libxslt openssl pcre16 sqlite udev zlib
+ libxml2 libxslt openssl pcre16 sqlite zlib
+
+ # Text rendering
+ harfbuzz icu
# Image formats
libjpeg libpng libtiff
+ ]
+ ++ lib.optional mesaSupported mesa
+ ++ lib.optionals (!stdenv.isDarwin) [
+ dbus glib udev
# Text rendering
- fontconfig freetype harfbuzz icu
-
+ fontconfig freetype
# X11 libs
xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
- ]
- ++ lib.optional mesaSupported mesa;
+ ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+ ApplicationServices CoreServices AppKit Carbon OpenGL AGL Cocoa
+ DiskArbitration darwin.cf-private libiconv darwin.apple_sdk.sdk
+ ]);
buildInputs =
[ bison flex gperf ]
@@ -186,10 +218,14 @@ stdenv.mkDerivation {
++ lib.optional (mysql != null) mysql.lib
++ lib.optional (postgresql != null) postgresql;
- nativeBuildInputs = [ lndir patchelf perl pkgconfig python2 ];
+ nativeBuildInputs = [ lndir perl pkgconfig python2 ] ++ lib.optional (!stdenv.isDarwin) patchelf;
# freetype-2.5.4 changed signedness of some struct fields
- NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
+ NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"
+ + lib.optionalString stdenv.isDarwin " -D__MAC_OS_X_VERSION_MAX_ALLOWED=1090 -D__AVAILABILITY_INTERNAL__MAC_10_10=__attribute__((availability(macosx,introduced=10.10)))";
+ # Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is
+ # 10.9 which necessitates the above macro definition that mentions
+ # 10.10
postInstall = ''
find "$out" -name "*.cmake" | while read file; do
@@ -211,6 +247,11 @@ stdenv.mkDerivation {
moveToOutput "share/doc" "$dev"
'';
+ # Don't move .prl files on darwin because they end up in
+ # "dev/lib/Foo.framework/Foo.prl" which interferes with subsequent
+ # use of lndir in the qtbase setup-hook. On Linux, the .prl files
+ # are in lib, and so do not cause a subsequent recreation of deep
+ # framework directory trees.
postFixup =
''
# Don't retain build-time dependencies like gdb.
@@ -219,17 +260,33 @@ stdenv.mkDerivation {
# Move libtool archives and qmake projects
if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then
pushd "''${!outputLib}"
- find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \
+ find lib -name '*.a' -o -name '*.la'${if stdenv.isDarwin then "" else "-o -name '*.prl'"} | \
while read -r file; do
mkdir -p "''${!outputDev}/$(dirname "$file")"
mv "''${!outputLib}/$file" "''${!outputDev}/$file"
done
popd
fi
+ '' + lib.optionalString stdenv.isDarwin ''
+ fixDarwinDylibNames_rpath() {
+ local flags=()
+
+ for fn in "$@"; do
+ flags+=(-change "@rpath/$fn.framework/Versions/5/$fn" "$out/lib/$fn.framework/Versions/5/$fn")
+ done
+
+ for fn in "$@"; do
+ echo "$fn: fixing dylib"
+ install_name_tool -id "$out/lib/$fn.framework/Versions/5/$fn" "''${flags[@]}" "$out/lib/$fn.framework/Versions/5/$fn"
+ done
+ }
+ fixDarwinDylibNames_rpath "QtConcurrent" "QtPrintSupport" "QtCore" "QtSql" "QtDBus" "QtTest" "QtGui" "QtWidgets" "QtNetwork" "QtXml" "QtOpenGL"
'';
inherit lndir;
- setupHook = ./setup-hook.sh;
+ setupHook = if stdenv.isDarwin
+ then ../../qtbase-setup-hook-darwin.sh
+ else ../../qtbase-setup-hook.sh;
enableParallelBuilding = true;
@@ -238,7 +295,6 @@ stdenv.mkDerivation {
description = "A cross-platform application framework for C++";
license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
maintainers = with maintainers; [ bbenoist qknight ttuegel ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
-
}
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/series b/pkgs/development/libraries/qt-5/5.6/qtbase/series
index 44e2d904080..2196d838375 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/series
@@ -7,4 +7,3 @@ xdg-config-dirs.patch
nix-profiles-library-paths.patch
compose-search-path.patch
libressl.patch
-cmake-paths.patch
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 dba3611683e..96b6cca75aa 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
@@ -9,15 +9,16 @@
, bison, flex, git, which, gperf
, coreutils
-, pkgconfig, python
+, pkgconfig, python2
+, stdenv # lib.optional, needsPax
}:
qtSubmodule {
name = "qtwebengine";
qtInputs = [ qtquickcontrols qtlocation qtwebchannel ];
buildInputs = [ bison flex git which gperf ];
- nativeBuildInputs = [ pkgconfig python coreutils ];
+ nativeBuildInputs = [ pkgconfig python2 coreutils ];
doCheck = true;
enableParallelBuilding = true;
@@ -30,7 +31,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 \
@@ -55,11 +61,14 @@ qtSubmodule {
];
patches = [
./chromium-clang-update-py.patch
- ];
+ ] ++ stdenv.lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;
+
postInstall = ''
cat > $out/libexec/qt.conf <> "$NIX_QT5_TMP/nix-support/qt-inputs"
- done
-
- postHooks+=(_qtSetCMakePrefix)
-
- cp "@dev@/bin/qmake" "$NIX_QT5_TMP/bin"
- echo "bin/qmake" >> "$NIX_QT5_TMP/nix-support/qt-inputs"
-
- cat >"$NIX_QT5_TMP/bin/qt.conf" <> "$NIX_QT5_TMP/nix-support/qt-inputs"
-
- export QMAKE="$NIX_QT5_TMP/bin/qmake"
-
- # Set PATH to find qmake first in a preConfigure hook
- # It must run after all the envHooks!
- preConfigureHooks+=(_qtSetQmakePath)
-fi
-
-qt5LinkModuleDir() {
- if [ -d "$1/$2" ]; then
- @lndir@/bin/lndir -silent "$1/$2" "$NIX_QT5_TMP/$2"
- find "$1/$2" -printf "$2/%P\n" >> "$NIX_QT5_TMP/nix-support/qt-inputs"
- fi
-}
-
-NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@"
-NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@"
-
-_qtLinkAllModules() {
- IFS=: read -a modules <<< $NIX_QT5_MODULES
- for module in ${modules[@]}; do
- qt5LinkModuleDir "$module" "lib"
- done
-
- IFS=: read -a modules <<< $NIX_QT5_MODULES_DEV
- for module in ${modules[@]}; do
- qt5LinkModuleDir "$module" "bin"
- qt5LinkModuleDir "$module" "include"
- qt5LinkModuleDir "$module" "lib"
- qt5LinkModuleDir "$module" "mkspecs"
- qt5LinkModuleDir "$module" "share"
- done
-}
-
-preConfigureHooks+=(_qtLinkAllModules)
-
-_qtFixCMakePaths() {
- find "${!outputLib}" -name "*.cmake" | while read file; do
- substituteInPlace "$file" \
- --subst-var-by NIX_OUT "${!outputLib}" \
- --subst-var-by NIX_DEV "${!outputDev}"
- done
-}
-
-if [ -n "$NIX_QT_SUBMODULE" ]; then
- postInstallHooks+=(_qtFixCMakePaths)
-fi
diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebengine.nix b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
similarity index 85%
rename from pkgs/development/libraries/qt-5/5.7/qtwebengine.nix
rename to pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
index 2a437e62eca..e7cb8c0ec62 100644
--- a/pkgs/development/libraries/qt-5/5.7/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
@@ -9,15 +9,16 @@
, bison, flex, git, which, gperf
, coreutils
-, pkgconfig, python
+, pkgconfig, python2
+, stdenv # lib.optional, needsPax
}:
qtSubmodule {
name = "qtwebengine";
qtInputs = [ qtquickcontrols qtlocation qtwebchannel ];
buildInputs = [ bison flex git which gperf ];
- nativeBuildInputs = [ pkgconfig python coreutils ];
+ nativeBuildInputs = [ pkgconfig python2 coreutils ];
doCheck = true;
enableParallelBuilding = true;
@@ -53,10 +54,13 @@ qtSubmodule {
libcap
pciutils
];
+ patches = stdenv.lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;
postInstall = ''
cat > $out/libexec/qt.conf <> "$NIX_QT5_TMP/nix-support/qt-inputs"
done
+ mkdir -p "$NIX_QT5_TMP/lib"
postHooks+=(_qtSetCMakePrefix)
- cp "@dev@/bin/qmake" "$NIX_QT5_TMP/bin"
+ ln -sf "@dev@/bin/qmake" "$NIX_QT5_TMP/bin"
echo "bin/qmake" >> "$NIX_QT5_TMP/nix-support/qt-inputs"
cat >"$NIX_QT5_TMP/bin/qt.conf" < readline != null && ncurses != null;
stdenv.mkDerivation {
- name = "sqlite-3.15.0";
+ name = "sqlite-3.15.2";
src = fetchurl {
- url = "http://sqlite.org/2016/sqlite-autoconf-3150000.tar.gz";
- sha256 = "09zdipkrvavlbw9dj4kwnii0z1b20rljn9fmfxz6scx0njljs5kp";
+ url = "http://sqlite.org/2016/sqlite-autoconf-3150200.tar.gz";
+ sha256 = "0j9i1zrwxc7dfd6xr3xagal3incrlalsrk96havnas1qp5im1cq7";
};
outputs = [ "bin" "dev" "out" ];
diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix
index 69f6f6d8971..bc9e861df9c 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/pkgs/development/libraries/telepathy/glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt
+{ stdenv, fetchurl, dbus_glib, glib, python2, pkgconfig, libxslt
, gobjectIntrospection, valaSupport ? true, vala_0_23, glibcLocales }:
stdenv.mkDerivation rec {
@@ -11,14 +11,16 @@ stdenv.mkDerivation rec {
configureFlags = stdenv.lib.optional valaSupport "--enable-vala-bindings";
LC_ALL = "en_US.UTF-8";
- propagatedBuildInputs = [dbus_glib glib python gobjectIntrospection];
+ propagatedBuildInputs = [dbus_glib glib gobjectIntrospection];
- buildInputs = [pkgconfig libxslt glibcLocales ] ++ stdenv.lib.optional valaSupport vala_0_23;
+ buildInputs = [pkgconfig libxslt glibcLocales python2 ] ++ stdenv.lib.optional valaSupport vala_0_23;
preConfigure = ''
substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires
'';
+ passthru.python = python2;
+
meta = {
homepage = http://telepathy.freedesktop.org;
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix
index 4b7d06fe8c7..6cef26d3aad 100644
--- a/pkgs/development/libraries/utf8proc/default.nix
+++ b/pkgs/development/libraries/utf8proc/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "utf8proc-${version}";
- version = "1.3";
+ version = "2.0.2";
src = fetchurl {
url = "https://github.com/JuliaLang/utf8proc/archive/v${version}.tar.gz";
- sha256 = "07r7djkmd399wl9cn0s2iqjhmm7l5iifp5h1yf2in9s366mlhkkg";
+ sha256 = "140vib1m6n5kwzkw1n9fbsi5gl6xymbd7yndwqx1sj15aakak776";
};
makeFlags = [ "prefix=$(out)" ];
diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix
index d6dd61db83c..2beaa616f2d 100644
--- a/pkgs/development/libraries/vc/0.7.nix
+++ b/pkgs/development/libraries/vc/0.7.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- version = "0.7.5";
name = "Vc-${version}";
+ version = "0.7.5";
src = fetchFromGitHub {
owner = "VcDevel";
diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix
index aff0795daec..c37ff733111 100644
--- a/pkgs/development/libraries/vc/default.nix
+++ b/pkgs/development/libraries/vc/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- version = "1.2.0";
name = "Vc-${version}";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "VcDevel";
repo = "Vc";
rev = version;
- sha256 = "0qlfvcxv3nmf5drz5bc9kynaljr513pbn7snwgvghm150skmkpfl";
+ sha256 = "18vi92xxg0ly0fw4v06fwls11rahmg5z8xf65jxxrbgf37vc1wxi";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix
index 59fadbbbc1f..9e85ad7413d 100644
--- a/pkgs/development/libraries/vcg/default.nix
+++ b/pkgs/development/libraries/vcg/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = http://vcg.isti.cnr.it/vcglib/install.html;
+ homepage = "http://vcg.isti.cnr.it/vcglib/install.html";
description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes";
license = licenses.gpl3;
platforms = platforms.linux;
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index 4c00bb86142..622d027c60b 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -1,8 +1,6 @@
{ stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3,
python3Packages, glslang, spirv-tools, x11, libxcb, wayland }:
-assert stdenv.system == "x86_64-linux";
-
let
version = "1.0.26.0";
src = fetchFromGitHub {
@@ -11,7 +9,6 @@ let
rev = "sdk-${version}";
sha256 = "157m746hc76xrxd3qq0f44f5dy7pjbz8cx74ykqrlbc7rmpjpk58";
};
- getRev = name: builtins.substring 0 40 (builtins.readFile "${src}/${name}_revision");
in
stdenv.mkDerivation rec {
@@ -37,13 +34,33 @@ stdenv.mkDerivation rec {
"-DBUILD_WSI_WAYLAND_SUPPORT=ON" # XLIB/XCB supported by default
];
- installPhase = ''
- mkdir -p $out/lib
- mkdir -p $out/bin
- cp loader/libvulkan.so* $out/lib
- cp demos/vulkaninfo $out/bin
+ patches = [ ./use-xdg-paths.patch ];
+
+ outputs = [ "out" "dev" "demos" ];
+
+ preConfigure = ''
+ checkRev() {
+ [ "$2" = $(cat "$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "$1_revision") && exit 1)
+ }
+ checkRev spirv-tools "${spirv-tools.src.rev}"
+ checkRev spirv-headers "${spirv-tools.headers.rev}"
+ checkRev glslang "${glslang.src.rev}"
'';
+ installPhase = ''
+ mkdir -p $out/lib $out/bin
+ cp -d loader/libvulkan.so* $out/lib
+ cp demos/vulkaninfo $out/bin
+ mkdir -p $out/lib $out/share/vulkan/explicit_layer.d
+ cp -d layers/*.so $out/lib/
+ cp -d layers/*.json $out/share/vulkan/explicit_layer.d/
+ sed -i "s:\\./lib:$out/lib/lib:g" "$out/share/vulkan/"*/*.json
+ mkdir -p $dev/include
+ cp -rv ../include $dev/
+ mkdir -p $demos/bin
+ cp demos/smoketest demos/tri demos/cube demos/*.spv demos/*.ppm $demos/bin
+ '';
+
meta = with stdenv.lib; {
description = "LunarG Vulkan loader";
homepage = http://www.lunarg.com;
diff --git a/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch b/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch
new file mode 100644
index 00000000000..1ae0f20889f
--- /dev/null
+++ b/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch
@@ -0,0 +1,142 @@
+diff --git a/loader/loader.c b/loader/loader.c
+index a950ea1..9462d05 100644
+--- a/loader/loader.c
++++ b/loader/loader.c
+@@ -2671,6 +2671,94 @@ static VkResult loader_get_manifest_files(
+ }
+ }
+
++#if !defined(_WIN32)
++ if (home_location && override == NULL) {
++ char *xdgconfdirs = secure_getenv("XDG_CONFIG_DIRS");
++ char *xdgdatadirs = secure_getenv("XDG_DATA_DIRS");
++ char *cur, *src = loc;
++ size_t src_size = strlen(src), rel_size = strlen(home_location);
++ size_t size = 0;
++
++ if (src_size > 0)
++ size += src_size + 1;
++
++ if (xdgconfdirs == NULL)
++ xdgconfdirs = "/etc/xdg";
++ if (xdgdatadirs == NULL)
++ xdgdatadirs = "/usr/local/share:/usr/share";
++
++ for (char *x = xdgconfdirs; *x; ++x)
++ if (*x == PATH_SEPERATOR) size += rel_size;
++ size += strlen(xdgconfdirs) + rel_size + 1;
++ for (char *x = xdgdatadirs; *x; ++x)
++ if (*x == PATH_SEPERATOR) size += rel_size;
++ size += strlen(xdgdatadirs) + rel_size + 1;
++
++#if defined(LOCALPREFIX)
++ size += strlen(LOCALPREFIX "/" SYSCONFDIR) + rel_size + 1;
++ size += strlen(LOCALPREFIX "/" DATADIR) + rel_size + 1;
++#endif
++
++ loc = cur = loader_stack_alloc(size);
++ if (cur == NULL) {
++ loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
++ "Out of memory can't get manifest files");
++ res = VK_ERROR_OUT_OF_HOST_MEMORY;
++ goto out;
++ }
++
++ if (src_size > 0) {
++ memcpy(cur, src, src_size);
++ cur += src_size;
++ *cur++ = PATH_SEPERATOR;
++ }
++
++ src = xdgconfdirs;
++ for (char *x = src;; ++x) {
++ if (*x == PATH_SEPERATOR || *x == 0) {
++ size_t s = x - src;
++ memcpy(cur, src, s); cur += s;
++ memcpy(cur, home_location, rel_size); cur += rel_size;
++ *cur++ = PATH_SEPERATOR;
++ if (*x == 0)
++ break;
++ src = ++x;
++ }
++ }
++
++#if defined(LOCALPREFIX)
++ strcpy(cur, LOCALPREFIX "/" SYSCONFDIR);
++ cur += strlen(cur);
++ memcpy(cur, home_location, rel_size); cur += rel_size;
++ *cur++ = PATH_SEPERATOR;
++#endif
++
++ src = xdgdatadirs;
++ for (char *x = src;; ++x) {
++ if (*x == PATH_SEPERATOR || *x == 0) {
++ size_t s = x - src;
++ memcpy(cur, src, s); cur += s;
++ memcpy(cur, home_location, rel_size); cur += rel_size;
++ *cur++ = PATH_SEPERATOR;
++ if (*x == 0)
++ break;
++ src = ++x;
++ }
++ }
++
++#if defined(LOCALPREFIX)
++ strcpy(cur, LOCALPREFIX "/" DATADIR);
++ cur += strlen(cur);
++ memcpy(cur, home_location, rel_size); cur += rel_size;
++ *cur++ = PATH_SEPERATOR;
++#endif
++
++ loc[size - 1] = 0;
++ assert(cur == loc + size);
++ list_is_dirs = true;
++ }
++#endif
++
+ // Print out the paths being searched if debugging is enabled
+ loader_log(inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0,
+ "Searching the following paths for manifest files: %s\n", loc);
+diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h
+index 3a02640..70a2652 100644
+--- a/loader/vk_loader_platform.h
++++ b/loader/vk_loader_platform.h
+@@ -57,35 +57,10 @@
+ #define VULKAN_ILAYERCONF_DIR "implicit_layer.d"
+ #define VULKAN_LAYER_DIR "layer"
+
+-#if defined(LOCALPREFIX)
+-#define LOCAL_DRIVERS_INFO \
+- LOCALPREFIX "/" SYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR ":" \
+- LOCALPREFIX "/" DATADIR VULKAN_DIR VULKAN_ICDCONF_DIR ":"
+-#define LOCAL_ELAYERS_INFO \
+- LOCALPREFIX "/" SYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":" \
+- LOCALPREFIX "/" DATADIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":"
+-#define LOCAL_ILAYERS_INFO \
+- LOCALPREFIX "/" SYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":" \
+- LOCALPREFIX "/" DATADIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":"
+-#else
+-#define LOCAL_DRIVERS_INFO
+-#define LOCAL_ELAYERS_INFO
+-#define LOCAL_ILAYERS_INFO
+-#endif
+-
+-#define DEFAULT_VK_DRIVERS_INFO \
+- LOCAL_DRIVERS_INFO \
+- "/" SYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR ":" \
+- "/usr/" DATADIR VULKAN_DIR VULKAN_ICDCONF_DIR
++#define DEFAULT_VK_DRIVERS_INFO ""
+ #define DEFAULT_VK_DRIVERS_PATH ""
+-#define DEFAULT_VK_ELAYERS_INFO \
+- LOCAL_ELAYERS_INFO \
+- "/" SYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":" \
+- "/usr/" DATADIR VULKAN_DIR VULKAN_ELAYERCONF_DIR
+-#define DEFAULT_VK_ILAYERS_INFO \
+- LOCAL_ILAYERS_INFO \
+- "/" SYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":" \
+- "/usr/" DATADIR VULKAN_DIR VULKAN_ILAYERCONF_DIR
++#define DEFAULT_VK_ELAYERS_INFO ""
++#define DEFAULT_VK_ILAYERS_INFO ""
+ #define DEFAULT_VK_LAYERS_PATH ""
+ #if !defined(LAYERS_SOURCE_PATH)
+ #define LAYERS_SOURCE_PATH NULL
diff --git a/pkgs/development/libraries/webkitgtk/2.14.nix b/pkgs/development/libraries/webkitgtk/2.14.nix
index ca74f384ec9..3c92527ea70 100644
--- a/pkgs/development/libraries/webkitgtk/2.14.nix
+++ b/pkgs/development/libraries/webkitgtk/2.14.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, python, ruby, bison, gperf, cmake
+{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake
, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls
, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core
, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0";
nativeBuildInputs = [
- cmake perl python ruby bison gperf sqlite
+ cmake perl python2 ruby bison gperf sqlite
pkgconfig gettext gobjectIntrospection
];
diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index 7ddd56541aa..e5e9bb008d4 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "wolfssl-${version}";
- version = "3.9.8";
+ version = "3.9.10b";
src = fetchFromGitHub {
owner = "wolfSSL";
repo = "wolfssl";
rev = "v${version}";
- sha256 = "0b1a9rmzpzjblj0gsrzas2aljivd0gfimcsj8gjl80ng25zgmaxr";
+ sha256 = "1hx543kxi4fpxww0y2c05kaav99zmnxm81rq7v7d87qzmvw2g4gx";
};
outputs = [ "out" "dev" "doc" "lib" ];
diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix
deleted file mode 100644
index 7187f9b575f..00000000000
--- a/pkgs/development/libraries/xapian/bindings/default.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ stdenv, composableDerivation, fetchurl, xapian, pkgconfig, zlib
-, python ? null, sphinx ? null, php ? null, ruby ? null }:
-
-assert (python != null) -> (sphinx != null);
-
-let inherit (composableDerivation) wwf; in
-
-composableDerivation.composableDerivation {} rec {
-
- name = "xapian-bindings-${version}";
- version = (builtins.parseDrvName xapian.name).version;
-
- src = fetchurl {
- url = "http://oligarchy.co.uk/xapian/${version}/${name}.tar.xz";
- sha256 = "0lv2zblayfax4v7z3sj067b0av0phf3gc2s2d1cvkw0bkl07mv1s";
- };
-
- buildInputs = [ xapian pkgconfig zlib ];
-
- # most interpreters aren't tested yet.. (see python for example how to do it)
- flags =
- wwf {
- name = "python";
- enable = {
- buildInputs = [ python sphinx ];
-
- # Our `sphinx-build` binary is a shell wrapper around
- # `sphinx-build` python code. Makefile tries to execute it
- # using python2 and fails. Fixing that here.
- patchPhase = ''
- for a in python/Makefile* ; do
- substituteInPlace $a \
- --replace '$(PYTHON2) $(SPHINX_BUILD)' '$(SPHINX_BUILD)'
- done
- '';
-
- # export same env vars as in pythonNew
- preConfigure = ''
- export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages
- mkdir -p $out/nix-support
- echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook
- echo "export PYTHONPATH=\"$PYTHON_LIB:\$PYTHONPATH\"" >> $out/nix-support/setup-hook
- '';
- };
- }
- // wwf {
- name = "php";
- enable = {
- buildInputs = [ php ];
- preConfigure = ''
- export PHP_EXTENSION_DIR=$out/lib/php # TODO use a sane directory. Its not used anywhere by now
- '';
- };
- }
- // wwf {
- name = "ruby";
- enable = {
- buildInputs = [ ruby ];
- preConfigure = ''
- export RUBY_LIB=$out/${ruby.libPath}
- export RUBY_LIB_ARCH=$RUBY_LIB
- mkdir -p $out/nix-support
- echo "export RUBYLIB=\"$RUBY_LIB:\$RUBYLIB\"" >> $out/nix-support/setup-hook
- echo "export GEM_PATH=\"$out:\$GEM_PATH\"" >> $out/nix-support/setup-hook
- '';
- };
- }
-
- # note: see configure --help to get see which env vars can be used
- # // wwf { name = "tcl"; enable = { buildInputs = [ tcl ];};}
- # // wwf { name = "csharp"; }
- # // wwf { name = "java"; }
- ;
-
- cfg = {
- pythonSupport = true;
- phpSupport = false;
- rubySupport = true;
- };
-
- meta = {
- description = "Bindings for the Xapian library";
- homepage = xapian.meta.homepage;
- license = stdenv.lib.licenses.gpl2Plus;
- maintainers = [ stdenv.lib.maintainers.chaoflow ];
- platforms = stdenv.lib.platforms.unix;
- };
-}
diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix
index 3a45447119c..44f57cae7e1 100644
--- a/pkgs/development/libraries/xlslib/default.nix
+++ b/pkgs/development/libraries/xlslib/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, autoreconfHook, unzip }:
stdenv.mkDerivation rec {
- version = "2.5.0";
name = "xlslib-${version}";
+ version = "2.5.0";
src = fetchurl {
url = "mirror://sourceforge/xlslib/xlslib-package-${version}.zip";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "C++/C library to construct Excel .xls files in code";
- homepage = http://sourceforge.net/projects/xlslib/;
+ homepage = "http://sourceforge.net/projects/xlslib/";
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix
index 879e1ccaec3..252bcd02faf 100644
--- a/pkgs/development/libraries/zeitgeist/default.nix
+++ b/pkgs/development/libraries/zeitgeist/default.nix
@@ -1,6 +1,8 @@
{ stdenv, fetchurl, pkgconfig, glib, sqlite, gnome3, vala_0_23
-, intltool, libtool, python, dbus_libs, telepathy_glib
-, gtk3, json_glib, librdf_raptor2, pythonPackages, dbus_glib }:
+, intltool, libtool, dbus_libs, telepathy_glib
+, gtk3, json_glib, librdf_raptor2, dbus_glib
+, pythonSupport ? true, python2Packages
+}:
stdenv.mkDerivation rec {
version = "0.9.15";
@@ -18,8 +20,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ];
buildInputs = [ pkgconfig glib sqlite gnome3.gnome_common intltool
- libtool python dbus_libs telepathy_glib vala_0_23 dbus_glib
- gtk3 json_glib librdf_raptor2 pythonPackages.rdflib ];
+ libtool dbus_libs telepathy_glib vala_0_23 dbus_glib
+ gtk3 json_glib librdf_raptor2 python2Packages.rdflib ];
prePatch = "patchShebangs .";
@@ -29,6 +31,13 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ postFixup = ''
+ '' + stdenv.lib.optionalString pythonSupport ''
+ moveToOutput lib/${python2Packages.python.libPrefix} "$py"
+ '';
+
+ outputs = [ "out" ] ++ stdenv.lib.optional pythonSupport "py";
+
meta = with stdenv.lib; {
description = "A service which logs the users's activities and events";
homepage = https://launchpad.net/zeitgeist;
diff --git a/pkgs/development/libraries/zeromq/2.x.nix b/pkgs/development/libraries/zeromq/2.x.nix
deleted file mode 100644
index dd7404486d3..00000000000
--- a/pkgs/development/libraries/zeromq/2.x.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv, fetchurl, libuuid}:
-
-stdenv.mkDerivation rec {
- name = "zeromq-2.2.0";
-
- src = fetchurl {
- url = "http://download.zeromq.org/${name}.tar.gz";
- sha256 = "0ds6c244wik1lyfrfr2f4sha30fly4xybr02r9r4z156kvmlm423";
- };
-
- buildInputs = [ libuuid ];
-
- meta = {
- branch = "2";
- homepage = "http://www.zeromq.org";
- description = "The Intelligent Transport Layer";
- platforms = stdenv.lib.platforms.unix;
- };
-}
diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
index d99879d14a7..ab95f4ec3f3 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, libuuid, pkgconfig, libsodium }:
stdenv.mkDerivation rec {
- name = "zeromq-4.1.4";
+ name = "zeromq-${version}";
+ version = "4.2.0";
src = fetchurl {
- url = "http://download.zeromq.org/${name}.tar.gz";
- sha256 = "0y73dxgf4kaysmkvrkxqq9qk5znklxyghh749jw4qbjwwbyl97z9";
+ url = "https://github.com/zeromq/libzmq/releases/download/v${version}/${name}.tar.gz";
+ sha256 = "05y1s0938x5w838z79b4f9w6bspz9anldjx9dzvk32cpxvq3pf2k";
};
nativeBuildInputs = [ pkgconfig ];
@@ -17,6 +18,6 @@ stdenv.mkDerivation rec {
description = "The Intelligent Transport Layer";
license = licenses.gpl3;
platforms = platforms.all;
- maintainers = with maintainers; [ wkennington ];
+ maintainers = with maintainers; [ wkennington fpletz ];
};
}
diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix
index 9e928bdde6f..bc303429274 100644
--- a/pkgs/development/misc/loc/default.nix
+++ b/pkgs/development/misc/loc/default.nix
@@ -3,17 +3,17 @@
with rustPlatform;
buildRustPackage rec {
- version = "0.3.3";
+ version = "0.3.4";
name = "loc-${version}";
src = fetchFromGitHub {
owner = "cgag";
repo = "loc";
- rev = "e2dfe2c1452f25f58974b545292b11dc450afd3d";
- sha256 = "1kp5iawig6304gs1289aivgsq44zhnn0ykqv9ymwpvj0g12l4l8r";
+ rev = "9f3590f6299a1be3560f00de7f4f8bef61a02642";
+ sha256 = "0dga8prwnnmsa616jh64wzic957ff0491xghm0bjlns35ajc8lif";
};
- depsSha256 = "01jww6d4dzb5pq6vcrp3xslhxic0vp0gicsddda4adzqg1lab8c2";
+ depsSha256 = "1xcfhbnz208dk7xb748v8kv28zbhyr7wqg9gsgbiw3lnvc2a3nn6";
meta = {
homepage = "http://github.com/cgag/loc";
diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml
index aef61bb2fc2..538b7622df7 100644
--- a/pkgs/development/mobile/androidenv/addon.xml
+++ b/pkgs/development/mobile/androidenv/addon.xml
@@ -1,6 +1,6 @@
-
+
Terms and Conditions
This is the Android Software Development Kit License Agreement
@@ -1262,18 +1262,18 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
-
+
- 37
+ 40
0
0
-
- 281268000
- 2f862a5d66d5526cd5b7655c3e9678f493e485f7
- android_m2repository_r37.zip
+
+ 305545706
+ 782e7233f18c890463e8602571d304e680ce354c
+ android_m2repository_r40.zip
@@ -1308,16 +1308,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
compatibility
-
+
- 32
+ 40
-
- 113922721
- ae24bde9c8f732f4d13b72e70802be8c97dcfddf
- google_m2repository_r32.zip
+
+ 152633821
+ 0f599f7f35fba49b9277ef9e1394c5c82d8bd369
+ google_m2repository_gms_v8_rc42_wear_2a3.zip
@@ -1392,16 +1392,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
google_play_services_froyo
-
+
- 32
+ 38
-
- 11820632
- bf0e7c1848371c7e6dd7a01e237dbd916e5cb04f
- google_play_services_945200_r32.zip
+
+ 12351978
+ 7a50dec81ba9c9b51d7778c19ca05002498209e8
+ google_play_services_v8_rc41.zip
diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix
index f999f603b8f..7ddd203d4bf 100644
--- a/pkgs/development/mobile/androidenv/addons.nix
+++ b/pkgs/development/mobile/androidenv/addons.nix
@@ -283,8 +283,8 @@ in
google_play_services = buildGoogleApis {
name = "google_play_services";
src = fetchurl {
- url = https://dl.google.com/android/repository/google_play_services_945200_r32.zip;
- sha1 = "bf0e7c1848371c7e6dd7a01e237dbd916e5cb04f";
+ url = https://dl.google.com/android/repository/google_play_services_v8_rc41.zip;
+ sha1 = "7a50dec81ba9c9b51d7778c19ca05002498209e8";
};
meta = {
description = "Google Play services client library and sample code";
diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index a742386920b..52a2ab8f36a 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -11,16 +11,16 @@ with { inherit (stdenv.lib) makeLibraryPath; };
stdenv.mkDerivation rec {
name = "android-sdk-${version}";
- version = "25.2.2";
+ version = "25.2.3";
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
then fetchurl {
url = "http://dl.google.com/android/repository/tools_r${version}-linux.zip";
- sha256 = "0q53yq8fjc10kr4fz3rap5vsil3297w5nn4kw1z0ms7yz1d1im8h";
+ sha256 = "0q5m8lqhj07c6izhc0b0d73820ma0flvrj30ckznss4s9swvqd8v";
}
else if stdenv.system == "x86_64-darwin" then fetchurl {
url = "http://dl.google.com/android/repository/tools_r${version}-macosx.zip";
- sha256 = "1wq7xm0rhy0h6qylv7fq9mhf8hqihrr1nzf7d322rc3g0jfrdrcl";
+ sha256 = "1ihxd2a37ald3sdd04i4yk85prw81h6gnch0bmq65cbsrba48dar";
}
else throw "platform not ${stdenv.system} supported!";
diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix
index 945cc0bedd5..c09d643146b 100644
--- a/pkgs/development/mobile/androidenv/build-tools.nix
+++ b/pkgs/development/mobile/androidenv/build-tools.nix
@@ -1,16 +1,16 @@
{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses}:
stdenv.mkDerivation rec {
- version = "24.0.2";
+ version = "25.0.1";
name = "android-build-tools-r${version}";
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
then fetchurl {
url = "https://dl.google.com/android/repository/build-tools_r${version}-linux.zip";
- sha256 = "15bxk03m1r1i74idydgqsrz1k7qczi8f9sj4kl8vvbw9l6w2jklj";
+ sha256 = "0kyrazmcckikn6jiz9hwy6nlqjssf95h5iq7alswg1mryl04w6v7";
}
else if stdenv.system == "x86_64-darwin" then fetchurl {
url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip";
- sha256 = "0h71bv8rdkssn7a17vj3r7jl5jwsxbwpg3sig0k9a7yfwyfc71s8";
+ sha256 = "116i5xxbwz229m9z98n6bfkjk2xf3kbhdnqhbbnaagjsjzqdirki";
}
else throw "System ${stdenv.system} not supported!";
diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix
index 517167b0d55..6205b98eee1 100644
--- a/pkgs/development/mobile/androidenv/platform-tools.nix
+++ b/pkgs/development/mobile/androidenv/platform-tools.nix
@@ -1,16 +1,16 @@
{stdenv, zlib, fetchurl, unzip}:
stdenv.mkDerivation rec {
- version = "24.0.2";
+ version = "25.0.1";
name = "android-platform-tools-r${version}";
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
then fetchurl {
url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip";
- sha256 = "0y36mlwh4kb77d3vcpqxqwkxsadllap6g6jjylf3rb7blh5l4zw6";
+ sha256 = "0r8ix3jjqpk6wyxm8f6az9r4z5a1lnb3b9hzh8ay4ayidwhn8isx";
}
else if stdenv.system == "x86_64-darwin" then fetchurl {
url = "https://dl.google.com/android/repository/platform-tools_r${version}-macosx.zip";
- sha256 = "1whfhdwjir2sv2pfypagva813yn0fx8idi6c2mxhddv2mlws6zk4";
+ sha256 = "18pzwpr6fbxlw782j65clwz9kvdgvb04jpr2z12bbwyd8wqc4yln";
}
else throw "System ${stdenv.system} not supported!";
diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix
index e0c77ad294e..4f3f45f4cc9 100644
--- a/pkgs/development/mobile/androidenv/platforms-linux.nix
+++ b/pkgs/development/mobile/androidenv/platforms-linux.nix
@@ -292,4 +292,16 @@ in
};
};
+ platform_25 = buildPlatform {
+ name = "android-platform-7.1.1";
+ src = fetchurl {
+ url = https://dl.google.com/android/repository/platform-25_r02.zip;
+ sha1 = "6057e54a04f1d141f36a2c8d20f2962b41a3183f";
+ };
+ meta = {
+ description = "Android SDK Platform 25";
+ url = http://developer.android.com/sdk/;
+ };
+ };
+
}
diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix
index 60fae208ae1..d8619b7c0f5 100644
--- a/pkgs/development/mobile/androidenv/platforms-macosx.nix
+++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix
@@ -292,4 +292,16 @@ in
};
};
+ platform_25 = buildPlatform {
+ name = "android-platform-7.1.1";
+ src = fetchurl {
+ url = https://dl.google.com/android/repository/platform-25_r02.zip;
+ sha1 = "6057e54a04f1d141f36a2c8d20f2962b41a3183f";
+ };
+ meta = {
+ description = "Android SDK Platform 25";
+ url = http://developer.android.com/sdk/;
+ };
+ };
+
}
diff --git a/pkgs/development/mobile/androidenv/repository-11.xml b/pkgs/development/mobile/androidenv/repository-11.xml
index a0ef9bc4485..e115f674790 100644
--- a/pkgs/development/mobile/androidenv/repository-11.xml
+++ b/pkgs/development/mobile/androidenv/repository-11.xml
@@ -15,7 +15,7 @@
* limitations under the License.
-->
-
+
Terms and Conditions
This is the Android Software Development Kit License Agreement
@@ -296,85 +296,69 @@ This is the Android SDK Preview License Agreement (the "License Agreement&q
June 2014.
-
+
NDK
- 12
+ 13
-
- 734135279
- e257fe12f8947be9f79c10c3fffe87fb9406118a
- android-ndk-r12b-darwin-x86_64.zip
+
+ 665967997
+ 71fe653a7bf5db08c3af154735b6ccbc12f0add5
+ android-ndk-r13b-darwin-x86_64.zip
macosx
64
-
- 755551010
- 170a119bfa0f0ce5dc932405eaa3a7cc61b27694
- android-ndk-r12b-linux-x86_64.zip
+
+ 687311866
+ 0600157c4ddf50ec15b8a037cfc474143f718fd0
+ android-ndk-r13b-linux-x86_64.zip
linux
64
-
- 706453972
- 8e6eef0091dac2f3c7a1ecbb7070d4fa22212c04
- android-ndk-r12b-windows-x86.zip
+
+ 620461544
+ 4eb1288b1d4134a9d6474eb247f0448808d52408
+ android-ndk-r13b-windows-x86.zip
windows
32
-
- 749567353
- 337746d8579a1c65e8a69bf9cbdc9849bcacf7f5
- android-ndk-r12b-windows-x86_64.zip
+
+ 681320123
+ 649d306559435c244cec5881b880318bb3dee53a
+ android-ndk-r13b-windows-x86_64.zip
windows
64
-
-
- NDK
- 13
+
+
+ 7.1.1
+ 25
+ Android SDK Platform 25
+ 2
-
- 665405792
- 0cbdb271b103a7e4237b34b73f0e56381e4632aa
- android-ndk-r13-beta2-darwin-x86_64.zip
- macosx
- 64
-
-
-
- 686843165
- ea1a76d9ebdc82fe742d32798aaee7c980afd2f6
- android-ndk-r13-beta2-linux-x86_64.zip
- linux
- 64
-
-
-
- 619981813
- a5f6edceb3afa4ecd47071822ea32ba6bd6ac002
- android-ndk-r13-beta2-windows-x86.zip
- windows
- 32
-
-
-
- 680836961
- a0b6a0ed271b0a99cdca28ce8fd405f89defc539
- android-ndk-r13-beta2-windows-x86_64.zip
- windows
- 64
+
+ 85434042
+ 6057e54a04f1d141f36a2c8d20f2962b41a3183f
+ platform-25_r02.zip
-
-
+
+
+ 22
+
+ http://developer.android.com/sdk/
+
+ 16
+ 2
+
+
7.0
@@ -1147,6 +1131,102 @@ June 2014.
+
+
+
+ 25
+ 0
+ 1
+
+
+
+
+ 49880178
+ ff063d252ab750d339f5947d06ff782836f22bac
+ build-tools_r25.0.1-linux.zip
+ linux
+
+
+
+ 49667353
+ 7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f
+ build-tools_r25.0.1-macosx.zip
+ macosx
+
+
+
+ 50458759
+ c6c61393565ccf46349e7f44511e5db7c1c6169d
+ build-tools_r25.0.1-windows.zip
+ windows
+
+
+
+
+
+
+
+ 25
+ 0
+ 0
+
+
+
+
+ 49872921
+ f2bbda60403e75cabd0f238598c3b4dfca56ea44
+ build-tools_r25-linux.zip
+ linux
+
+
+
+ 49659466
+ 273c5c29a65cbed00e44f3aa470bbd7dce556606
+ build-tools_r25-macosx.zip
+ macosx
+
+
+
+ 50451378
+ f9258f2308ff8b62cfc4513d40cb961612d07b6a
+ build-tools_r25-windows.zip
+ windows
+
+
+
+
+
+
+
+ 24
+ 0
+ 3
+
+
+
+
+ 49779151
+ 9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304
+ build-tools_r24.0.3-linux.zip
+ linux
+
+
+
+ 49568967
+ a01c15f1b105c34595681075e1895d58b3fff48c
+ build-tools_r24.0.3-macosx.zip
+ macosx
+
+
+
+ 50354788
+ 8b960d693fd4163caeb8dc5f5f5f80b10987089c
+ build-tools_r24.0.3-windows.zip
+ windows
+
+
+
+
@@ -1963,64 +2043,64 @@ June 2014.
-
+
- 24
+ 25
0
- 2
+ 1
-
- 3341647
- a268850d31973d32de5c1515853f81924a4068cf
- platform-tools_r24.0.2-linux.zip
+
+ 3916151
+ 8e461a2c76717824d1d8e91af68216c9f230a373
+ platform-tools_r25.0.1-linux.zip
linux
-
- 3157182
- 16053da716cbc6ef31c32a0d2f1437b22089c88c
- platform-tools_r24.0.2-macosx.zip
+
+ 3732924
+ 96abc8638bf9f65435bc0ab641cc4a3ff753eed5
+ platform-tools_r25.0.1-macosx.zip
macosx
-
- 2997417
- ce09a7351d5c50865691554ed56325f6e5cd733c
- platform-tools_r24.0.2-windows.zip
+
+ 3573485
+ 75249224c12528329a151dfbc591509168ef6efd
+ platform-tools_r25.0.1-windows.zip
windows
-
+
25
2
- 2
+ 3
-
- 273491448
- 99257925a3d8b46fee948a7520d7b7e3e3e1890e
- tools_r25.2.2-linux.zip
+
+ 277861433
+ aafe7f28ac51549784efc2f3bdfc620be8a08213
+ tools_r25.2.3-linux.zip
linux
-
- 195856788
- bbaa3929696ce523ea62b58cc8032d7964a154c5
- tools_r25.2.2-macosx.zip
+
+ 200496727
+ 0e88c0bdb8f8ee85cce248580173e033a1bbc9cb
+ tools_r25.2.3-macosx.zip
macosx
-
- 301642481
- ef898dff805c4b9e39f6e77fd9ec397fb1b1f809
- tools_r25.2.2-windows.zip
+
+ 306745639
+ b965decb234ed793eb9574bad8791c50ca574173
+ tools_r25.2.3-windows.zip
windows
diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix
index 182fdded2bd..84ebee5a75f 100644
--- a/pkgs/development/mobile/androidenv/support-repository.nix
+++ b/pkgs/development/mobile/androidenv/support-repository.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, unzip}:
stdenv.mkDerivation rec {
- version = "35";
+ version = "40";
name = "android-support-repository-r${version}";
src = fetchurl {
url = "http://dl.google.com/android/repository/android_m2repository_r${version}.zip";
- sha1 = "2wi1b38n3dmnikpwbwcbyy2xfws1683s";
+ sha1 = "782e7233f18c890463e8602571d304e680ce354c";
};
buildCommand = ''
diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml
index 237f1348232..807d4976296 100644
--- a/pkgs/development/mobile/androidenv/sys-img.xml
+++ b/pkgs/development/mobile/androidenv/sys-img.xml
@@ -1,6 +1,6 @@
-
+
Terms and Conditions
This is the Android Software Development Kit License Agreement
@@ -404,6 +404,23 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header as indicated in the Evaluation Software. Additional detail may be available (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement.
+
+
+ 10
+ ARM EABI v7a System Image
+ 4
+
+
+
+ 67918042
+ 54680383118eb5c95a11e1cc2a14aa572c86ee69
+ armv7-10_r04.zip
+
+
+
+ armeabi-v7a
+ default
+
14
@@ -422,16 +439,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
default
-
+
15
ARM EABI v7a System Image
- 3
+ 4
-
- 96240395
- 0a47f586e172b1cf3db2ada857a70c2bdec24ef8
- sysimg_armv7a-15_r03.zip
+
+ 102079727
+ 363223bd62f5afc0b2bd760b54ce9d26b31eacf1
+ armeabi-v7a-15_r04.zip
@@ -456,16 +473,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
default
-
+
17
ARM EABI v7a System Image
- 3
+ 5
-
- 118663847
- 97cfad22b51c8475e228b207dd36dbef1c18fa38
- sysimg_armv7a-17_r03.zip
+
+ 124238679
+ 7460e8110f4a87f9644f1bdb5511a66872d50fd9
+ armeabi-v7a-17_r05.zip
@@ -473,16 +490,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
default
-
+
18
ARM EABI v7a System Image
- 3
+ 4
-
- 125503391
- 2d7d51f4d2742744766511e5d6b491bd49161c51
- sysimg_armv7a-18_r03.zip
+
+ 130394401
+ 0bf34ecf4ddd53f6b1b7fe7dfa12f2887c17e642
+ armeabi-v7a-18_r04.zip
@@ -490,16 +507,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
default
-
+
19
ARM EABI v7a System Image
- 3
+ 5
-
- 159399028
- 5daf7718e3ab03d9bd8792b492dd305f386ef12f
- sysimg_armv7a-19_r03.zip
+
+ 159871567
+ d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa
+ armeabi-v7a-19_r05.zip
@@ -507,16 +524,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
default
-
+
21
ARM EABI v7a System Image
- 3
+ 4
-
- 186521381
- 0b2e21421d29f48211b5289ca4addfa7f4c7ae5a
- sysimg_arm-21_r03.zip
+
+ 187163871
+ 8c606f81306564b65e41303d2603e4c42ded0d10
+ armeabi-v7a-21_r04.zip
@@ -524,16 +541,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
default
-
+
22
ARM EABI v7a System Image
- 1
+ 2
-
- 193687339
- 2aa6a887ee75dcf3ac34627853d561997792fcb8
- sysimg_arm-22_r01.zip
+
+ 194596267
+ 2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1
+ armeabi-v7a-22_r02.zip
@@ -541,16 +558,17 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
default
-
+
23
ARM EABI v7a System Image
- 3
+ 6
-
- 226879660
- 7bb8768ec4333500192fd9627d4234f505fa98dc
- sysimg_arm-23_r03.zip
+
+ 238333358
+ 7cf2ad756e54a3acfd81064b63cb0cb9dff2798d
+ armeabi-v7a-23_r06.zip
+ windows
@@ -643,16 +661,67 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
default
-
+
10
Intel x86 Atom System Image
+ 4
+
+
+
+ 75382637
+ 655ffc5cc89dd45a3aca154b254009016e473aeb
+ x86-10_r04.zip
+
+
+
+ x86
+ default
+
+
+
+ 15
+ Intel x86 Atom System Image
+ 4
+
+
+
+ 115324561
+ e45c728b64881c0e86529a8f7ea9c103a3cd14c1
+ x86-15_r04.zip
+
+
+
+ x86
+ default
+
+
+
+ 16
+ Intel x86 Atom System Image
+ 5
+
+
+
+ 134339698
+ 7ea16da3a8fdb880b1b290190fcc1bde2821c1e0
+ x86-16_r05.zip
+
+
+
+ x86
+ default
+
+
+
+ 17
+ Intel x86 Atom System Image
3
-
- 66997702
- 6b8539eaca9685d2d3289bf8e6d21d366d791326
- sysimg_x86-10_r03.zip
+
+ 142951842
+ eb30274460ff0d61f3ed37862b567811bebd8270
+ x86-17_r03.zip
@@ -660,67 +729,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
default
-
- 15
- Intel x86 Atom System Image
- 2
-
-
-
- 109019058
- 56b8d4b3d0f6a8876bc78d654da186f3b7b7c44f
- sysimg_x86-15_r02.zip
-
-
-
- x86
- default
-
-
-
- 16
- Intel x86 Atom System Image
- 2
-
-
-
- 135252264
- 36c2a2e394bcb3290583ce09815eae7711d0b2c2
- sysimg_x86-16_r02.zip
-
-
-
- x86
- default
-
-
-
- 17
- Intel x86 Atom System Image
- 2
-
-
-
- 136075512
- bd8c7c5411431af7e051cbe961be430fc31e773d
- sysimg_x86-17_r02.zip
-
-
-
- x86
- default
-
-
-
+
18
Intel x86 Atom System Image
- 2
+ 3
-
- 143899902
- ab3de121a44fca43ac3aa83f7d68cc47fc643ee8
- sysimg_x86-18_r02.zip
+
+ 149657535
+ 03a0cb23465c3de15215934a1dbc9715b56e9458
+ x86-18_r03.zip
@@ -728,16 +746,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
default
-
+
19
Intel x86 Atom System Image
5
-
- 183946064
- c9298a8eafceed3b8fa11071ba63a3d18e17fd8e
- sysimg_x86-19_r05.zip
+
+ 183968605
+ 1d98426467580abfd03c724c5344450f5d0df379
+ x86-19_r05.zip
@@ -745,16 +763,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
default
-
+
21
Intel x86 Atom System Image
4
-
- 206323409
- 3b78ad294aa1cdefa4be663d4af6c80d920ec49e
- sysimg_x86-21_r04.zip
+
+ 206305926
+ c7732f45c931c0eaa064e57e8c054bce86c30e54
+ x86-21_r04.zip
@@ -762,16 +780,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
default
-
+
22
Intel x86 Atom System Image
5
-
- 212301282
- 909e0ad91ed43381597e82f65ec93d41f049dd53
- sysimg_x86-22_r05.zip
+
+ 212327460
+ 7e2c93891ea9efec07dccccf6b9ab051a014dbdf
+ x86-22_r05.zip
@@ -779,16 +797,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
default
-
+
23
Intel x86 Atom System Image
9
-
- 252059065
- 0ce9229974818179833899dce93f228a895ec6a2
- sysimg_x86-23_r09.zip
+
+ 260241399
+ d7ee1118a73eb5c3e803d4dd3b96a124ac909ee1
+ x86-23_r09.zip
@@ -813,16 +831,34 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
default
-
+
+ 25
+ Google APIs Intel x86 Atom System Image
+ 3
+
+
+
+ 703131759
+ 7dd19cfee4e43a1f60e0f5f058404d92d9544b33
+ x86-25_r03.zip
+
+
+
+ x86
+ google_apis
+ Google APIs
+
+
+
21
Intel x86 Atom_64 System Image
4
-
- 290590059
- eb14ba9c14615d5e5a21c854be29aa903d9bb63d
- sysimg_x86_64-21_r04.zip
+
+ 290608820
+ 9b2d64a69a72fa596c386899a742a404308f2c92
+ x86_64-21_r04.zip
@@ -830,16 +866,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
default
-
+
22
Intel x86 Atom_64 System Image
5
-
- 297851141
- 8a04ff4fb30f70414e6ec7b3b06285f316e93d08
- sysimg_x86_64-22_r05.zip
+
+ 297850561
+ 99d1d6c77e92284b4210640edf6c81eceb28520d
+ x86_64-22_r05.zip
@@ -847,16 +883,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
default
-
+
23
Intel x86 Atom_64 System Image
9
-
- 349443901
- 571f5078a3d337a9144e2af13bd23ca46845a979
- sysimg_x86_64-23_r09.zip
+
+ 363794271
+ 84cc076eacec043c8e88382c6ab391b0cd5c0695
+ x86_64-23_r09.zip
@@ -880,4 +916,22 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
x86_64
default
+
+
+ 25
+ Google APIs Intel x86 Atom_64 System Image
+ 3
+
+
+
+ 912938750
+ 4593ee04811df21c339f3374fc5917843db06f8d
+ x86_64-25_r03.zip
+
+
+
+ x86_64
+ google_apis
+ Google APIs
+
diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix
index 2c8e1b33a46..89c48e5fb59 100644
--- a/pkgs/development/mobile/androidenv/sysimages.nix
+++ b/pkgs/development/mobile/androidenv/sysimages.nix
@@ -15,11 +15,19 @@ let
in
{
+ sysimg_armeabi-v7a_10 = buildSystemImage {
+ name = "sysimg-armeabi-v7a-10";
+ src = fetchurl {
+ url = https://dl.google.com/android/repository/sys-img/android/armv7-10_r04.zip;
+ sha1 = "54680383118eb5c95a11e1cc2a14aa572c86ee69";
+ };
+ };
+
sysimg_x86_10 = buildSystemImage {
name = "sysimg-x86-10";
src = fetchurl {
- url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-10_r03.zip;
- sha1 = "6b8539eaca9685d2d3289bf8e6d21d366d791326";
+ url = https://dl.google.com/android/repository/sys-img/android/x86-10_r04.zip;
+ sha1 = "655ffc5cc89dd45a3aca154b254009016e473aeb";
};
};
@@ -34,8 +42,8 @@ in
sysimg_armeabi-v7a_15 = buildSystemImage {
name = "sysimg-armeabi-v7a-15";
src = fetchurl {
- url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-15_r03.zip;
- sha1 = "0a47f586e172b1cf3db2ada857a70c2bdec24ef8";
+ url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r04.zip;
+ sha1 = "363223bd62f5afc0b2bd760b54ce9d26b31eacf1";
};
};
@@ -50,8 +58,8 @@ in
sysimg_x86_15 = buildSystemImage {
name = "sysimg-x86-15";
src = fetchurl {
- url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-15_r02.zip;
- sha1 = "56b8d4b3d0f6a8876bc78d654da186f3b7b7c44f";
+ url = https://dl.google.com/android/repository/sys-img/android/x86-15_r04.zip;
+ sha1 = "e45c728b64881c0e86529a8f7ea9c103a3cd14c1";
};
};
@@ -74,16 +82,16 @@ in
sysimg_x86_16 = buildSystemImage {
name = "sysimg-x86-16";
src = fetchurl {
- url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-16_r02.zip;
- sha1 = "36c2a2e394bcb3290583ce09815eae7711d0b2c2";
+ url = https://dl.google.com/android/repository/sys-img/android/x86-16_r05.zip;
+ sha1 = "7ea16da3a8fdb880b1b290190fcc1bde2821c1e0";
};
};
sysimg_armeabi-v7a_17 = buildSystemImage {
name = "sysimg-armeabi-v7a-17";
src = fetchurl {
- url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-17_r03.zip;
- sha1 = "97cfad22b51c8475e228b207dd36dbef1c18fa38";
+ url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r05.zip;
+ sha1 = "7460e8110f4a87f9644f1bdb5511a66872d50fd9";
};
};
@@ -98,112 +106,112 @@ in
sysimg_x86_17 = buildSystemImage {
name = "sysimg-x86-17";
src = fetchurl {
- url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-17_r02.zip;
- sha1 = "bd8c7c5411431af7e051cbe961be430fc31e773d";
+ url = https://dl.google.com/android/repository/sys-img/android/x86-17_r03.zip;
+ sha1 = "eb30274460ff0d61f3ed37862b567811bebd8270";
};
};
sysimg_armeabi-v7a_18 = buildSystemImage {
name = "sysimg-armeabi-v7a-18";
src = fetchurl {
- url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-18_r03.zip;
- sha1 = "2d7d51f4d2742744766511e5d6b491bd49161c51";
+ url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r04.zip;
+ sha1 = "0bf34ecf4ddd53f6b1b7fe7dfa12f2887c17e642";
};
};
sysimg_x86_18 = buildSystemImage {
name = "sysimg-x86-18";
src = fetchurl {
- url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-18_r02.zip;
- sha1 = "ab3de121a44fca43ac3aa83f7d68cc47fc643ee8";
+ url = https://dl.google.com/android/repository/sys-img/android/x86-18_r03.zip;
+ sha1 = "03a0cb23465c3de15215934a1dbc9715b56e9458";
};
};
sysimg_armeabi-v7a_19 = buildSystemImage {
name = "sysimg-armeabi-v7a-19";
src = fetchurl {
- url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-19_r03.zip;
- sha1 = "5daf7718e3ab03d9bd8792b492dd305f386ef12f";
+ url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip;
+ sha1 = "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa";
};
};
sysimg_x86_19 = buildSystemImage {
name = "sysimg-x86-19";
src = fetchurl {
- url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-19_r05.zip;
- sha1 = "c9298a8eafceed3b8fa11071ba63a3d18e17fd8e";
+ url = https://dl.google.com/android/repository/sys-img/android/x86-19_r05.zip;
+ sha1 = "1d98426467580abfd03c724c5344450f5d0df379";
};
};
sysimg_armeabi-v7a_21 = buildSystemImage {
name = "sysimg-armeabi-v7a-21";
src = fetchurl {
- url = https://dl.google.com/android/repository/sys-img/android/sysimg_arm-21_r03.zip;
- sha1 = "0b2e21421d29f48211b5289ca4addfa7f4c7ae5a";
+ url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip;
+ sha1 = "8c606f81306564b65e41303d2603e4c42ded0d10";
};
};
sysimg_x86_21 = buildSystemImage {
name = "sysimg-x86-21";
src = fetchurl {
- url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-21_r04.zip;
- sha1 = "3b78ad294aa1cdefa4be663d4af6c80d920ec49e";
+ url = https://dl.google.com/android/repository/sys-img/android/x86-21_r04.zip;
+ sha1 = "c7732f45c931c0eaa064e57e8c054bce86c30e54";
};
};
sysimg_x86_64_21 = buildSystemImage {
name = "sysimg-x86_64-21";
src = fetchurl {
- url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-21_r04.zip;
- sha1 = "eb14ba9c14615d5e5a21c854be29aa903d9bb63d";
+ url = https://dl.google.com/android/repository/sys-img/android/x86_64-21_r04.zip;
+ sha1 = "9b2d64a69a72fa596c386899a742a404308f2c92";
};
};
sysimg_armeabi-v7a_22 = buildSystemImage {
name = "sysimg-armeabi-v7a-22";
src = fetchurl {
- url = https://dl.google.com/android/repository/sys-img/android/sysimg_arm-22_r01.zip;
- sha1 = "2aa6a887ee75dcf3ac34627853d561997792fcb8";
+ url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip;
+ sha1 = "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1";
};
};
sysimg_x86_22 = buildSystemImage {
name = "sysimg-x86-22";
src = fetchurl {
- url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-22_r05.zip;
- sha1 = "909e0ad91ed43381597e82f65ec93d41f049dd53";
+ url = https://dl.google.com/android/repository/sys-img/android/x86-22_r05.zip;
+ sha1 = "7e2c93891ea9efec07dccccf6b9ab051a014dbdf";
};
};
sysimg_x86_64_22 = buildSystemImage {
name = "sysimg-x86_64-22";
src = fetchurl {
- url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-22_r05.zip;
- sha1 = "8a04ff4fb30f70414e6ec7b3b06285f316e93d08";
+ url = https://dl.google.com/android/repository/sys-img/android/x86_64-22_r05.zip;
+ sha1 = "99d1d6c77e92284b4210640edf6c81eceb28520d";
};
};
sysimg_armeabi-v7a_23 = buildSystemImage {
name = "sysimg-armeabi-v7a-23";
src = fetchurl {
- url = https://dl.google.com/android/repository/sys-img/android/sysimg_arm-23_r03.zip;
- sha1 = "7bb8768ec4333500192fd9627d4234f505fa98dc";
+ url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip;
+ sha1 = "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d";
};
};
sysimg_x86_23 = buildSystemImage {
name = "sysimg-x86-23";
src = fetchurl {
- url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-23_r09.zip;
- sha1 = "0ce9229974818179833899dce93f228a895ec6a2";
+ url = https://dl.google.com/android/repository/sys-img/android/x86-23_r09.zip;
+ sha1 = "d7ee1118a73eb5c3e803d4dd3b96a124ac909ee1";
};
};
sysimg_x86_64_23 = buildSystemImage {
name = "sysimg-x86_64-23";
src = fetchurl {
- url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-23_r09.zip;
- sha1 = "571f5078a3d337a9144e2af13bd23ca46845a979";
+ url = https://dl.google.com/android/repository/sys-img/android/x86_64-23_r09.zip;
+ sha1 = "84cc076eacec043c8e88382c6ab391b0cd5c0695";
};
};
@@ -238,4 +246,21 @@ in
sha1 = "a379932395ced0a8f572b39c396d86e08827a9ba";
};
};
+
+ sysimg_x86_25 = buildSystemImage {
+ name = "sysimg-x86-25";
+ src = fetchurl {
+ url = https://dl.google.com/android/repository/sys-img/android/x86-25_r03.zip;
+ sha1 = "7dd19cfee4e43a1f60e0f5f058404d92d9544b33";
+ };
+ };
+
+ sysimg_x86_64_25 = buildSystemImage {
+ name = "sysimg-x86_64-25";
+ src = fetchurl {
+ url = https://dl.google.com/android/repository/sys-img/android/x86_64-25_r03.zip;
+ sha1 = "4593ee04811df21c339f3374fc5917843db06f8d";
+ };
+ };
}
+
diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix
index f21c25a60f7..745111171bb 100644
--- a/pkgs/development/mobile/genymotion/default.nix
+++ b/pkgs/development/mobile/genymotion/default.nix
@@ -1,4 +1,5 @@
{ stdenv, requireFile, makeWrapper, which, zlib, mesa_noglu, glib, xorg, libxkbcommon
+, xdg_utils
# For glewinfo
, libXmu, libXi, libXext }:
@@ -10,24 +11,31 @@ let
in
stdenv.mkDerivation rec {
name = "genymotion-${version}";
- version = "2.7.2";
+ version = "2.8.0";
src = requireFile {
- url = https://www.genymotion.com/account/login/;
+ url = https://www.genymotion.com/download/;
name = "genymotion-${version}-linux_x64.bin";
- sha256 = "0j1dzry6wf6cw3yr318z81rmj79r6w5l6vpilm7m9h786jrgywa1";
+ sha256 = "0lvfdlpmmsyq2i9gs4mf6a8fxkfimdr4rhyihqnfhjij3fzxz4lk";
};
- buildInputs = [ makeWrapper which ];
+ buildInputs = [ makeWrapper which xdg_utils ];
unpackPhase = ''
+ mkdir -p phony-home $out/share/applications
+ export HOME=$TMP/phony-home
+
mkdir ${name}
echo "y" | sh $src -d ${name}
sourceRoot=${name}
+
+ substitute phony-home/.local/share/applications/genymobile-genymotion.desktop \
+ $out/share/applications/genymobile-genymotion.desktop --replace "$TMP/${name}" "$out/libexec"
'';
installPhase = ''
mkdir -p $out/bin $out/libexec
mv genymotion $out/libexec/
+ ln -s $out/libexec/genymotion/{genymotion,player} $out/bin
'';
fixupPhase = ''
@@ -38,7 +46,7 @@ stdenv.mkDerivation rec {
patchExecutable() {
patchInterpreter "$1"
- makeWrapper "$out/libexec/genymotion/$1" "$out/bin/$1" \
+ wrapProgram "$out/libexec/genymotion/$1" \
--set "LD_LIBRARY_PATH" "${libPath}"
}
@@ -67,7 +75,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://www.genymotion.com/;
license = stdenv.lib.licenses.unfree;
- platforms = stdenv.lib.platforms.linux;
+ platforms = ["x86_64-linux"];
maintainers = [ stdenv.lib.maintainers.puffnfresh ];
};
}
diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix
index 1c0f5f0626e..ad8c76b4e6e 100644
--- a/pkgs/development/node-packages/composition-v4.nix
+++ b/pkgs/development/node-packages/composition-v4.nix
@@ -6,11 +6,11 @@
let
nodeEnv = import ./node-env.nix {
- inherit (pkgs) stdenv python utillinux runCommand writeTextFile;
+ inherit (pkgs) stdenv utillinux runCommand writeTextFile;
inherit nodejs;
};
in
import ./node-packages-v4.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix
index 289a8ab1201..57bd88bd2a1 100644
--- a/pkgs/development/node-packages/composition-v6.nix
+++ b/pkgs/development/node-packages/composition-v6.nix
@@ -6,11 +6,11 @@
let
nodeEnv = import ./node-env.nix {
- inherit (pkgs) stdenv python utillinux runCommand writeTextFile;
+ inherit (pkgs) stdenv utillinux runCommand writeTextFile;
inherit nodejs;
};
in
import ./node-packages-v6.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index 5819fd1c2e7..414f60420af 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -1,24 +1,26 @@
# This file originates from node2nix
-{stdenv, python, nodejs, utillinux, runCommand, writeTextFile}:
+{stdenv, nodejs, utillinux, runCommand, writeTextFile}:
let
+ inherit (nodejs) python;
+
# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
tarWrapper = runCommand "tarWrapper" {} ''
mkdir -p $out/bin
-
+
cat > $out/bin/tar < package.json < ![\"Yarn\"](\"https://github.com/yarnpkg/assets/blob/master/yarn-kitten-full.png?raw=true\")
";
+ homepage = "https://github.com/yarnpkg/yarn#readme";
+ license = "BSD-2-Clause";
+ };
+ production = true;
+ };
}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index b2202168ef6..2132aff9dd0 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.17.0" = {
name = "moment";
packageName = "moment";
- version = "2.15.2";
+ version = "2.17.0";
src = fetchurl {
- url = "https://registry.npmjs.org/moment/-/moment-2.15.2.tgz";
- sha1 = "1bfdedf6a6e345f322fe956d5df5bd08a8ce84dc";
+ url = "https://registry.npmjs.org/moment/-/moment-2.17.0.tgz";
+ sha1 = "a4c292e02aac5ddefb29a6eed24f51938dd3b74f";
};
};
"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" = {
@@ -1129,193 +1129,40 @@ let
sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26";
};
};
- "xpath.js-1.0.6" = {
+ "xpath.js-1.0.7" = {
name = "xpath.js";
packageName = "xpath.js";
- version = "1.0.6";
+ version = "1.0.7";
src = fetchurl {
- url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.6.tgz";
- sha1 = "fe4b81c1b152ebd8e1395265fedc5b00fca29b90";
+ url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.7.tgz";
+ sha1 = "7e94627f541276cbc6a6b02b5d35e9418565b3e4";
};
};
- "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" = {
@@ -2011,22 +1894,22 @@ let
sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
};
};
- "async-2.1.2" = {
+ "async-2.1.4" = {
name = "async";
packageName = "async";
- version = "2.1.2";
+ version = "2.1.4";
src = fetchurl {
- url = "https://registry.npmjs.org/async/-/async-2.1.2.tgz";
- sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385";
+ url = "https://registry.npmjs.org/async/-/async-2.1.4.tgz";
+ sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4";
};
};
- "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.11" = {
name = "graceful-fs";
packageName = "graceful-fs";
- version = "4.1.9";
+ version = "4.1.11";
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.11.tgz";
+ sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
};
};
"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" = {
@@ -3217,13 +3163,13 @@ let
sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
};
};
- "browser-pack-6.0.1" = {
+ "browser-pack-6.0.2" = {
name = "browser-pack";
packageName = "browser-pack";
- version = "6.0.1";
+ version = "6.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.1.tgz";
- sha1 = "779887c792eaa1f64a46a22c8f1051cdcd96755f";
+ url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.2.tgz";
+ sha1 = "f86cd6cef4f5300c8e63e07a4d512f65fbff4531";
};
};
"browser-resolve-1.11.2" = {
@@ -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";
@@ -4504,13 +4450,13 @@ let
sha1 = "a400225438cacb67cd6108e8e826d5920a705dcc";
};
};
- "numeral-1.5.3" = {
+ "numeral-1.5.5" = {
name = "numeral";
packageName = "numeral";
- version = "1.5.3";
+ version = "1.5.5";
src = fetchurl {
- url = "https://registry.npmjs.org/numeral/-/numeral-1.5.3.tgz";
- sha1 = "a4c3eba68239580509f818267c77243bce43ff62";
+ url = "https://registry.npmjs.org/numeral/-/numeral-1.5.5.tgz";
+ sha1 = "b7515d64533626124e9196cfc68c8fd5b2dee208";
};
};
"open-0.0.5" = {
@@ -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" = {
@@ -9431,13 +9440,13 @@ let
sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d";
};
};
- "prettyjson-1.1.3" = {
+ "prettyjson-1.2.0" = {
name = "prettyjson";
packageName = "prettyjson";
- version = "1.1.3";
+ version = "1.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.1.3.tgz";
- sha1 = "d0787f732c9c3a566f4165fa4f1176fd67e6b263";
+ url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.0.tgz";
+ sha1 = "2a109cdf14c957896bbad8b77ef5de5db2c691bf";
};
};
"shush-1.0.0" = {
@@ -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.13" = {
name = "buffer-crc32";
packageName = "buffer-crc32";
- version = "0.2.5";
+ version = "0.2.13";
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.13.tgz";
+ sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242";
};
};
"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" = {
@@ -16029,13 +16681,13 @@ let
sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
};
};
- "commoner-0.10.4" = {
+ "commoner-0.10.8" = {
name = "commoner";
packageName = "commoner";
- version = "0.10.4";
+ version = "0.10.8";
src = fetchurl {
- url = "https://registry.npmjs.org/commoner/-/commoner-0.10.4.tgz";
- sha1 = "98f3333dd3ad399596bb2d384a783bb7213d68f8";
+ url = "https://registry.npmjs.org/commoner/-/commoner-0.10.8.tgz";
+ sha1 = "34fc3672cd24393e8bb47e70caa0293811f4f2c5";
};
};
"jstransform-10.1.0" = {
@@ -16047,6 +16699,15 @@ let
sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a";
};
};
+ "iconv-lite-0.4.15" = {
+ name = "iconv-lite";
+ packageName = "iconv-lite";
+ version = "0.4.15";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz";
+ sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb";
+ };
+ };
"private-0.1.6" = {
name = "private";
packageName = "private";
@@ -16056,31 +16717,31 @@ let
sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1";
};
};
- "recast-0.10.43" = {
+ "recast-0.11.17" = {
name = "recast";
packageName = "recast";
- version = "0.10.43";
+ version = "0.11.17";
src = fetchurl {
- url = "https://registry.npmjs.org/recast/-/recast-0.10.43.tgz";
- sha1 = "b95d50f6d60761a5f6252e15d80678168491ce7f";
+ url = "https://registry.npmjs.org/recast/-/recast-0.11.17.tgz";
+ sha1 = "67e829df49ef8ea822381cc516d305411e60bad8";
};
};
- "esprima-fb-15001.1001.0-dev-harmony-fb" = {
- name = "esprima-fb";
- packageName = "esprima-fb";
- version = "15001.1001.0-dev-harmony-fb";
- src = fetchurl {
- url = "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz";
- sha1 = "43beb57ec26e8cf237d3dd8b33e42533577f2659";
- };
- };
- "ast-types-0.8.15" = {
+ "ast-types-0.9.2" = {
name = "ast-types";
packageName = "ast-types";
- version = "0.8.15";
+ version = "0.9.2";
src = fetchurl {
- url = "https://registry.npmjs.org/ast-types/-/ast-types-0.8.15.tgz";
- sha1 = "8eef0827f04dff0ec8857ba925abe3fea6194e52";
+ url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.2.tgz";
+ sha1 = "2cc19979d15c655108bf565323b8e7ee38751f6b";
+ };
+ };
+ "esprima-3.1.1" = {
+ name = "esprima";
+ packageName = "esprima";
+ version = "3.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/esprima/-/esprima-3.1.1.tgz";
+ sha1 = "02dbcc5ac3ece81070377f99158ec742ab5dda06";
};
};
"base62-0.1.1" = {
@@ -16390,15 +17051,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 +17195,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 +17609,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";
@@ -17029,6 +17645,15 @@ let
sha1 = "a8a93e0bfb7581ac199c4f001a5525a724ce696d";
};
};
+ "async-2.1.2" = {
+ name = "async";
+ packageName = "async";
+ version = "2.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/async/-/async-2.1.2.tgz";
+ sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385";
+ };
+ };
"fields-0.1.24" = {
name = "fields";
packageName = "fields";
@@ -17047,31 +17672,31 @@ 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" = {
+ "moment-2.16.0" = {
+ name = "moment";
+ packageName = "moment";
+ version = "2.16.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz";
+ sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e";
+ };
+ };
+ "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 +17708,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 +17753,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 +17825,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 +17906,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 +18014,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 +18194,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 +18383,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 +18392,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 +18401,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 +18437,15 @@ let
sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d";
};
};
+ "tmp-0.0.31" = {
+ name = "tmp";
+ packageName = "tmp";
+ version = "0.0.31";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz";
+ sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7";
+ };
+ };
"follow-redirects-0.0.3" = {
name = "follow-redirects";
packageName = "follow-redirects";
@@ -18109,6 +18671,150 @@ let
sha1 = "e1e6f94f0b40c4d28dcf8f5b8766e0e45636877f";
};
};
+ "babel-runtime-6.18.0" = {
+ name = "babel-runtime";
+ packageName = "babel-runtime";
+ version = "6.18.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.18.0.tgz";
+ sha1 = "0f4177ffd98492ef13b9f823e9994a02584c9078";
+ };
+ };
+ "death-1.0.0" = {
+ name = "death";
+ packageName = "death";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/death/-/death-1.0.0.tgz";
+ sha1 = "4d46e15488d4b636b699f0671b04632d752fd2de";
+ };
+ };
+ "detect-indent-4.0.0" = {
+ name = "detect-indent";
+ packageName = "detect-indent";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz";
+ sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208";
+ };
+ };
+ "invariant-2.2.2" = {
+ name = "invariant";
+ packageName = "invariant";
+ version = "2.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz";
+ sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360";
+ };
+ };
+ "is-ci-1.0.10" = {
+ name = "is-ci";
+ packageName = "is-ci";
+ version = "1.0.10";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz";
+ sha1 = "f739336b2632365061a9d48270cd56ae3369318e";
+ };
+ };
+ "leven-2.0.0" = {
+ name = "leven";
+ packageName = "leven";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/leven/-/leven-2.0.0.tgz";
+ sha1 = "74c45744439550da185801912829f61d22071bc1";
+ };
+ };
+ "node-emoji-1.4.1" = {
+ name = "node-emoji";
+ packageName = "node-emoji";
+ version = "1.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.4.1.tgz";
+ sha1 = "c9fa0cf91094335bcb967a6f42b2305c15af2ebc";
+ };
+ };
+ "object-path-0.11.3" = {
+ name = "object-path";
+ packageName = "object-path";
+ version = "0.11.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object-path/-/object-path-0.11.3.tgz";
+ sha1 = "3e21a42ad07234d815429ae9e15c1c5f38050554";
+ };
+ };
+ "proper-lockfile-1.2.0" = {
+ name = "proper-lockfile";
+ packageName = "proper-lockfile";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-1.2.0.tgz";
+ sha1 = "ceff5dd89d3e5f10fb75e1e8e76bc75801a59c34";
+ };
+ };
+ "request-capture-har-1.1.4" = {
+ name = "request-capture-har";
+ packageName = "request-capture-har";
+ version = "1.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.1.4.tgz";
+ sha1 = "e6ad76eb8e7a1714553fdbeef32cd4518e4e2013";
+ };
+ };
+ "roadrunner-1.1.0" = {
+ name = "roadrunner";
+ packageName = "roadrunner";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/roadrunner/-/roadrunner-1.1.0.tgz";
+ sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e";
+ };
+ };
+ "regenerator-runtime-0.9.6" = {
+ name = "regenerator-runtime";
+ packageName = "regenerator-runtime";
+ version = "0.9.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz";
+ sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029";
+ };
+ };
+ "loose-envify-1.3.0" = {
+ name = "loose-envify";
+ packageName = "loose-envify";
+ version = "1.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.0.tgz";
+ sha1 = "6b26248c42f6d4fa4b0d8542f78edfcde35642a8";
+ };
+ };
+ "ci-info-1.0.0" = {
+ name = "ci-info";
+ packageName = "ci-info";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz";
+ sha1 = "dc5285f2b4e251821683681c381c3388f46ec534";
+ };
+ };
+ "string.prototype.codepointat-0.2.0" = {
+ name = "string.prototype.codepointat";
+ packageName = "string.prototype.codepointat";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz";
+ sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78";
+ };
+ };
+ "err-code-1.1.1" = {
+ name = "err-code";
+ packageName = "err-code";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/err-code/-/err-code-1.1.1.tgz";
+ sha1 = "739d71b6851f24d050ea18c79a5b722420771d59";
+ };
+ };
};
in
{
@@ -18149,7 +18855,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 +18871,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 +18890,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 +18910,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 +18956,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 +18980,7 @@ in
sources."streamline-0.4.11"
];
})
- sources."moment-2.15.2"
+ sources."moment-2.17.0"
sources."ms-rest-1.15.2"
(sources."ms-rest-azure-1.15.2" // {
dependencies = [
@@ -18299,7 +19004,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 +19040,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."xpath.js-1.0.7"
+ 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 +19057,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 +19092,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 +19113,6 @@ in
(sources."bl-1.1.2" // {
dependencies = [
sources."readable-stream-2.0.6"
- sources."isarray-1.0.0"
];
})
sources."caseless-0.11.0"
@@ -18431,7 +19120,7 @@ in
sources."forever-agent-0.6.1"
(sources."form-data-1.0.1" // {
dependencies = [
- sources."async-2.1.2"
+ sources."async-2.1.4"
];
})
(sources."har-validator-2.0.6" // {
@@ -18446,14 +19135,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 +19186,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 +19218,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 +19241,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.11"
];
})
sources."lodash-4.2.1"
@@ -18586,11 +19281,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 +19322,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.11"
];
})
(sources."path-type-1.1.0" // {
dependencies = [
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.11"
];
})
sources."parse-json-2.2.0"
@@ -18652,12 +19347,12 @@ in
sources."natives-1.1.0"
(sources."jsonfile-2.4.0" // {
dependencies = [
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.11"
];
})
(sources."klaw-1.3.1" // {
dependencies = [
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.11"
];
})
sources."path-is-absolute-1.0.1"
@@ -18673,13 +19368,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;
@@ -18701,7 +19396,7 @@ in
dependencies = [
sources."JSONStream-1.2.1"
sources."assert-1.3.0"
- sources."browser-pack-6.0.1"
+ sources."browser-pack-6.0.2"
sources."browser-resolve-1.11.2"
sources."browserify-zlib-0.1.4"
sources."buffer-4.9.1"
@@ -18738,12 +19433,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 +19504,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 +19563,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 +19602,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 +19631,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 +19665,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.11"
sources."parse-json-2.2.0"
sources."pify-2.3.0"
sources."strip-bom-2.0.0"
@@ -18986,7 +19681,7 @@ in
sources."clivas-0.1.4"
sources."inquirer-0.8.5"
sources."network-address-0.0.5"
- sources."numeral-1.5.3"
+ sources."numeral-1.5.5"
sources."open-0.0.5"
(sources."optimist-0.6.1" // {
dependencies = [
@@ -19020,13 +19715,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 +19739,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 +19786,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 +19836,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 +19893,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 +19949,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 +19968,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 +20019,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"
];
})
@@ -19381,7 +20078,7 @@ in
sources."browserify-13.1.0"
sources."JSONStream-1.2.1"
sources."assert-1.3.0"
- sources."browser-pack-6.0.1"
+ sources."browser-pack-6.0.2"
sources."browser-resolve-1.11.2"
sources."browserify-zlib-0.1.4"
(sources."buffer-4.9.1" // {
@@ -19417,7 +20114,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 +20122,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 +20185,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 +20224,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 +20253,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 +20279,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.11"
sources."jju-1.3.0"
sources."is-builtin-module-1.0.0"
sources."builtin-modules-1.1.1"
@@ -19633,7 +20326,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 +20347,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 +20371,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 +20440,10 @@ in
sources."isarray-1.0.0"
];
})
- (sources."async-2.1.2" // {
+ sources."node-uuid-1.4.7"
+ (sources."async-2.1.4" // {
dependencies = [
- sources."lodash-4.16.4"
+ sources."lodash-4.17.2"
];
})
sources."isexe-1.1.2"
@@ -19762,12 +20456,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 +20480,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 +20624,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 +20650,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 +20695,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 +20752,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 +20776,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 +20787,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 +20846,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 +20857,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 +20920,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 +20941,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 +20960,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 +20999,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.11"
sources."parse-json-2.2.0"
sources."pify-2.3.0"
sources."strip-bom-2.0.0"
@@ -20327,16 +21024,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 +21041,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 +21084,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 +21108,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.11"
sources."write-0.2.1"
sources."globby-5.0.0"
sources."is-path-cwd-1.0.0"
@@ -20445,7 +21142,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 +21168,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 +21208,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 +21225,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 +21243,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"
@@ -20557,7 +21254,7 @@ in
sources."object-assign-3.0.0"
sources."optimist-0.6.1"
sources."path-is-absolute-1.0.1"
- (sources."prettyjson-1.1.3" // {
+ (sources."prettyjson-1.2.0" // {
dependencies = [
sources."colors-1.1.2"
sources."minimist-1.2.0"
@@ -20591,7 +21288,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 +21296,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 +21332,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.11"
+ 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 +21348,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 +21381,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 +21394,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 +21455,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 +21465,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 +21569,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 +21599,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 +21634,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 +21660,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 +21683,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 +21734,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.11"
sources."parse-json-2.2.0"
sources."pify-2.3.0"
sources."strip-bom-2.0.0"
@@ -21142,7 +21828,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 +22005,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 +22020,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 +22031,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 +22186,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 +22219,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 +22235,7 @@ in
];
})
sources."glob-7.1.1"
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.11"
sources."http-proxy-1.15.2"
sources."isbinaryfile-3.0.1"
sources."lodash-3.10.1"
@@ -21574,21 +22260,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 +22282,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 +22317,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 +22328,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 +22361,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 +22374,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 +22601,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 +22613,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 +22636,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 +22649,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 +22684,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 +22724,7 @@ in
sources."isarray-0.0.1"
];
})
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.11"
sources."gulp-sourcemaps-1.6.0"
sources."is-valid-glob-0.3.0"
sources."lazystream-1.0.0"
@@ -22211,7 +22911,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.11"
sources."mkdirp-0.5.1"
sources."normalize-package-data-2.3.5"
(sources."npm-package-arg-4.2.0" // {
@@ -22220,7 +22920,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 +22948,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 +23011,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 +23033,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 +23077,18 @@ in
dependencies = [
sources."fstream-1.0.10"
sources."glob-7.1.1"
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.11"
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 +23105,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 +23120,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 +23139,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 +23200,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 +23224,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 +23277,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 +23305,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.11"
sources."parse-json-2.2.0"
sources."pify-2.3.0"
sources."strip-bom-2.0.0"
@@ -22613,7 +23318,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 +23329,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 +23344,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 +23388,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 +23397,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 +23423,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 +23432,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 +23523,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 +23562,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 +23575,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 +23636,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 +23650,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.11"
sources."debug-2.2.0"
sources."fstream-ignore-1.0.5"
sources."uid-number-0.0.6"
@@ -22955,7 +23674,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 +23699,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 +23734,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.11"
+ 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 +23746,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 +23778,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 +23791,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 +23852,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 +23886,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 +23898,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 +23983,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 +24003,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 +24041,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 +24051,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.17.0"
sources."accepts-1.3.3"
sources."array-flatten-1.1.1"
sources."content-disposition-0.5.1"
@@ -23349,7 +24077,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.11"
sources."jsonfile-2.4.0"
sources."klaw-1.3.1"
sources."path-is-absolute-1.0.1"
@@ -23365,7 +24093,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 +24121,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 +24253,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"
@@ -23548,7 +24276,7 @@ in
sources."forever-agent-0.6.1"
(sources."form-data-1.0.1" // {
dependencies = [
- sources."async-2.1.2"
+ sources."async-2.1.4"
];
})
sources."har-validator-2.0.6"
@@ -23649,17 +24377,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 +24404,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 +24425,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 +24497,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.13"
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 +24556,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 +24576,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 +24600,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.11"
sources."has-unicode-2.0.1"
sources."hosted-git-info-2.1.5"
sources."iferr-0.1.5"
@@ -23882,6 +24618,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 +24631,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 +24657,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 +24679,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 +24693,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 +24709,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 +24755,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 +24776,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 +24808,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 +24840,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 +24899,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 +24907,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 +24977,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 +24992,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 +25009,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 +25066,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 +25108,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.11"
sources."has-unicode-2.0.1"
sources."hosted-git-info-2.1.5"
sources."iferr-0.1.5"
@@ -24376,7 +25144,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 +25177,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 +25216,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 +25262,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 +25307,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 +25334,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 +25346,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 +25369,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.11"
+ (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.17.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,15 +25731,15 @@ 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"
sources."mime-1.3.4"
sources."network-address-1.1.0"
- sources."numeral-1.5.3"
+ sources."numeral-1.5.5"
sources."open-0.0.5"
(sources."optimist-0.6.1" // {
dependencies = [
@@ -24657,7 +25779,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 +25808,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 +25817,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 +25850,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.11"
sources."parse-json-2.2.0"
sources."pify-2.3.0"
sources."strip-bom-2.0.0"
@@ -24759,7 +25882,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 +25956,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 +25981,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 +25994,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 +26012,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 +26149,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 +26235,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 +26250,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 +26276,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 +26303,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 +26319,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.11"
sources."jsonfile-2.4.0"
sources."klaw-1.3.1"
sources."path-is-absolute-1.0.1"
@@ -25164,7 +26342,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"
@@ -25178,9 +26356,9 @@ in
sources."isstream-0.1.2"
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."async-2.1.4"
+ 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" // {
@@ -25247,22 +26425,21 @@ in
sha1 = "da6ac7d4d7777a59a5e951cf46e72fd4b6b40a2c";
};
dependencies = [
- sources."commoner-0.10.4"
+ sources."commoner-0.10.8"
(sources."jstransform-10.1.0" // {
dependencies = [
- sources."esprima-fb-13001.1001.0-dev-harmony-fb"
sources."source-map-0.1.31"
];
})
sources."commander-2.9.0"
sources."detective-4.3.2"
sources."glob-5.0.15"
- sources."graceful-fs-4.1.9"
- sources."iconv-lite-0.4.13"
+ sources."graceful-fs-4.1.11"
+ sources."iconv-lite-0.4.15"
sources."mkdirp-0.5.1"
sources."private-0.1.6"
sources."q-1.4.1"
- sources."recast-0.10.43"
+ sources."recast-0.11.17"
sources."graceful-readlink-1.0.1"
sources."acorn-3.3.0"
sources."defined-1.0.0"
@@ -25276,11 +26453,12 @@ in
sources."balanced-match-0.4.2"
sources."concat-map-0.0.1"
sources."minimist-0.0.8"
- sources."esprima-fb-15001.1001.0-dev-harmony-fb"
+ sources."ast-types-0.9.2"
+ sources."esprima-3.1.1"
sources."source-map-0.5.6"
- sources."ast-types-0.8.15"
sources."base62-0.1.1"
- sources."amdefine-1.0.0"
+ sources."esprima-fb-13001.1001.0-dev-harmony-fb"
+ sources."amdefine-1.0.1"
];
buildInputs = globalBuildInputs;
meta = {
@@ -25340,7 +26518,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 +26534,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 +26553,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 +26564,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 +26618,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 +26672,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 +26687,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 +26696,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 +26750,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 +26770,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 +26783,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 +26845,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.17.0"
sources."nan-2.4.0"
sources."ncp-2.0.0"
sources."rimraf-2.4.5"
@@ -25694,7 +26871,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 +26880,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 +26928,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.11"
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 +27023,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 +27073,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 +27102,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 +27118,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 +27170,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 +27184,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 +27256,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 +27273,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 +27343,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 +27404,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 +27423,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 +27451,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 +27526,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 +27653,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 +27676,7 @@ in
sources."minimatch-3.0.3"
];
})
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.11"
sources."has-unicode-2.0.1"
sources."hosted-git-info-2.1.5"
sources."iferr-0.1.5"
@@ -26526,7 +27739,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 +27870,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 +27982,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 +28012,7 @@ in
sources."kew-0.7.0"
];
})
- sources."tmp-0.0.29"
+ sources."tmp-0.0.31"
sources."follow-redirects-0.0.3"
(sources."config-chain-1.1.11" // {
dependencies = [
@@ -26824,7 +28038,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 +28052,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.11"
sources."jsonfile-2.4.0"
sources."klaw-1.3.1"
sources."path-is-absolute-1.0.1"
@@ -26859,7 +28073,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"
@@ -26873,9 +28087,9 @@ in
sources."isstream-0.1.2"
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."async-2.1.4"
+ 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 +28194,18 @@ in
sources."source-map-0.4.4"
];
})
- sources."graceful-fs-4.1.9"
+ sources."graceful-fs-4.1.11"
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 +28283,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 +28322,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 +28351,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 +28364,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 +28428,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 +28441,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 = {
@@ -27252,4 +28467,219 @@ in
};
production = true;
};
+ yarn = nodeEnv.buildNodePackage {
+ name = "yarn";
+ packageName = "yarn";
+ version = "0.17.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yarn/-/yarn-0.17.8.tgz";
+ sha1 = "6a95d19aaeb891810618937db98a2080683cbbb4";
+ };
+ dependencies = [
+ sources."babel-runtime-6.18.0"
+ sources."bytes-2.4.0"
+ sources."camelcase-3.0.0"
+ sources."chalk-1.1.3"
+ sources."cmd-shim-2.0.2"
+ sources."commander-2.9.0"
+ sources."death-1.0.0"
+ sources."debug-2.3.3"
+ sources."defaults-1.0.3"
+ sources."detect-indent-4.0.0"
+ sources."diff-2.2.3"
+ sources."ini-1.3.4"
+ sources."inquirer-1.2.3"
+ sources."invariant-2.2.2"
+ sources."is-builtin-module-1.0.0"
+ sources."is-ci-1.0.10"
+ sources."leven-2.0.0"
+ sources."loud-rejection-1.6.0"
+ sources."minimatch-3.0.3"
+ sources."mkdirp-0.5.1"
+ sources."node-emoji-1.4.1"
+ sources."node-gyp-3.4.0"
+ sources."object-path-0.11.3"
+ sources."proper-lockfile-1.2.0"
+ sources."read-1.0.7"
+ sources."repeating-2.0.1"
+ sources."request-2.79.0"
+ sources."request-capture-har-1.1.4"
+ sources."rimraf-2.5.4"
+ sources."roadrunner-1.1.0"
+ sources."semver-5.3.0"
+ sources."strip-bom-2.0.0"
+ sources."tar-2.2.1"
+ sources."tar-stream-1.5.2"
+ sources."user-home-2.0.0"
+ sources."validate-npm-package-license-3.0.1"
+ sources."core-js-2.4.1"
+ sources."regenerator-runtime-0.9.6"
+ 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-fs-4.1.11"
+ sources."graceful-readlink-1.0.1"
+ sources."ms-0.7.2"
+ sources."clone-1.0.2"
+ sources."ansi-escapes-1.4.0"
+ sources."cli-cursor-1.0.2"
+ sources."cli-width-2.1.0"
+ sources."external-editor-1.1.1"
+ sources."figures-1.7.0"
+ sources."lodash-4.17.2"
+ sources."mute-stream-0.0.6"
+ sources."pinkie-promise-2.0.1"
+ sources."run-async-2.2.0"
+ sources."rx-4.1.0"
+ sources."string-width-1.0.2"
+ sources."through-2.3.8"
+ sources."restore-cursor-1.0.1"
+ sources."exit-hook-1.1.1"
+ sources."onetime-1.1.0"
+ sources."extend-3.0.0"
+ sources."spawn-sync-1.0.15"
+ sources."tmp-0.0.29"
+ sources."concat-stream-1.5.2"
+ sources."os-shim-0.1.3"
+ sources."inherits-2.0.3"
+ sources."typedarray-0.0.6"
+ sources."readable-stream-2.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-tmpdir-1.0.2"
+ sources."object-assign-4.1.0"
+ sources."pinkie-2.0.4"
+ sources."is-promise-2.1.0"
+ sources."code-point-at-1.1.0"
+ sources."is-fullwidth-code-point-1.0.0"
+ sources."number-is-nan-1.0.1"
+ sources."loose-envify-1.3.0"
+ sources."js-tokens-2.0.0"
+ sources."builtin-modules-1.1.1"
+ sources."ci-info-1.0.0"
+ sources."currently-unhandled-0.4.1"
+ sources."signal-exit-3.0.1"
+ sources."array-find-index-1.0.2"
+ sources."brace-expansion-1.1.6"
+ sources."balanced-match-0.4.2"
+ sources."concat-map-0.0.1"
+ sources."minimist-0.0.8"
+ sources."string.prototype.codepointat-0.2.0"
+ sources."fstream-1.0.10"
+ sources."glob-7.1.1"
+ sources."nopt-3.0.6"
+ sources."npmlog-3.1.2"
+ sources."osenv-0.1.3"
+ sources."path-array-1.0.1"
+ sources."which-1.2.12"
+ sources."fs.realpath-1.0.0"
+ sources."inflight-1.0.6"
+ sources."once-1.4.0"
+ sources."path-is-absolute-1.0.1"
+ sources."wrappy-1.0.2"
+ 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."set-blocking-2.0.0"
+ sources."delegates-1.0.0"
+ sources."aproba-1.0.4"
+ sources."has-color-0.1.7"
+ sources."has-unicode-2.0.1"
+ sources."wide-align-1.1.0"
+ sources."os-homedir-1.0.2"
+ sources."array-index-1.0.0"
+ sources."es6-symbol-3.1.0"
+ sources."d-0.1.1"
+ sources."es5-ext-0.10.12"
+ sources."es6-iterator-2.0.0"
+ sources."isexe-1.1.2"
+ sources."err-code-1.1.1"
+ sources."retry-0.10.0"
+ sources."is-finite-1.0.2"
+ sources."aws-sign2-0.6.0"
+ sources."aws4-1.5.0"
+ sources."caseless-0.11.0"
+ sources."combined-stream-1.0.5"
+ 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."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."is-my-json-valid-2.15.0"
+ 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."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."punycode-1.4.1"
+ sources."is-utf8-0.2.1"
+ sources."block-stream-0.0.9"
+ sources."bl-1.1.2"
+ (sources."end-of-stream-1.1.0" // {
+ dependencies = [
+ sources."once-1.3.3"
+ ];
+ })
+ sources."spdx-correct-1.0.2"
+ sources."spdx-expression-parse-1.0.4"
+ sources."spdx-license-ids-1.2.2"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "
";
+ homepage = "https://github.com/yarnpkg/yarn#readme";
+ license = "BSD-2-Clause";
+ };
+ production = true;
+ };
}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 9fc9dcf2d7b..8c1c9515926 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -62,4 +62,5 @@
, "webdrvr"
, "webpack"
, "wring"
+, "yarn"
]
diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix
index ddc710bc7ed..bf0ae24ff03 100644
--- a/pkgs/development/ocaml-modules/alcotest/default.nix
+++ b/pkgs/development/ocaml-modules/alcotest/default.nix
@@ -1,15 +1,21 @@
-{ stdenv, buildOcaml, fetchzip, cmdliner, stringext }:
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, opam, cmdliner, astring, fmt, result }:
-buildOcaml rec {
- name = "alcotest";
- version = "0.4.5";
+stdenv.mkDerivation rec {
+ name = "ocaml${ocaml.version}-alcotest-${version}";
+ version = "0.7.2";
src = fetchzip {
url = "https://github.com/mirage/alcotest/archive/${version}.tar.gz";
- sha256 = "1wcn9hkjf4cbnrz99w940qfjpi0lvd8v63yxwpnafkff871dwk6k";
+ sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md";
};
- propagatedBuildInputs = [ cmdliner stringext ];
+ buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
+
+ propagatedBuildInputs = [ cmdliner astring fmt result ];
+
+ inherit (topkg) buildPhase installPhase;
+
+ createFindlibDestdir = true;
meta = with stdenv.lib; {
homepage = https://github.com/mirage/alcotest;
diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
index 544db9e0d78..feeb94a5c46 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/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index 904a214c34f..d24c6174510 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest }:
-let version = "2.5.2"; in
+let version = "2.5.3"; in
stdenv.mkDerivation {
name = "ocaml-batteries-${version}";
src = fetchzip {
url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz";
- sha256 = "01v7sp8vsqlfrmpji5pkrsjl43r3q8hk1a4z4lmyy9y2i0fqwl07";
+ sha256 = "047v05qy0526ad52hzhfa0giczhyzbmw9fwsn6l319icq77ms6jh";
};
buildInputs = [ ocaml findlib ocamlbuild qtest ];
diff --git a/pkgs/development/ocaml-modules/camlimages/4.0.nix b/pkgs/development/ocaml-modules/camlimages/4.0.nix
index 4f47680dcec..0ec3a26d051 100644
--- a/pkgs/development/ocaml-modules/camlimages/4.0.nix
+++ b/pkgs/development/ocaml-modules/camlimages/4.0.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
+{ stdenv, fetchurl, omake, ocaml, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
let
pname = "camlimages";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4";
};
- buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ];
+ buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ];
propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ];
diff --git a/pkgs/development/ocaml-modules/camlimages/4.1.nix b/pkgs/development/ocaml-modules/camlimages/4.1.nix
index f98d149c482..77a252de52f 100644
--- a/pkgs/development/ocaml-modules/camlimages/4.1.nix
+++ b/pkgs/development/ocaml-modules/camlimages/4.1.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
+{stdenv, fetchurl, omake, ocaml, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
sha256 = "1ppddhfknpirj1vilm5dxgyp82kf7ahpvjmh7z75a1fnaqv3kpki";
};
- buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ];
+ buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ];
propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ];
diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix
index dcf3c8c13d7..5a22e37d821 100644
--- a/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/pkgs/development/ocaml-modules/cohttp/default.nix
@@ -1,22 +1,23 @@
-{stdenv, buildOcaml, fetchurl, cmdliner, re, uri, fieldslib_p4, sexplib_p4, conduit,
- stringext, base64, magic-mime, ounit, alcotest, lwt ? null,
- async ? null, async_ssl ? null}:
+{ stdenv, buildOcaml, fetchurl, ocaml, cmdliner, re, uri, fieldslib_p4
+, sexplib_p4, conduit , stringext, base64, magic-mime, ounit, alcotest
+, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
+, lwt ? null, async_p4 ? null, async_ssl_p4 ? null
+}:
buildOcaml rec {
name = "cohttp";
version = "0.19.3";
- minimumSupportedOcamlVersion = "4.02";
+ minimumSupportedOcamlVersion = "4.01";
src = fetchurl {
url = "https://github.com/mirage/ocaml-cohttp/archive/v${version}.tar.gz";
sha256 = "1nrzpd4h52c1hnzcgsz462676saj9zss708ng001h54dglk8i1iv";
};
- buildInputs = [ alcotest ];
- propagatedBuildInputs = [ cmdliner re uri fieldslib_p4 sexplib_p4 sexplib_p4
- conduit stringext base64 magic-mime ounit async
- async_ssl lwt ];
+ buildInputs = [ alcotest cmdliner conduit magic-mime ounit lwt ]
+ ++ stdenv.lib.optionals asyncSupport [ async_p4 async_ssl_p4 ];
+ propagatedBuildInputs = [ re stringext uri fieldslib_p4 sexplib_p4 base64 ];
buildFlags = "PREFIX=$(out)";
diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix
index 26accd99db6..afe44ea0a7f 100644
--- a/pkgs/development/ocaml-modules/conduit/default.nix
+++ b/pkgs/development/ocaml-modules/conduit/default.nix
@@ -1,5 +1,7 @@
-{stdenv, buildOcaml, fetchurl, sexplib_p4, stringext, uri, cstruct, ipaddr,
- async ? null, async_ssl ? null, lwt ? null}:
+{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri, cstruct, ipaddr
+, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
+, async_p4 ? null, async_ssl_p4 ? null, lwt ? null
+}:
buildOcaml rec {
name = "conduit";
@@ -10,10 +12,10 @@ buildOcaml rec {
sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1";
};
- propagatedBuildInputs = ([ sexplib_p4 stringext uri cstruct ipaddr ]
- ++ stdenv.lib.optional (lwt != null) lwt
- ++ stdenv.lib.optional (async != null) async
- ++ stdenv.lib.optional (async_ssl != null) async_ssl);
+ propagatedBuildInputs = [ sexplib_p4 stringext uri cstruct ipaddr ];
+ buildInputs = stdenv.lib.optional (lwt != null) lwt
+ ++ stdenv.lib.optional (asyncSupport && async_p4 != null) async_p4
+ ++ stdenv.lib.optional (asyncSupport && async_ssl_p4 != null) async_ssl_p4;
meta = with stdenv.lib; {
homepage = https://github.com/mirage/ocaml-conduit;
diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix
index 19d91e44dcd..2e56635f360 100644
--- a/pkgs/development/ocaml-modules/containers/default.nix
+++ b/pkgs/development/ocaml-modules/containers/default.nix
@@ -6,7 +6,7 @@ let
mkpath = p:
"${p}/lib/ocaml/${ocaml.version}/site-lib";
- version = "0.20";
+ version = "0.22";
in
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
owner = "c-cube";
repo = "ocaml-containers";
rev = "${version}";
- sha256 = "1gwflgdbvj293cwi434aafrsgpdgj2sv7r1ghm4l4k5xn17l0qzg";
+ sha256 = "1kbf865z484z9nxskmg150xhfspikkvsxk0wbry5vvczqr63cwhq";
};
buildInputs = [ ocaml findlib ocamlbuild cppo gen sequence qtest ounit ocaml_oasis qcheck ];
diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix
index c9f04918d17..8c1aac4d83b 100644
--- a/pkgs/development/ocaml-modules/cstruct/default.nix
+++ b/pkgs/development/ocaml-modules/cstruct/default.nix
@@ -1,20 +1,31 @@
-{stdenv, writeText, fetchurl, ocaml, ocplib-endian, sexplib_p4, findlib,
- async_p4 ? null, lwt ? null, camlp4}:
+{ stdenv, writeText, fetchFromGitHub, ocaml, ocplib-endian, sexplib, findlib, ppx_tools
+, async ? null, lwt ? null
+}:
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
+assert stdenv.lib.versionAtLeast ocaml.version "4.01";
+
+let param =
+ if stdenv.lib.versionAtLeast ocaml.version "4.02"
+ then { version = "2.3.0"; sha256 = "19spsgkry41dhsbm6ij71kws90bqp7wiggc6lsqdl43xxvbgdmys"; }
+ else { version = "1.9.0"; sha256 = "1c1j21zgmxi9spq23imy7byn50qr7hlds1cfpzxlsx9dp309jngy"; };
+in
+
+let opt = b: "--${if b != null then "en" else "dis"}able"; in
stdenv.mkDerivation {
- name = "ocaml-cstruct-1.6.0";
+ name = "ocaml${ocaml.version}-cstruct-${param.version}";
- src = fetchurl {
- url = https://github.com/mirage/ocaml-cstruct/archive/v1.6.0.tar.gz;
- sha256 = "0f90a1b7a03091cf22a3ccb11a0cce03b6500f064ad3766b5ed81418ac008ece";
+ src = fetchFromGitHub {
+ owner = "mirage";
+ repo = "ocaml-cstruct";
+ rev = "v${param.version}";
+ inherit (param) sha256;
};
- configureFlags = stdenv.lib.strings.concatStringsSep " " ((if lwt != null then ["--enable-lwt"] else []) ++
- (if async_p4 != null then ["--enable-async"] else []));
- buildInputs = [ocaml findlib camlp4];
- propagatedBuildInputs = [ocplib-endian sexplib_p4 lwt async_p4];
+ configureFlags = [ "${opt lwt}-lwt" "${opt async}-async" "${opt ppx_tools}-ppx" ];
+
+ 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 00000000000..a7290c8bb98
--- /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/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix
new file mode 100644
index 00000000000..9994d156a4c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/fmt/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, cmdliner }:
+
+stdenv.mkDerivation {
+ name = "ocaml${ocaml.version}-fmt-0.8.0";
+
+ src = fetchurl {
+ url = http://erratique.ch/software/fmt/releases/fmt-0.8.0.tbz;
+ sha256 = "16y7ibndnairb53j8a6qgipyqwjxncn4pl9jiw5bxjfjm59108px";
+ };
+
+ unpackCmd = "tar xjf $src";
+
+ buildInputs = [ ocaml findlib ocamlbuild opam topkg cmdliner ];
+
+ inherit (topkg) buildPhase installPhase;
+
+ createFindlibDestdir = true;
+
+ meta = {
+ homepage = http://erratique.ch/software/fmt;
+ license = stdenv.lib.licenses.isc;
+ description = "OCaml Format pretty-printer combinators";
+ inherit (ocaml.meta) platforms;
+ maintainers = [ stdenv.lib.maintainers.vbgl ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index 9eeed1285dc..d3a373ab4db 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -1,24 +1,27 @@
-{ stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }:
-
-let
- inherit (stdenv.lib) optional getVersion versionAtLeast;
-in
+{ stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4
+, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib
+, ppx_tools, result
+, ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
+}:
stdenv.mkDerivation rec {
name = "ocaml-lwt-${version}";
- version = "2.5.2";
+ version = "2.6.0";
src = fetchzip {
url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz";
- sha256 = "0gmhm282r8yi0gwcv0g2s7qchkfjmhqbqf4j9frlyv665ink9kxl";
+ sha256 = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w";
};
- buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 ppx_tools ];
+ buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 ]
+ ++ stdenv.lib.optional ppxSupport ppx_tools;
- propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text libev ];
+ propagatedBuildInputs = [ result ocaml_react ocaml_ssl libev ];
- configureFlags = [ "--enable-glib" "--enable-ssl" "--enable-react" "--enable-camlp4"]
- ++ [ (if versionAtLeast ocaml.version "4.02" then "--enable-ppx" else "--disable-ppx") ];
+ configureScript = "ocaml setup.ml -configure";
+ prefixKey = "--prefix ";
+ configureFlags = [ "--enable-glib" "--enable-ssl" "--enable-react" "--enable-camlp4" ]
+ ++ [ (if ppxSupport then "--enable-ppx" else "--disable-ppx") ];
createFindlibDestdir = true;
diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix
index 839a49615cd..9592e9a68d8 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 f8db935b612..d7f7ae0e365 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, 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 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 00000000000..3178789c399
--- /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/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix
new file mode 100644
index 00000000000..4ce3ac6dff3
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, ocaml, findlib }:
+
+let
+ pname = "ocplib-simplex";
+ version = "0.3";
+in
+
+stdenv.mkDerivation {
+ name = "ocaml${ocaml.version}-${pname}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "OCamlPro-Iguernlala";
+ repo = pname;
+ rev = version;
+ sha256 = "1fmz38w2cj9fny4adqqyil59dvndqkr59s7wk2gqs47r72b6sisa";
+ };
+
+ buildInputs = [ autoreconfHook ocaml findlib ];
+
+ createFindlibDestdir = true;
+
+ meta = {
+ description = "An OCaml library implementing a simplex algorithm, in a functional style, for solving systems of linear inequalities";
+ homepage = https://github.com/OCamlPro-Iguernlala/ocplib-simplex;
+ inherit (ocaml.meta) platforms;
+ license = stdenv.lib.licenses.lgpl21;
+ maintainers = [ stdenv.lib.maintainers.vbgl ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix
new file mode 100644
index 00000000000..dfee365cd75
--- /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/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix
index e25b17fb656..81b8c28b452 100644
--- a/pkgs/development/ocaml-modules/ssl/default.nix
+++ b/pkgs/development/ocaml-modules/ssl/default.nix
@@ -1,13 +1,12 @@
-{stdenv, fetchurl, which, openssl, ocaml, findlib}:
+{ stdenv, fetchzip, which, openssl, ocaml, findlib }:
stdenv.mkDerivation rec {
- name = "ocaml-ssl-${version}";
- version = "0.5.2";
+ name = "ocaml${ocaml.version}-ssl-${version}";
+ version = "0.5.3";
- src = fetchurl {
- url = "mirror://sourceforge/project/savonet/ocaml-ssl/0.5.2/ocaml-ssl-0.5.2.tar.gz";
-
- sha256 = "0341rm8aqrckmhag1lrqfnl17v6n4ci8ibda62ahkkn5cxd58cpp";
+ src = fetchzip {
+ url = "https://github.com/savonet/ocaml-ssl/releases/download/0.5.3/ocaml-ssl-${version}.tar.gz";
+ sha256 = "0h2k19zpdvq1gqwrmmgkibw4j48l71vv6ajzxs0wi71y80c1vhwm";
};
buildInputs = [which ocaml findlib];
diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix
new file mode 100644
index 00000000000..b38138c5573
--- /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/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix
index 1b1a127c536..23bcc267066 100644
--- a/pkgs/development/ocaml-modules/topkg/default.nix
+++ b/pkgs/development/ocaml-modules/topkg/default.nix
@@ -1,9 +1,7 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, result, opam }:
-let ocaml-version = stdenv.lib.getVersion ocaml; in
-
stdenv.mkDerivation rec {
- name = "ocaml${ocaml-version}-topkg-${version}";
+ name = "ocaml${ocaml.version}-topkg-${version}";
version = "0.7.8";
src = fetchurl {
@@ -16,12 +14,9 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ result ];
unpackCmd = "tar xjf ${src}";
- buildPhase = "ocaml -I ${findlib}/lib/ocaml/${ocaml-version}/site-lib/ pkg/pkg.ml build";
+ buildPhase = "ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build";
createFindlibDestdir = true;
- installPhase = ''
- opam-installer --script --prefix=$out topkg.install | sh
- mv $out/lib/topkg $out/lib/ocaml/${ocaml-version}/site-lib/
- '';
+ installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
meta = {
homepage = http://erratique.ch/software/topkg;
diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix
index 73a0ccdacfe..d44309b266a 100644
--- a/pkgs/development/ocaml-modules/uucd/default.nix
+++ b/pkgs/development/ocaml-modules/uucd/default.nix
@@ -19,13 +19,7 @@ stdenv.mkDerivation rec {
unpackCmd = "tar xjf $src";
- inherit (topkg) buildPhase;
-
- installPhase = ''
- opam-installer --script --prefix=$out ${pname}.install > install.sh
- sh install.sh
- ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/
- '';
+ inherit (topkg) buildPhase installPhase;
propagatedBuildInputs = [ xmlm ];
diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix
index 3c7a4ff5c58..92777129ca0 100644
--- a/pkgs/development/ocaml-modules/uuseg/default.nix
+++ b/pkgs/development/ocaml-modules/uuseg/default.nix
@@ -1,18 +1,16 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, uucp, uutf, cmdliner }:
+{ stdenv, buildOcaml, fetchurl, ocaml, findlib, ocamlbuild, opam, uucp, uutf, cmdliner }:
let
- inherit (stdenv.lib) getVersion versionAtLeast;
-
pname = "uuseg";
- version = "0.8.0";
webpage = "http://erratique.ch/software/${pname}";
in
-assert versionAtLeast (getVersion ocaml) "4.01";
+buildOcaml rec {
-stdenv.mkDerivation {
+ minimumSupportedOcamlVersion = "4.01";
- name = "ocaml-${pname}-${version}";
+ name = pname;
+ version = "0.9.0";
src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz";
@@ -34,7 +32,7 @@ stdenv.mkDerivation {
installPhase = ''
opam-installer --script --prefix=$out ${pname}.install | sh
- ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname}
+ ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/${pname}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix
index fda630114ed..a08e0ccbf74 100644
--- a/pkgs/development/ocaml-modules/uutf/default.nix
+++ b/pkgs/development/ocaml-modules/uutf/default.nix
@@ -1,32 +1,36 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }:
+{ stdenv, buildOcaml, fetchurl, ocaml, findlib, ocamlbuild, opam, cmdliner}:
let
pname = "uutf";
webpage = "http://erratique.ch/software/${pname}";
in
-assert stdenv.lib.versionAtLeast ocaml.version "3.12";
+buildOcaml rec {
+ name = pname;
+ version = "0.9.4";
-stdenv.mkDerivation rec {
- name = "ocaml-${pname}-${version}";
- version = "0.9.3";
+ minimumSupportedOcamlVersion = "4.00.0";
src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz";
- sha256 = "0xvq20knmq25902ijpbk91ax92bkymsqkbfklj1537hpn64lydhz";
+ sha256 = "1f71fyawxal42x6g82539bv0ava2smlar6rmxxz1cyq3l0i6fw0k";
};
- buildInputs = [ ocaml findlib ocamlbuild opam ];
+ buildInputs = [ ocaml findlib ocamlbuild opam cmdliner ];
createFindlibDestdir = true;
unpackCmd = "tar xjf $src";
- buildPhase = "./pkg/build true";
+ buildPhase = ''
+ ocaml pkg/build.ml \
+ native=true \
+ native-dynlink=true \
+ cmdliner=true
+ '';
installPhase = ''
- opam-installer --script --prefix=$out ${pname}.install > install.sh
- sh install.sh
- ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/
+ opam-installer --prefix=$out --script ${pname}.install | sh
+ ln -s $out/lib/uutf $out/lib/ocaml/${ocaml.version}/site-lib/
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix
index c44ccb18982..ab82f6abdcb 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/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix
index 14ed14e34af..7302516d542 100644
--- a/pkgs/development/perl-modules/DBD-mysql/default.nix
+++ b/pkgs/development/perl-modules/DBD-mysql/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, buildPerlPackage, DBI, mysql }:
buildPerlPackage rec {
- name = "DBD-mysql-4.033";
+ name = "DBD-mysql-4.041";
src = fetchurl {
- url = "mirror://cpan/authors/id/C/CA/CAPTTOFU/${name}.tar.gz";
- sha256 = "0769xakykps0cx368g4vaips4w3bjk383rianiavq7sq6g6bp66c";
+ url = "mirror://cpan/authors/id/M/MI/MICHIELB/${name}.tar.gz";
+ sha256 = "0h4h6zwzj8fwh9ljb8svnsa0a3ch4p10hp59kpdibdb4qh8xwxs7";
};
buildInputs = [ mysql.lib ] ;
diff --git a/pkgs/development/perl-modules/maatkit/default.nix b/pkgs/development/perl-modules/maatkit/default.nix
index e301bd1009f..fabb3824129 100644
--- a/pkgs/development/perl-modules/maatkit/default.nix
+++ b/pkgs/development/perl-modules/maatkit/default.nix
@@ -4,7 +4,7 @@ buildPerlPackage rec {
name = "maatkit-7540";
src = fetchurl {
- url = "http://maatkit.googlecode.com/files/${name}.tar.gz" ;
+ url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/maatkit/${name}.tar.gz";
sha256 = "1a7rxrddkrsfxb2wj01ha91ld0vapfkqcy8j9p08l76zz2l8p2v1";
};
diff --git a/pkgs/development/python-modules/theano/cuda/default.nix b/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix
similarity index 96%
rename from pkgs/development/python-modules/theano/cuda/default.nix
rename to pkgs/development/python-modules/Theano/theano-with-cuda/default.nix
index bf49d391861..c9ea79bef9a 100644
--- a/pkgs/development/python-modules/theano/cuda/default.nix
+++ b/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix
@@ -1,6 +1,5 @@
{ buildPythonPackage
, fetchFromGitHub
-, blas
, numpy
, six
, scipy
@@ -45,7 +44,7 @@ buildPythonPackage rec {
dontStrip = true;
propagatedBuildInputs = [
- blas
+ numpy.blas
numpy
six
scipy
@@ -59,4 +58,5 @@ buildPythonPackage rec {
libgpuarray
] ++ (stdenv.lib.optional (cudnn != null) [ cudnn ]);
+ passthru.cudaSupport = true;
}
diff --git a/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix b/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix
new file mode 100644
index 00000000000..6efa945b0e6
--- /dev/null
+++ b/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix
@@ -0,0 +1,44 @@
+{ stdenv
+, fetchurl
+, buildPythonPackage
+, isPyPy
+, pythonOlder
+, isPy3k
+, nose
+, numpy
+, pydot_ng
+, scipy
+, six
+}:
+
+buildPythonPackage rec {
+ name = "Theano-0.8.2";
+
+ disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3");
+
+ src = fetchurl {
+ url = "mirror://pypi/T/Theano/${name}.tar.gz";
+ sha256 = "7463c8f7ed1a787bf881f36d38a38607150186697e7ce7e78bfb94b7c6af8930";
+ };
+
+ #preCheck = ''
+ # mkdir -p check-phase
+ # export HOME=$(pwd)/check-phase
+ #'';
+ doCheck = false;
+ # takes far too long, also throws "TypeError: sort() missing 1 required positional argument: 'a'"
+ # when run from the installer, and testing with Python 3.5 hits github.com/Theano/Theano/issues/4276,
+ # the fix for which hasn't been merged yet.
+
+ # keep Nose around since running the tests by hand is possible from Python or bash
+ propagatedBuildInputs = [ stdenv nose numpy numpy.blas pydot_ng scipy six ];
+
+ meta = {
+ homepage = http://deeplearning.net/software/theano/;
+ description = "A Python library for large-scale array computation";
+ license = stdenv.lib.licenses.bsd3;
+ maintainers = [ stdenv.lib.maintainers.bcdarwin ];
+ };
+
+ passthru.cudaSupport = false;
+}
diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix
new file mode 100644
index 00000000000..d5009e9bccb
--- /dev/null
+++ b/pkgs/development/python-modules/async_timeout/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, fetchurl
+, buildPythonPackage
+, pytestrunner
+, pythonOlder
+}:
+
+let
+ pname = "async-timeout";
+ version = "1.1.0";
+in buildPythonPackage rec {
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+ sha256 = "b88bd1fe001b800ec23c7bf27a81b32819e2a56668e9fba5646a7f3618143081";
+ };
+
+ buildInputs = [ pytestrunner ];
+ # Circular dependency on aiohttp
+ doCheck = false;
+
+ disabled = pythonOlder "3.4";
+
+ meta = {
+ description = "Timeout context manager for asyncio programs";
+ homepage = https://github.com/aio-libs/async_timeout/;
+ license = lib.licenses.asl20;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
index a55e1993ac3..42a7401b09d 100644
--- a/pkgs/development/python-modules/blivet/default.nix
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -28,7 +28,6 @@ in buildPythonPackage rec {
}' blivet/formats/__init__.py
sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py
- sed -i -e '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py
'';
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 0fd6c1873b5..7c992921e94 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -6,8 +6,8 @@ let
sha256 = "ea8033fc9905804e652f75474d33410a07404c1a78dd3c949a66863bd1050ebd";
};
setuptools_source = fetchurl {
- url = "https://files.pythonhosted.org/packages/3b/c7/e9724e6f81c96248fba5876054418c11d327b3093d075790903cd66fad44/setuptools-26.1.1-py2.py3-none-any.whl";
- sha256 = "226c9ce65e76c6069e805982b036f36dc4b227b37dd87fc219aef721ec8604ae";
+ url = "https://files.pythonhosted.org/packages/b8/cb/b919f52dd81b4b2210d0c5529b6b629a4002e08d49a90183605d1181b10c/setuptools-30.2.0-py2.py3-none-any.whl";
+ sha256 = "b7e7b28d6a728ea38953d66e12ef400c3c153c523539f1b3997c5a42f3770ff1";
};
argparse_source = fetchurl {
url = "https://pypi.python.org/packages/2.7/a/argparse/argparse-1.4.0-py2.py3-none-any.whl";
@@ -15,11 +15,11 @@ let
};
in stdenv.mkDerivation rec {
name = "${python.libPrefix}-bootstrapped-pip-${version}";
- version = "8.1.2";
+ version = "9.0.1";
src = fetchurl {
- url = "https://pypi.python.org/packages/9c/32/004ce0852e0a127f07f358b715015763273799bd798956fa930814b60f39/pip-${version}-py2.py3-none-any.whl";
- sha256 = "18cjrd66mn4a0gwa99zzs89lrb0xn4xmajdzya6zqd7v16cdsr34";
+ url = "https://files.pythonhosted.org/packages/b6/ac/7015eb97dc749283ffdec1c3a88ddb8ae03b8fad0f0e611408f196358da3/pip-9.0.1-py2.py3-none-any.whl";
+ sha256 = "690b762c0a8460c303c089d5d0be034fb15a5ea2b75bdf565f40421f542fefb0";
};
unpackPhase = ''
diff --git a/pkgs/development/python-modules/cython_test.patch b/pkgs/development/python-modules/cython_test.patch
deleted file mode 100644
index 5b1cece3aa5..00000000000
--- a/pkgs/development/python-modules/cython_test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/tests/run/numpy_math.pyx b/tests/run/numpy_math.pyx
-index eafd23a..4a15522 100644
---- a/tests/run/numpy_math.pyx
-+++ b/tests/run/numpy_math.pyx
-@@ -37,8 +37,8 @@ def test_fp_classif():
- assert not npmath.isnan(d_zero)
- assert not npmath.isnan(f_zero)
-
-- assert npmath.isinf(npmath.INFINITY) == 1
-- assert npmath.isinf(-npmath.INFINITY) == -1
-+ assert npmath.isinf(npmath.INFINITY) != 0
-+ assert npmath.isinf(-npmath.INFINITY) != 0
- assert npmath.isnan(npmath.NAN)
-
- assert npmath.signbit(npmath.copysign(1., -1.))
diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix
new file mode 100644
index 00000000000..cf01ec835a7
--- /dev/null
+++ b/pkgs/development/python-modules/discordpy/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, fetchurl
+, buildPythonPackage
+, pythonOlder
+, withVoice ? true, libopus
+, asyncio
+, aiohttp
+, websockets
+, pynacl
+}:
+
+let
+ pname = "discord.py";
+ version = "0.15.1";
+in buildPythonPackage rec {
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+ sha256 = "01lgidvnwwva1i65853gaplamllym2nsk0jis2r6f1rzbamgk1yj";
+ };
+
+ propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ];
+ patchPhase = ''
+ substituteInPlace "requirements.txt" \
+ --replace "aiohttp>=1.0.0,<1.1.0" "aiohttp"
+ '' + lib.optionalString withVoice ''
+ substituteInPlace "discord/opus.py" \
+ --replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'"
+ '';
+
+ disabled = pythonOlder "3.5";
+
+ meta = {
+ description = "A python wrapper for the Discord API";
+ homepage = "https://discordpy.rtfd.org/";
+ license = lib.licenses.mit;
+ };
+}
diff --git a/pkgs/tools/package-management/koji/default.nix b/pkgs/development/python-modules/koji/default.nix
similarity index 72%
rename from pkgs/tools/package-management/koji/default.nix
rename to pkgs/development/python-modules/koji/default.nix
index 7d2022ee91b..262ea74d4a3 100644
--- a/pkgs/tools/package-management/koji/default.nix
+++ b/pkgs/development/python-modules/koji/default.nix
@@ -1,8 +1,6 @@
-{ stdenv, fetchurl, python2 }:
+{ stdenv, fetchurl, mkPythonDerivation, pycurl }:
-let
- pythonEnv = python2.withPackages(ps : [ps.pycurl]);
-in stdenv.mkDerivation rec {
+mkPythonDerivation rec {
name = "koji-1.8";
src = fetchurl {
@@ -10,11 +8,12 @@ in stdenv.mkDerivation rec {
sha256 = "10dph209h4jgajb5jmbjhqy4z4hd22i7s2d93vm3ikdf01i8iwf1";
};
- propagatedBuildInputs = [ pythonEnv ];
+ propagatedBuildInputs = [ pycurl ];
makeFlags = "DESTDIR=$(out)";
postInstall = ''
+ mv $out/usr/* $out/
cp -R $out/nix/store/*/* $out/
rm -rf $out/nix
'';
diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix
new file mode 100644
index 00000000000..65d5c95114d
--- /dev/null
+++ b/pkgs/development/python-modules/llvmlite/default.nix
@@ -0,0 +1,50 @@
+{ stdenv
+, fetchurl
+, buildPythonPackage
+, python
+, llvm
+, pythonOlder
+, isPyPy
+, enum34
+}:
+
+buildPythonPackage rec {
+ pname = "llvmlite";
+ name = "${pname}-${version}";
+ version = "0.14.0";
+
+ disabled = isPyPy;
+
+ src = fetchurl {
+ url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+ sha256 = "1ybgsmvamj0i51dvrn268ziczpm63y2h4sgagf6fkgkpydrr01g8";
+ };
+
+ propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
+
+ # Disable static linking
+ # https://github.com/numba/llvmlite/issues/93
+ patchPhase = ''
+ substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" ""
+
+ substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope"
+ '';
+ # Set directory containing llvm-config binary
+ preConfigure = ''
+ export LLVM_CONFIG=${llvm}/bin/llvm-config
+ '';
+ checkPhase = ''
+ ${python.executable} runtests.py
+ '';
+
+ __impureHostDeps = stdenv.lib.optionals stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
+
+ passthru.llvm = llvm;
+
+ meta = {
+ description = "A lightweight LLVM python binding for writing JIT compilers";
+ homepage = "http://llvmlite.pydata.org/";
+ license = stdenv.lib.licenses.bsd2;
+ maintainers = with stdenv.lib.maintainers; [ fridh ];
+ };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
new file mode 100644
index 00000000000..483e9aa3a3b
--- /dev/null
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, nettools, glibcLocales, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+ name = "magic-wormhole-${version}";
+ version = "0.8.1";
+
+ src = fetchurl {
+ url = "mirror://pypi/m/magic-wormhole/${name}.tar.gz";
+ sha256 = "1yh5nbhh9z1am2pqnb5qqyq1zjl1m7z6jnkmvry2q14qwspw9had";
+ };
+
+ buildInputs = [ nettools glibcLocales ];
+ propagatedBuildInputs = with pythonPackages; [ autobahn cffi click hkdf pynacl spake2 tqdm ];
+
+ patchPhase = ''
+ sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py
+ sed -i -e "s|if (os.path.dirname(os.path.abspath(wormhole))|if not os.path.abspath(wormhole).startswith('/nix/store') and (os.path.dirname(os.path.abspath(wormhole))|" src/wormhole/test/test_scripts.py
+ # XXX: disable one test due to warning:
+ # setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
+ sed -i -e "s|def test_text_subprocess|def skip_test_text_subprocess|" src/wormhole/test/test_scripts.py
+ '';
+
+ checkPhase = ''
+ export PATH="$PATH:$out/bin"
+ export LANG="en_US.UTF-8"
+ export LC_ALL="en_US.UTF-8"
+ ${pythonPackages.python.interpreter} -m wormhole.test.run_trial wormhole
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Securely transfer data between computers";
+ homepage = "https://github.com/warner/magic-wormhole";
+ license = licenses.mit;
+ maintainers = with maintainers; [ asymmetric ];
+ };
+}
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index a9dced9b6c4..5ba813deba6 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
]
++ stdenv.lib.optional enableGtk2 pygtk
++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ]
- ++ stdenv.lib.optionals enableTk [ python.tkinter tcl tk tkinter libX11 ];
+ ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ];
patches =
[ ./basedirlist.patch ] ++
diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
new file mode 100644
index 00000000000..9a2e13f0c59
--- /dev/null
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, fetchurl
+, buildPythonPackage
+, pytest
+, isPy3k
+}:
+
+let
+ pname = "multidict";
+ version = "2.1.4";
+in buildPythonPackage rec {
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+ sha256 = "a77aa8c9f68846c3b5db43ff8ed2a7a884dbe845d01f55113a3fba78518c4cd7";
+ };
+
+ buildInputs = [ pytest ];
+
+ checkPhase = ''
+ py.test
+ '';
+
+ disabled = !isPy3k;
+
+ meta = {
+ description = "Multidict implementation";
+ homepage = https://github.com/aio-libs/multidict/;
+ license = lib.licenses.asl20;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
new file mode 100644
index 00000000000..1feb9e009e2
--- /dev/null
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, fetchurl
+, python
+, buildPythonPackage
+, isPy27
+, isPy33
+, isPy3k
+, numpy
+, llvmlite
+, argparse
+, funcsigs
+, singledispatch
+, libcxx
+}:
+
+buildPythonPackage rec {
+ version = "0.29.0";
+ name = "numba-${version}";
+
+ src = fetchurl {
+ url = "mirror://pypi/n/numba/${name}.tar.gz";
+ sha256 = "00ae294f3fb3a99e8f0a9f568213cebed26675bacc9c6f8d2e025b6d564e460d";
+ };
+
+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+
+ propagatedBuildInputs = [numpy llvmlite argparse] ++ stdenv.lib.optional (!isPy3k) funcsigs ++ stdenv.lib.optional (isPy27 || isPy33) singledispatch;
+
+ # Copy test script into $out and run the test suite.
+ checkPhase = ''
+ cp runtests.py $out/${python.sitePackages}/numba/runtests.py
+ ${python.interpreter} $out/${python.sitePackages}/numba/runtests.py
+ '';
+ # ImportError: cannot import name '_typeconv'
+ doCheck = false;
+
+ meta = {
+ homepage = http://numba.pydata.org/;
+ license = stdenv.lib.licenses.bsd2;
+ description = "Compiling Python code using LLVM";
+ maintainers = with stdenv.lib.maintainers; [ fridh ];
+ };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/poezio/fix_gnupg_import.patch b/pkgs/development/python-modules/poezio/fix_gnupg_import.patch
new file mode 100644
index 00000000000..d75e09b722b
--- /dev/null
+++ b/pkgs/development/python-modules/poezio/fix_gnupg_import.patch
@@ -0,0 +1,12 @@
+diff -Nur poezio-0.10.orig/plugins/gpg/__init__.py poezio-0.10/plugins/gpg/__init__.py
+--- poezio-0.10.orig/plugins/gpg/__init__.py 2016-07-27 19:02:41.000000000 +0200
++++ poezio-0.10/plugins/gpg/__init__.py 2016-11-16 14:17:06.011128631 +0100
+@@ -105,7 +105,7 @@
+ .. _XEP-0027: http://xmpp.org/extensions/xep-0027.html
+
+ """
+-from gpg import gnupg
++import slixmpp.thirdparty.gnupg as gnupg
+ from slixmpp.xmlstream.stanzabase import JID
+
+ from xml.etree import cElementTree as ET
diff --git a/pkgs/development/python-modules/poezio/fix_plugins_imports.patch b/pkgs/development/python-modules/poezio/fix_plugins_imports.patch
new file mode 100644
index 00000000000..821b9c41588
--- /dev/null
+++ b/pkgs/development/python-modules/poezio/fix_plugins_imports.patch
@@ -0,0 +1,80 @@
+diff -Nur poezio-0.10.orig/plugins/canat.py poezio-0.10/plugins/canat.py
+--- poezio-0.10.orig/plugins/canat.py 2016-08-21 14:56:35.000000000 +0200
++++ poezio-0.10/plugins/canat.py 2016-11-16 14:32:21.565445266 +0100
+@@ -34,9 +34,9 @@
+
+
+ """
+-from plugin import BasePlugin
+-import tabs
+-from decorators import command_args_parser
++from poezio.plugin import BasePlugin
++import poezio.tabs
++from poezio.decorators import command_args_parser
+
+ def move(text, step, spacing):
+ new_text = text + (" " * spacing)
+diff -Nur poezio-0.10.orig/plugins/corrections_diff.py poezio-0.10/plugins/corrections_diff.py
+--- poezio-0.10.orig/plugins/corrections_diff.py 2016-08-21 14:56:35.000000000 +0200
++++ poezio-0.10/plugins/corrections_diff.py 2016-11-16 14:30:53.992684959 +0100
+@@ -22,11 +22,11 @@
+
+
+ """
+-from plugin import BasePlugin
++from poezio.plugin import BasePlugin
+ import difflib
++import collections
+ from functools import wraps
+-import tabs
+-from config import config
++from poezio.config import config
+
+ shim_message_fields = ('txt nick_color time str_time nickname user identifier'
+ ' highlight me old_message revisions jid ack')
+@@ -61,10 +61,6 @@
+ rev -= 1
+ return ''.join(acc)
+
+-Message.__repr__ = repr_message
+-Message.__str__ = repr_message
+-
+-
+
+ def corrections_enabled(func):
+ @wraps(func)
+diff -Nur poezio-0.10.orig/plugins/coucou.py poezio-0.10/plugins/coucou.py
+--- poezio-0.10.orig/plugins/coucou.py 2016-08-21 14:56:35.000000000 +0200
++++ poezio-0.10/plugins/coucou.py 2016-11-16 14:25:37.101337668 +0100
+@@ -1,4 +1,4 @@
+-from plugin import BasePlugin
++from poezio.plugin import BasePlugin
+ import tracemalloc
+ import cProfile, pstats, io
+
+diff -Nur poezio-0.10.orig/plugins/flood.py poezio-0.10/plugins/flood.py
+--- poezio-0.10.orig/plugins/flood.py 2016-08-21 14:56:35.000000000 +0200
++++ poezio-0.10/plugins/flood.py 2016-11-16 14:32:56.452155220 +0100
+@@ -1,6 +1,6 @@
+-from plugin import BasePlugin
+-import tabs
+-import multiuserchat as muc
++from poezio.plugin import BasePlugin
++import poezio.tabs
++import poezio.multiuserchat as muc
+
+ class Plugin(BasePlugin):
+ def init(self):
+diff -Nur poezio-0.10.orig/plugins/invisible.py poezio-0.10/plugins/invisible.py
+--- poezio-0.10.orig/plugins/invisible.py 2016-08-21 14:56:35.000000000 +0200
++++ poezio-0.10/plugins/invisible.py 2016-11-16 14:31:31.743288152 +0100
+@@ -20,8 +20,7 @@
+ .. _XEP-0186: https://xmpp.org/extensions/xep-0186.html
+ """
+
+-from plugin import BasePlugin
+-import tabs
++from poezio.plugin import BasePlugin
+
+ class Plugin(BasePlugin):
+ def init(self):
diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix
new file mode 100644
index 00000000000..04964ab03dd
--- /dev/null
+++ b/pkgs/development/python-modules/pycryptodome/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, python, buildPythonPackage, gmp }:
+
+buildPythonPackage rec {
+ version = "3.4.3";
+ name = "pycryptodome-${version}";
+ namePrefix = "";
+
+ src = fetchurl {
+ url = "mirror://pypi/p/pycryptodome/${name}.tar.gz";
+ sha256 = "1x2kk2va77lqys2dd7gwh35m4vrp052zz5hvv1zqxzksg2srf5jb";
+ };
+
+ meta = {
+ homepage = "https://www.pycryptodome.org/";
+ description = "Python Cryptography Toolkit";
+ platforms = stdenv.lib.platforms.unix;
+ };
+}
diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix
index d97a23746fd..471ffbe6c35 100644
--- a/pkgs/development/python-modules/pycuda/default.nix
+++ b/pkgs/development/python-modules/pycuda/default.nix
@@ -1,4 +1,5 @@
{ buildPythonPackage
+, fetchurl
, fetchFromGitHub
, boost
, numpy
@@ -12,6 +13,7 @@
, mkDerivation
, stdenv
, pythonOlder
+, isPy35
}:
let
compyte = import ./compyte.nix {
@@ -19,22 +21,21 @@ let
};
in
buildPythonPackage rec {
- name = "pycuda-${version}";
- version = "2016.1";
+ pname = "pycuda";
+ version = "2016.1.2";
+ name = "${pname}-${version}";
- src = fetchFromGitHub {
- owner = "inducer";
- repo = "pycuda";
- rev = "609817e22c038249f5e9ddd720b3ca5a9d58ca11";
- sha256 = "0kg6ayxsw2gja9rqspy6z8ihacf9jnxr8hzywjwmj1izkv24cff7";
- };
+ src = fetchurl {
+ url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+ sha256 = "0dvf1cnrlvmrc7i100n2ndrnd7fjm7aq3wpmk2nx5h7hwb3xmnx7";
+ };
preConfigure = ''
findInputs ${boost.dev} boost_dirs propagated-native-build-inputs
export BOOST_INCLUDEDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep '\-dev')/include
export BOOST_LIBRARYDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep -v '\-dev')/lib
-
+
${python.interpreter} configure.py --boost-inc-dir=$BOOST_INCLUDEDIR \
--boost-lib-dir=$BOOST_LIBRARYDIR \
--no-use-shipped-boost \
@@ -45,7 +46,12 @@ buildPythonPackage rec {
ln -s ${compyte} $out/${python.sitePackages}/pycuda/compyte
'';
- doCheck = pythonOlder "3.5";
+ # Requires access to libcuda.so.1 which is provided by the driver
+ doCheck = false;
+
+ checkPhase = ''
+ py.test
+ '';
propagatedBuildInputs = [
numpy
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index dfddd7dddbd..33bb1d5a4ca 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/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
new file mode 100644
index 00000000000..d09f38914b5
--- /dev/null
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -0,0 +1,39 @@
+{ stdenv
+, fetchurl
+, buildPythonPackage
+, Mako
+, pytest
+, numpy
+, cffi
+, pytools
+, decorator
+, appdirs
+, six
+, opencl-headers
+, opencl-icd
+}:
+
+buildPythonPackage rec {
+ pname = "pyopencl";
+ version = "2016.2";
+ name = "${pname}-${version}";
+
+ buildInputs = [ pytest opencl-headers opencl-icd ];
+
+ propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ];
+
+ src = fetchurl {
+ url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+ sha256 = "1b94540cf59ea71a3ef234a8f1d0eb2b4633c112f0f554fb69e52b4a0337d82b";
+ };
+
+ # gcc: error: pygpu_language_opencl.cpp: No such file or directory
+ doCheck = false;
+
+ meta = {
+ description = "Python wrapper for OpenCL";
+ homepage = https://github.com/pyopencl/pyopencl;
+ license = stdenv.lib.licenses.mit;
+ maintainer = stdenv.lib.maintainers.fridh;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix
index c7e0cc09f14..a27a365bb2c 100644
--- a/pkgs/development/python-modules/pyside/apiextractor.nix
+++ b/pkgs/development/python-modules/pyside/apiextractor.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, libxml2, libxslt, python, sphinx, qt4 }:
stdenv.mkDerivation {
- name = "${python.libPrefix}-pyside-apiextractor-0.10.10";
+ name = "pyside-apiextractor-0.10.10";
src = fetchurl {
url = "https://github.com/PySide/Apiextractor/archive/0.10.10.tar.gz";
diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix
index 8f6213beaf1..6473ebf22b1 100644
--- a/pkgs/development/python-modules/pyside/default.nix
+++ b/pkgs/development/python-modules/pyside/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchurl, cmake, python, mkPythonDerivation, pysideGeneratorrunner, pysideShiboken, qt4 }:
mkPythonDerivation rec {
- name = "${python.libPrefix}-pyside-${version}";
+ name = "pyside-${version}";
version = "1.2.4";
src = fetchurl {
diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix
index b576b29dae7..28ea88ad1fa 100644
--- a/pkgs/development/python-modules/pyside/generatorrunner.nix
+++ b/pkgs/development/python-modules/pyside/generatorrunner.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, pysideApiextractor, python, sphinx, qt4 }:
stdenv.mkDerivation {
- name = "${python.libPrefix}-pyside-generatorrunner-0.6.16";
+ name = "pyside-generatorrunner-0.6.16";
src = fetchurl {
url = "https://github.com/PySide/Generatorrunner/archive/0.6.16.tar.gz";
diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix
index 80b2325cbf4..8c91b63d0e1 100644
--- a/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/pkgs/development/python-modules/pyside/shiboken.nix
@@ -2,7 +2,7 @@
# Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77
stdenv.mkDerivation rec {
- name = "${python.libPrefix}-pyside-shiboken-${version}";
+ name = "pyside-shiboken-${version}";
version = "1.2.4";
src = fetchurl {
diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix
index facbccdce35..11f2bd97175 100644
--- a/pkgs/development/python-modules/pyside/tools.nix
+++ b/pkgs/development/python-modules/pyside/tools.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, pyside, python, qt4, pysideShiboken }:
stdenv.mkDerivation {
- name = "${python.libPrefix}-pyside-tools-0.2.15";
+ name = "pyside-tools-0.2.15";
src = fetchurl {
url = "https://github.com/PySide/Tools/archive/0.2.15.tar.gz";
diff --git a/pkgs/development/python-modules/rainbowstream/setup.patch b/pkgs/development/python-modules/rainbowstream/setup.patch
deleted file mode 100644
index 55afa49a96e..00000000000
--- a/pkgs/development/python-modules/rainbowstream/setup.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 07b5913..2b7b15e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -24,15 +24,16 @@ install_requires = [
- ]
-
- # Default user (considers non virtualenv method)
--user = os.environ.get('SUDO_USER', os.environ['USER'])
-+user = os.environ.get('SUDO_USER', os.environ.get('USER', None))
-
- # Copy default config if not exists
- default = os.path.expanduser("~") + os.sep + '.rainbow_config.json'
- if not os.path.isfile(default):
- cmd = 'cp rainbowstream/colorset/config ' + default
- os.system(cmd)
-- cmd = 'chown ' + quote(user) + ' ' + default
-- os.system(cmd)
-+ if user:
-+ cmd = 'chown ' + quote(user) + ' ' + default
-+ os.system(cmd)
- cmd = 'chmod 777 ' + default
- os.system(cmd)
-
diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix
new file mode 100644
index 00000000000..14ebe52eae9
--- /dev/null
+++ b/pkgs/development/python-modules/reikna/default.nix
@@ -0,0 +1,45 @@
+{ stdenv
+, fetchurl
+, buildPythonPackage
+, sphinx
+, pytestcov
+, pytest
+, Mako
+, numpy
+, funcsigs
+, withCuda ? false, pycuda
+, withOpenCL ? true, pyopencl
+}:
+
+buildPythonPackage rec {
+ pname = "reikna";
+ name = "${pname}-${version}";
+ version = "0.6.7";
+
+ src = fetchurl {
+ url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+ sha256 = "810b349eb9339aa0d13bca99a3d8a380972708474b8c0990d188ec6074358d62";
+ };
+
+ buildInputs = [ sphinx pytestcov pytest ];
+
+ propagatedBuildInputs = [ Mako numpy funcsigs ]
+ ++ stdenv.lib.optional withCuda pycuda
+ ++ stdenv.lib.optional withOpenCL pyopencl;
+
+ checkPhase = ''
+ py.test
+ '';
+
+ # Requires device
+ doCheck = false;
+
+ meta = {
+ description = "GPGPU algorithms for PyCUDA and PyOpenCL";
+ homepage = http://github.com/fjarri/reikna;
+ license = stdenv.lib.licenses.mit;
+ maintainer = stdenv.lib.maintainers.fridh;
+
+ };
+
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 3a38dee3174..63e05736d79 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -1,14 +1,15 @@
{ stdenv, lib, fetchurl, python, wrapPython }:
stdenv.mkDerivation rec {
- shortName = "setuptools-${version}";
+ pname = "setuptools";
+ shortName = "${pname}-${version}";
name = "${python.libPrefix}-${shortName}";
- version = "26.1.1"; # 18.4 and up breaks python34Packages.characteristic and many others
+ version = "30.2.0";
src = fetchurl {
- url = "mirror://pypi/s/setuptools/${shortName}.tar.gz";
- sha256 = "475ce28993d7cb75335942525b9fac79f7431a7f6e8a0079c0f2680641379481";
+ url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${shortName}.tar.gz";
+ sha256 = "f865709919903e3399343c0b3c42f95e9aeddc41e38cfb334fb2bb5dfa384857";
};
buildInputs = [ python wrapPython ];
diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix
new file mode 100644
index 00000000000..8c66dc60407
--- /dev/null
+++ b/pkgs/development/python-modules/websockets/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, fetchurl
+, buildPythonPackage
+, pythonOlder
+}:
+
+let
+ pname = "websockets";
+ version = "3.2";
+in buildPythonPackage rec {
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+ sha256 = "1dah1faywsnrlqyzagb1qc1cxrq9145srkdy118yhy9s8dyq4dmm";
+ };
+
+ disabled = pythonOlder "3.3";
+ doCheck = false; # protocol tests fail
+
+ meta = {
+ description = "WebSocket implementation in Python 3";
+ homepage = https://github.com/aaugustin/websockets;
+ license = lib.licenses.bsd3;
+ };
+}
diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix
new file mode 100644
index 00000000000..246b761fa53
--- /dev/null
+++ b/pkgs/development/python-modules/yarl/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, fetchurl
+, buildPythonPackage
+, multidict
+, pytestrunner
+, pytest
+}:
+
+let
+ pname = "yarl";
+ version = "0.8.1";
+in buildPythonPackage rec {
+ name = "${pname}-${version}";
+ src = fetchurl {
+ url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+ sha256 = "9f0397ae540124bf16a8a5b89bc3ea1c07f8ae70c3e44231a40a9edd254d5712";
+ };
+
+ buildInputs = [ pytest pytestrunner ];
+ propagatedBuildInputs = [ multidict ];
+
+
+ meta = {
+ description = "Yet another URL library";
+ homepage = https://github.com/aio-libs/yarl/;
+ license = lib.licenses.asl20;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 5c05973095f..2ef3fbdd076 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -288,7 +288,7 @@ let
pbdNCDF4 = [ pkgs.netcdf ];
pbdPROF = [ pkgs.openmpi ];
PKI = [ pkgs.openssl ];
- png = [ pkgs.libpng ];
+ png = [ pkgs.libpng.dev ];
PopGenome = [ pkgs.zlib ];
proj4 = [ pkgs.proj ];
qtbase = [ pkgs.qt4 ];
@@ -472,7 +472,6 @@ let
"DeducerSurvival"
"DeducerText"
"Demerelate"
- "DescTools"
"detrendeR"
"dgmb"
"DivMelt"
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 21cc80ea6ba..20dc23979f5 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, lxc
}@args:
let
@@ -145,6 +145,10 @@ in
buildInputs = [ imagemagick pkgconfig which ];
};
+ ruby-lxc = attrs: {
+ buildInputs = [ lxc ];
+ };
+
ruby-terminfo = attrs: {
buildInputs = [ ncurses ];
buildFlags = [
@@ -156,6 +160,18 @@ in
buildInputs = [ cmake pkgconfig openssl libssh2 zlib ];
};
+ scrypt = attrs:
+ if stdenv.isDarwin then {
+ dontBuild = false;
+ postPatch = ''
+ sed -i -e "s/-arch i386//" Rakefile ext/scrypt/Rakefile
+ '';
+ } else {};
+
+ sequel_pg = attrs: {
+ buildInputs = [ postgresql ];
+ };
+
snappy = attrs: {
buildInputs = [ args.snappy ];
};
@@ -202,6 +218,10 @@ in
--replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
'';
};
+
+ uuid4r = attrs: {
+ buildInputs = [ which libossp_uuid ];
+ };
xapian-ruby = attrs: {
# use the system xapian
@@ -216,4 +236,3 @@ in
};
}
-
diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 7cb4afbc12e..74c15adc483 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ammonite-repl-${version}";
- version = "0.7.8";
+ version = "0.8.1";
src = fetchurl {
url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${version}";
- sha256 = "0s34p168h5c7ij61rbmaygb95r654yj4j0wh6qya53k4ywl32vkp";
+ sha256 = "0xwy05yfqr1dfypka9wnm60wm0q60kmckzxfp5x79aib94f5ds51";
};
propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index b481c1e80e5..91037588552 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/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 213222577d3..d6164ef2e4e 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -3,14 +3,14 @@
with lib;
stdenv.mkDerivation rec {
- version = "0.34.0";
+ version = "0.37.1";
name = "flow-${version}";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
- sha256 = "0fydrxp1aq4nmjkqya3j4z4zjbjvqx575qdgjzvkxq71akg56hqv";
+ sha256 = "1n3pc3nfh7bcaard7y2fy7hjq4k6777wp9xv50r3zg4454mgbmsy";
};
installPhase = ''
diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix
index a67d9b8d42e..91d4155d093 100644
--- a/pkgs/development/tools/analysis/swarm/default.nix
+++ b/pkgs/development/tools/analysis/swarm/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Verification script generator for Spin";
- homepage = http://spinroot.com/;
+ homepage = "http://spinroot.com/";
license = licenses.free;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix
index 69051714ab4..812053902a5 100644
--- a/pkgs/development/tools/asn2quickder/default.nix
+++ b/pkgs/development/tools/asn2quickder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper }:
+{ stdenv, fetchFromGitHub, python2Packages, makeWrapper }:
stdenv.mkDerivation rec {
pname = "asn2quickder";
@@ -12,15 +12,15 @@ stdenv.mkDerivation rec {
repo = "${pname}";
};
- propagatedBuildInputs = with pythonPackages; [ pyparsing makeWrapper ];
+ propagatedBuildInputs = with python2Packages; [ pyparsing makeWrapper ];
- patchPhase = with pythonPackages; ''
+ patchPhase = with python2Packages; ''
substituteInPlace Makefile \
- --replace '..' '..:$(DESTDIR)/${python.sitePackages}:${pythonPackages.pyparsing}/${python.sitePackages}' \
+ --replace '..' '..:$(DESTDIR)/${python.sitePackages}:${python2Packages.pyparsing}/${python.sitePackages}' \
'';
installPhase = ''
- mkdir -p $out/${pythonPackages.python.sitePackages}/
+ mkdir -p $out/${python2Packages.python.sitePackages}/
mkdir -p $out/bin $out/lib $out/sbin $out/man
make DESTDIR=$out PREFIX=/ all
make DESTDIR=$out PREFIX=/ install
diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix
new file mode 100644
index 00000000000..c8e667722c5
--- /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/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index d16b83a2831..8e85c645e2e 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -1,12 +1,21 @@
-{ stdenv, pythonPackages, fetchurl, coreutils, plugins ? [] }:
+{ stdenv,
+ lib,
+ pythonPackages,
+ fetchurl,
+ coreutils,
+ openssh,
+ buildbot-worker,
+ plugins ? [],
+ enableLocalWorker ? false
+}:
pythonPackages.buildPythonApplication (rec {
name = "${pname}-${version}";
pname = "buildbot";
- version = "0.9.0rc4";
+ version = "0.9.0.post1";
src = fetchurl {
url = "mirror://pypi/b/${pname}/${name}.tar.gz";
- sha256 = "16bnrr5qkfpnby9sw9azcagnw0ybi7d8bpdlga2a4c61jg2d5dnc";
+ sha256 = "18rnsp691cnmbymlch6czx3mrcmifmf6dk97h9nslgfkkyf25n5g";
};
buildInputs = with pythonPackages; [
@@ -22,7 +31,7 @@ pythonPackages.buildPythonApplication (rec {
pylint
astroid
pyflakes
- ];
+ ] ++ lib.optionals (enableLocalWorker) [openssh];
propagatedBuildInputs = with pythonPackages; [
@@ -52,14 +61,17 @@ pythonPackages.buildPythonApplication (rec {
ramlfications
sphinx-jinja
- ] ++ plugins;
+ ] ++ plugins ++
+ lib.optionals (enableLocalWorker) [buildbot-worker];
preInstall = ''
# writes out a file that can't be read properly
sed -i.bak -e '69,84d' buildbot/test/unit/test_www_config.py
+ '';
+ postPatch = ''
# re-hardcode path to tail
- sed -i.bak 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot/scripts/logwatcher.py
+ sed -i 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot/scripts/logwatcher.py
'';
postFixup = ''
diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix
index 09f8b1e750a..2875f6942a9 100644
--- a/pkgs/development/tools/build-managers/buildbot/plugins.nix
+++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix
@@ -4,11 +4,11 @@ let
buildbot-pkg = pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "buildbot-pkg";
- version = "0.9.0rc4";
+ version = "0.9.0.post1";
src = fetchurl {
url = "mirror://pypi/b/${pname}/${name}.tar.gz";
- sha256 = "0dfdyc3x0926dynzdl9w7z0p84w287l362mxdl3r6wl87gkisr10";
+ sha256 = "0frmnc73dsyc9mjnrnpm4vdrwb7c63gc6maq6xvlp486v7sdhjbi";
};
propagatedBuildInputs = with pythonPackages; [ setuptools ];
@@ -23,22 +23,19 @@ let
};
in {
-
www = pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "buildbot_www";
- version = "0.9.0rc4";
+ version = "0.9.0.post1";
# NOTE: wheel is used due to buildbot circular dependency
format = "wheel";
src = fetchurl {
- url = "https://pypi.python.org/packages/78/45/b43bd85695cd0178f8bac9c3b394062e9eb46f489b655c11e950e54278a2/${name}-py2-none-any.whl";
- sha256 = "0ixi0y0jhbql55swsvy0jin1v6xf4q4mw9p5n9sll2h10lyp9h0p";
+ url = "https://pypi.python.org/packages/02/d0/fc56ee27a09498638a47dcc5637ee5412ab7a67bfb4b3ff47e041f3d7b66/${name}-py2-none-any.whl";
+ sha256 = "14ghch67k6090736n89l401swz7r9hnk2zlmdb59niq8lg7dyg9q";
};
- propagatedBuildInputs = [ buildbot-pkg ];
-
meta = with stdenv.lib; {
homepage = http://buildbot.net/;
description = "Buildbot UI";
@@ -51,11 +48,11 @@ in {
console-view = pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "buildbot-console-view";
- version = "0.9.0rc4";
+ version = "0.9.0.post1";
src = fetchurl {
url = "mirror://pypi/b/${pname}/${name}.tar.gz";
- sha256 = "1fig635yg5dgn239g9wzfpw9wc3p91lcl9nnig9k7fijz85pwrva";
+ sha256 = "0dc7rb7mrpva5gj7l57i96a78d6yj28pkkj9hfim1955z9dgn58l";
};
propagatedBuildInputs = [ buildbot-pkg ];
@@ -72,11 +69,11 @@ in {
waterfall-view = pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "buildbot-waterfall-view";
- version = "0.9.0rc4";
+ version = "0.9.0.post1";
src = fetchurl {
url = "mirror://pypi/b/${pname}/${name}.tar.gz";
- sha256 = "08kh966grj9b4mif337vv7bqy5ixz8xz31ml63wysjb65djnjbk8";
+ sha256 = "0x9vvw15zzgj4w3qcxh8r10rb36ni0qh1215y7wbawh5lggnjm0g";
};
propagatedBuildInputs = [ buildbot-pkg ];
diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix
index 01b2051aaa6..7d7ecc1c52d 100644
--- a/pkgs/development/tools/build-managers/buildbot/worker.nix
+++ b/pkgs/development/tools/build-managers/buildbot/worker.nix
@@ -3,11 +3,11 @@
pythonPackages.buildPythonApplication (rec {
name = "${pname}-${version}";
pname = "buildbot-worker";
- version = "0.9.0rc4";
+ version = "0.9.0.post1";
src = fetchurl {
url = "mirror://pypi/b/${pname}/${name}.tar.gz";
- sha256 = "1fv40pki1awv5f2z9vd7phjk7dlsy1cp4blsy2vdhqwbc7112a8c";
+ sha256 = "1f8ij3y62r9z7qv92x21rg9h9whhakkwv59rgniq09j64ggjz8lx";
};
buildInputs = with pythonPackages; [ setuptoolsTrial mock ];
diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
new file mode 100644
index 00000000000..6fdd250913c
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gn/default.nix
@@ -0,0 +1,80 @@
+{ stdenv, fetchgit, fetchurl, python2, ninja, libevent, xdg-user-dirs }:
+
+let
+ date = "20161008";
+
+ sourceTree = {
+ "src/base" = {
+ rev = "e71a514e60b085cc92bf6ef951ec329f52c79f9f";
+ sha256 = "0zycbssmd2za0zij8czcs1fr66fi12f1g5ysc8fzkf8khbs5h6a9";
+ };
+ "src/build" = {
+ rev = "17093d45bf738e9ae4b6294492860ee65218a657";
+ sha256 = "0i9py78c3f46sc789qvdhmgjgyrghysbqjgr67iypwphw52jv2dz";
+ };
+ "src/tools/gn" = {
+ rev = "9ff32cf3f1f4ad0212ac674b6303e7aa68f44f3f";
+ sha256 = "14jr45k5fgcqk9d18fd77sijlqavvnv0knndh74zyb0b60464hz1";
+ };
+ "testing/gtest" = {
+ rev = "585ec31ea716f08233a815e680fc0d4699843938";
+ sha256 = "0csn1cza66851nmxxiw42smsm3422mx67vcyykwn0a71lcjng6rc";
+ };
+ };
+
+ mkDepend = path: attrs: fetchgit {
+ url = "https://chromium.googlesource.com/chromium/${path}";
+ inherit (attrs) rev sha256;
+ };
+
+in stdenv.mkDerivation rec {
+ name = "gn-${version}";
+ version = "0.0.0.${date}";
+
+ unpackPhase = ''
+ ${with stdenv.lib; concatStrings (mapAttrsToList (path: sha256: ''
+ dest=source/${escapeShellArg (removePrefix "src/" path)}
+ mkdir -p "$(dirname "$dest")"
+ cp --no-preserve=all -rT ${escapeShellArg (mkDepend path sha256)} "$dest"
+ '') sourceTree)}
+ ( mkdir -p source/third_party
+ cd source/third_party
+ unpackFile ${xdg-user-dirs.src}
+ mv * xdg_user
+ )
+ '';
+
+ sourceRoot = "source";
+
+ postPatch = ''
+ # GN's bootstrap script relies on shebangs (which are relying on FHS paths),
+ # except when on Windows. So instead of patchShebang-ing it, let's just
+ # force the same behaviour as on Windows.
+ sed -i -e '/^def *check_call/,/^[^ ]/ {
+ s/is_win/True/
+ }' tools/gn/bootstrap/bootstrap.py
+
+ # Patch out Chromium-bundled libevent and xdg_user_dirs
+ sed -i -e '/static_libraries.*libevent/,/^ *\]\?[})]$/d' \
+ tools/gn/bootstrap/bootstrap.py
+ '';
+
+ NIX_LDFLAGS = "-levent";
+
+ nativeBuildInputs = [ python2 ninja ];
+ buildInputs = [ libevent ];
+
+ buildPhase = ''
+ python2 tools/gn/bootstrap/bootstrap.py -v -s --no-clean
+ '';
+
+ installPhase = ''
+ install -vD out_bootstrap/gn "$out/bin/gn"
+ '';
+
+ meta = {
+ description = "A meta-build system that generates NinjaBuild files";
+ homepage = "https://chromium.googlesource.com/chromium/src/tools/gn/";
+ license = stdenv.lib.licenses.bsd3;
+ };
+}
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index b995e76f63a..c129d4448a9 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, unzip, jdk, makeWrapper }:
rec {
- gradleGen = {name, src} : stdenv.mkDerivation rec {
- inherit name src;
+ gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation rec {
+ inherit name src nativeVersion;
dontBuild = true;
@@ -21,10 +21,10 @@ rec {
let arch = if stdenv.is64bit then "amd64" else "i386"; in ''
mkdir patching
pushd patching
- jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-0.11.jar
+ jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-${nativeVersion}.jar
patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so
- jar cf native-platform-linux-${arch}-0.11.jar .
- mv native-platform-linux-${arch}-0.11.jar $out/lib/gradle/lib/
+ jar cf native-platform-linux-${arch}-${nativeVersion}.jar .
+ mv native-platform-linux-${arch}-${nativeVersion}.jar $out/lib/gradle/lib/
popd
# The scanner doesn't pick up the runtime dependency in the jar.
@@ -52,16 +52,18 @@ rec {
};
gradle_latest = gradleGen rec {
- name = "gradle-3.1";
+ name = "gradle-3.2.1";
+ nativeVersion = "0.11";
src = fetchurl {
url = "http://services.gradle.org/distributions/${name}-bin.zip";
- sha256 = "1z0h60w0wvdg2rlxg5izcbhnrzdmr3mdgs7p09cm4lr28d139pn7";
+ sha256 = "1286wqycc7xnrkn6n37r5g19ajv6igqhavdh9pjxqmry9mjs6hwq";
};
};
gradle_2_14 = gradleGen rec {
name = "gradle-2.14.1";
+ nativeVersion = "0.10";
src = fetchurl {
url = "http://services.gradle.org/distributions/${name}-bin.zip";
@@ -71,6 +73,7 @@ rec {
gradle_2_5 = gradleGen rec {
name = "gradle-2.5";
+ nativeVersion = "0.10";
src = fetchurl {
url = "http://services.gradle.org/distributions/${name}-bin.zip";
diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index 03968d15b12..9185f5b9eaa 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "icmake-${version}";
- version = "9.00.00";
+ version = "9.02.02";
src = fetchFromGitHub {
- sha256 = "028rxx4ygy0z48m30m5pdach7kcp41swchhs8i15wag1mppllcy2";
+ sha256 = "0f7w3b8r2h6ckgzc6wbfbw5yyxia0f3j3acmzi1yzylj6ak05mmd";
rev = version;
repo = "icmake";
owner = "fbb-git";
diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index d8938e2d468..bfc6dce1e1a 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -3,45 +3,20 @@
tree, fetchFromGitHub, hexRegistrySnapshot }:
let
- version = "3.1.0";
+ version = "3.3.2";
bootstrapper = ./rebar3-nix-bootstrap;
- erlware_commons = fetchHex {
- pkg = "erlware_commons";
- version = "0.19.0";
- sha256 = "1gfsy9bbhjb94c5ghff2niamn93x2x08lnklh6pp7sfr5i0gkgsv";
- };
- ssl_verify_hostname = fetchHex {
- pkg = "ssl_verify_hostname";
- version = "1.0.5";
- sha256 = "1gzavzqzljywx4l59gvhkjbr1dip4kxzjjz1s4wsn42f2kk13jzj";
+ bbmustache = fetchHex {
+ pkg = "bbmustache";
+ version = "1.3.0";
+ sha256 = "042pfgss8kscq6ssg8gix8ccmdsrx0anjczsbrn2a6c36ljrx2p6";
};
certifi = fetchHex {
pkg = "certifi";
version = "0.4.0";
sha256 = "04bnvsbssdcf6b9h9bfglflds7j0gx6q5igl1xxhx6fnwaz37hhw";
};
- providers = fetchHex {
- pkg = "providers";
- version = "1.6.0";
- sha256 = "0byfa1h57n46jilz4q132j0vk3iqc0v1vip89li38gb1k997cs0g";
- };
- getopt = fetchHex {
- pkg = "getopt";
- version = "0.8.2";
- sha256 = "1xw30h59zbw957cyjd8n50hf9y09jnv9dyry6x3avfwzcyrnsvkk";
- };
- bbmustache = fetchHex {
- pkg = "bbmustache";
- version = "1.0.4";
- sha256 = "04lvwm7f78x8bys0js33higswjkyimbygp4n72cxz1kfnryx9c03";
- };
- relx = fetchHex {
- pkg = "relx";
- version = "3.17.0";
- sha256 = "1xjybi93m8gj9f9z3lkc7xbg3k5cw56yl78rcz5qfirr0223sby2";
- };
cf = fetchHex {
pkg = "cf";
version = "0.2.1";
@@ -49,14 +24,39 @@ let
};
cth_readable = fetchHex {
pkg = "cth_readable";
- version = "1.2.2";
- sha256 = "0kb9v4998liwyidpjkhcg1nin6djjzxcx6b313pbjicbp4r58n3p";
+ version = "1.2.3";
+ sha256 = "0wfpfismzi2q0nzvx9qyllch4skwmsk6yqffw8iw2v48ssbfvfhz";
+ };
+ erlware_commons = fetchHex {
+ pkg = "erlware_commons";
+ version = "0.21.0";
+ sha256 = "0gxb011m637rca2g0vhm1q9krm3va50rz1py6zf8k92q4iv9a2p7";
};
eunit_formatters = fetchHex {
pkg = "eunit_formatters";
version = "0.3.1";
sha256 = "0cg9dasv60v09q3q4wja76pld0546mhmlpb0khagyylv890hg934";
};
+ getopt = fetchHex {
+ pkg = "getopt";
+ version = "0.8.2";
+ sha256 = "1xw30h59zbw957cyjd8n50hf9y09jnv9dyry6x3avfwzcyrnsvkk";
+ };
+ providers = fetchHex {
+ pkg = "providers";
+ version = "1.6.0";
+ sha256 = "0byfa1h57n46jilz4q132j0vk3iqc0v1vip89li38gb1k997cs0g";
+ };
+ ssl_verify_fun = fetchHex {
+ pkg = "ssl_verify_fun";
+ version = "1.1.1";
+ sha256 = "0pnnan9xf4r6pr34hi28zdyv501i39jwnrwk6pr9r4wabkmhb22g";
+ };
+ relx = fetchHex {
+ pkg = "relx";
+ version = "3.21.1";
+ sha256 = "00590aqy0rfzgsnzxqgwbmn90imxxqlzmnmapy6bq76vw2rynvb8";
+ };
rebar3_hex = fetchHex {
pkg = "rebar3_hex";
version = "1.12.0";
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/rebar/rebar3/archive/${version}.tar.gz";
- sha256 = "0r4wpnpi81ha4iirv9hcif3vrgc82qd51kah7rnhvpym55wcy9ml";
+ sha256 = "14nhc1bmna3b4y9qmd0lzpi0jdaw92r7ljg7vlghn297awsjgg6c";
};
inherit bootstrapper;
@@ -97,7 +97,7 @@ stdenv.mkDerivation {
cp --no-preserve=mode -R ${cth_readable} _build/default/lib/cth_readable
cp --no-preserve=mode -R ${eunit_formatters} _build/default/lib/eunit_formatters
cp --no-preserve=mode -R ${relx} _build/default/lib/relx
- cp --no-preserve=mode -R ${ssl_verify_hostname} _build/default/lib/ssl_verify_hostname
+ cp --no-preserve=mode -R ${ssl_verify_fun} _build/default/lib/ssl_verify_fun
cp --no-preserve=mode -R ${rebar3_hex} _build/default/plugins/rebar3_hex
'';
diff --git a/pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch b/pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch
index 40f430a558b..fa7a18f24d2 100644
--- a/pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch
+++ b/pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch
@@ -1,5 +1,5 @@
diff --git a/bootstrap b/bootstrap
-index 35759b0..939c838 100755
+index c36fddb..9fcb718 100755
--- a/bootstrap
+++ b/bootstrap
@@ -7,9 +7,11 @@ main(_) ->
@@ -9,42 +9,44 @@ index 35759b0..939c838 100755
- inets:start(),
- inets:start(httpc, [{profile, rebar}]),
- set_httpc_options(),
-+ %% Removed for hermeticity on Nix
++ %% Removed for hermeticity on Nix
+ %%
-+ %% inets:start(),
-+ %% inets:start(httpc, [{profile, rebar}]),
-+ %% set_httpc_options(),
-
++ %% inets:start(),
++ %% inets:start(httpc, [{profile, rebar}]),
++ %% set_httpc_options(),
+
%% Fetch and build deps required to build rebar3
BaseDeps = [{providers, []}
-@@ -74,12 +76,12 @@ default_registry_file() ->
+@@ -73,13 +75,13 @@ default_registry_file() ->
+ CacheDir = filename:join([Home, ".cache", "rebar3"]),
filename:join([CacheDir, "hex", "default", "registry"]).
-
- fetch_and_compile({Name, ErlFirstFiles}, Deps) ->
+
+-fetch_and_compile({Name, ErlFirstFiles}, Deps) ->
- case lists:keyfind(Name, 1, Deps) of
- {Name, Vsn} ->
- ok = fetch({pkg, atom_to_binary(Name, utf8), list_to_binary(Vsn)}, Name);
- {Name, _, Source} ->
- ok = fetch(Source, Name)
- end,
++fetch_and_compile({Name, ErlFirstFiles}, _Deps) ->
+ %% case lists:keyfind(Name, 1, Deps) of
+ %% {Name, Vsn} ->
+ %% ok = fetch({pkg, atom_to_binary(Name, utf8), list_to_binary(Vsn)}, Name);
+ %% {Name, _, Source} ->
+ %% ok = fetch(Source, Name)
+ %% end,
-
+
%% Hack: erlware_commons depends on a .script file to check if it is being built with
%% rebar2 or rebar3. But since rebar3 isn't built yet it can't get the vsn with get_key.
-@@ -88,63 +90,63 @@ fetch_and_compile({Name, ErlFirstFiles}, Deps) ->
-
+@@ -88,67 +90,67 @@ fetch_and_compile({Name, ErlFirstFiles}, Deps) ->
+
compile(Name, ErlFirstFiles).
-
+
-fetch({pkg, Name, Vsn}, App) ->
- Dir = filename:join([filename:absname("_build/default/lib/"), App]),
- case filelib:is_dir(Dir) of
- false ->
-- CDN = "https://s3.amazonaws.com/s3.hex.pm/tarballs",
+- CDN = "https://repo.hex.pm/tarballs",
- Package = binary_to_list(<>),
- Url = string:join([CDN, Package], "/"),
- case request(Url) of
@@ -85,7 +87,11 @@ index 35759b0..939c838 100755
- end.
-
-get_http_vars(Scheme) ->
-- proplists:get_value(Scheme, get_rebar_config(), []).
+- OS = case os:getenv(atom_to_list(Scheme)) of
+- Str when is_list(Str) -> Str;
+- _ -> []
+- end,
+- proplists:get_value(Scheme, get_rebar_config(), OS).
-
-set_httpc_options() ->
- set_httpc_options(https_proxy, get_http_vars(https_proxy)),
@@ -101,7 +107,7 @@ index 35759b0..939c838 100755
+%% Dir = filename:join([filename:absname("_build/default/lib/"), App]),
+%% case filelib:is_dir(Dir) of
+%% false ->
-+%% CDN = "https://s3.amazonaws.com/s3.hex.pm/tarballs",
++%% CDN = "https://repo.hex.pm/tarballs",
+%% Package = binary_to_list(<>),
+%% Url = string:join([CDN, Package], "/"),
+%% case request(Url) of
@@ -142,7 +148,11 @@ index 35759b0..939c838 100755
+%% end.
+
+%% get_http_vars(Scheme) ->
-+%% proplists:get_value(Scheme, get_rebar_config(), []).
++%% OS = case os:getenv(atom_to_list(Scheme)) of
++%% Str when is_list(Str) -> Str;
++%% _ -> []
++%% end,
++%% proplists:get_value(Scheme, get_rebar_config(), OS).
+
+%% set_httpc_options() ->
+%% set_httpc_options(https_proxy, get_http_vars(https_proxy)),
@@ -154,6 +164,6 @@ index 35759b0..939c838 100755
+%% set_httpc_options(Scheme, Proxy) ->
+%% {ok, {_, _, Host, Port, _, _}} = http_uri:parse(Proxy),
+%% httpc:set_options([{Scheme, {{Host, Port}, []}}], rebar).
-
+
compile(App, FirstFiles) ->
Dir = filename:join(filename:absname("_build/default/lib/"), App),
diff --git a/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch b/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch
index 634dda8c45a..3adfb7ee9e3 100644
--- a/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch
+++ b/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch
@@ -1,8 +1,8 @@
-diff a/src/rebar3.erl b/src/rebar3.erl
-index c1a1ae4..1bf1ea0 100644
+diff --git a/src/rebar3.erl b/src/rebar3.erl
+index 47dc25a..edda250 100644
--- a/src/rebar3.erl
+++ b/src/rebar3.erl
-@@ -294,9 +294,11 @@ start_and_load_apps(Caller) ->
+@@ -304,9 +304,11 @@ start_and_load_apps(Caller) ->
ensure_running(crypto, Caller),
ensure_running(asn1, Caller),
ensure_running(public_key, Caller),
@@ -12,16 +12,16 @@ index c1a1ae4..1bf1ea0 100644
+ ensure_running(ssl, Caller).
+%% Removed due to the hermicity requirements of Nix
+%%
-+%% inets:start(),
-+%% inets:start(httpc, [{profile, rebar}]).
-
++%% inets:start(),
++%% inets:start(httpc, [{profile, rebar}]).
+
ensure_running(App, Caller) ->
case application:start(App) of
-diff a/src/rebar_hermicity.erl b/src/rebar_hermicity.erl
+diff --git a/src/rebar_hermeticity.erl b/src/rebar_hermeticity.erl
new file mode 100644
-index 0000000..d814e2a
+index 0000000..8f6cc7d
--- /dev/null
-+++ b/src/rebar_hermicity.erl
++++ b/src/rebar_hermeticity.erl
@@ -0,0 +1,42 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
@@ -49,7 +49,7 @@ index 0000000..d814e2a
+%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+%% THE SOFTWARE.
+%% -------------------------------------------------------------------
-+-module(rebar_hermicity).
++-module(rebar_hermeticity).
+
+-export([request/5]).
+
@@ -63,23 +63,23 @@ index 0000000..d814e2a
+ ?ERROR("A request is being made that violates Nix hermicity "
+ "This request has been stopped. Details of the request "
+ "are as follows:", []),
-+ ?ERROR("Requesnt: ~p ~s", [Method, Url]),
++ ?ERROR("Request: ~p ~s", [Method, Url]),
+ erlang:halt(1).
-diff a/src/rebar_pkg_resource.erl b/src/rebar_pkg_resource.erl
-index ec7e09d..03be343 100644
+diff --git a/src/rebar_pkg_resource.erl b/src/rebar_pkg_resource.erl
+index 5817817..2ea1703 100644
--- a/src/rebar_pkg_resource.erl
+++ b/src/rebar_pkg_resource.erl
-@@ -104,7 +104,7 @@ make_vsn(_) ->
+@@ -107,7 +107,7 @@ make_vsn(_) ->
{error, "Replacing version of type pkg not supported."}.
-
+
request(Url, ETag) ->
- case httpc:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]++[{"User-Agent", rebar_utils:user_agent()}]},
-+ case rebar_hermicity:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]++[{"User-Agent", rebar_utils:user_agent()}]},
++ case rebar_hermeticity:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]++[{"User-Agent", rebar_utils:user_agent()}]},
[{ssl, ssl_opts(Url)}, {relaxed, true}],
[{body_format, binary}],
rebar) of
-diff a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl
-index 5e1e253..ea25b9e 100644
+diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl
+index 75c609e..4283c23 100644
--- a/src/rebar_prv_update.erl
+++ b/src/rebar_prv_update.erl
@@ -52,7 +52,7 @@ do(State) ->
@@ -87,7 +87,7 @@ index 5e1e253..ea25b9e 100644
{ok, Url} ->
?DEBUG("Fetching registry from ~p", [Url]),
- case httpc:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]},
-+ case rebar_hermicity:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]},
++ case rebar_hermeticity:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]},
[], [{stream, TmpFile}, {sync, true}],
rebar) of
{ok, saved_to_file} ->
diff --git a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
index 30ff235d12c..81257dd8c0c 100755
--- a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
+++ b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
@@ -41,7 +41,7 @@ main(Args) ->
{ok, RequiredData} = gather_required_data_from_the_environment(ArgData),
do_the_bootstrap(RequiredData).
-%% @doc There are two modes 'registery_only' where the register is
+%% @doc There are two modes 'registry_only' where the register is
%% created from hex and everything else.
-spec do_the_bootstrap(#data{}) -> ok.
do_the_bootstrap(RequiredData = #data{registry_only = true}) ->
@@ -55,7 +55,7 @@ do_the_bootstrap(RequiredData) ->
%% @doc
%% Argument parsing is super simple only because we want to keep the
%% dependencies minimal. For now there can be two entries on the
-%% command line, "registery-only" and "debug-info"
+%% command line, "registry-only" and "debug-info"
-spec parse_args([string()]) -> #data{}.
parse_args(Args0) ->
PossibleArgs = sets:from_list(["registry-only", "debug-info"]),
@@ -146,13 +146,14 @@ make_symlink(Path, TargetFile) ->
%% @doc
%% This takes an app name in the standard OTP - format
-%% and returns just the app name. Why? because rebar is doesn't
+%% and returns just the app name. Why? because rebar doesn't
%% respect OTP conventions in some cases.
-spec fixup_app_name(string()) -> string().
fixup_app_name(FileName) ->
case string:tokens(FileName, "-") of
[Name] -> Name;
- [Name, _Version] -> Name
+ [Name, _Version] -> Name;
+ [Name, _Version, _Tag] -> Name
end.
-spec bootstrap_registry(#data{}) -> ok.
diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix
new file mode 100644
index 00000000000..0d9d19c8b93
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -0,0 +1,72 @@
+{ stdenv, fetchFromGitHub, buildGoPackage, go-bindata, go-bindata-assetfs }:
+
+buildGoPackage rec {
+ name = "drone.io-${version}";
+ version = "0.5-20161104-${stdenv.lib.strings.substring 0 7 revision}";
+ revision = "232df356afeeb4aec5e2959fa54b084dcadb267f";
+ goPackagePath = "github.com/drone/drone";
+
+ # These dependencies pulled (in `drone` buildprocess) via Makefile,
+ # so I extracted them here, all revisions pinned by same date, as ${version}
+ extraSrcs = [
+ {
+ goPackagePath = "github.com/drone/drone-ui";
+ src = fetchFromGitHub {
+ owner = "drone";
+ repo = "drone-ui";
+ rev = "e66df33b4620917a2e7b59760887cc3eed543664";
+ sha256 = "0d50xdzkh9akpf5c0sqgcgy11v2vz858l36jp5snr94zkrdkv0n1";
+ };
+ }
+ {
+ goPackagePath = "github.com/drone/mq";
+ src = fetchFromGitHub {
+ owner = "drone";
+ repo = "mq";
+ rev = "0f296601feeed952dabd038793864acdbefe6dbe";
+ sha256 = "1k7439c90l4w29g7wyixfmpbkap7bn8yh8zynbjyjf9qjzwsnw97";
+ };
+ }
+ {
+ goPackagePath = "github.com/tidwall/redlog";
+ src = fetchFromGitHub {
+ owner = "tidwall";
+ repo = "redlog";
+ rev = "54086c8553cd23aba652513a87d2b085ea961541";
+ sha256 = "12a7mk6r8figjinzkbisxcaly6sasggy62m8zs4cf35lpq2lhffq";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ src = fetchFromGitHub {
+ owner = "golang";
+ repo = "crypto";
+ rev = "9477e0b78b9ac3d0b03822fd95422e2fe07627cd";
+ sha256 = "1qcqai6nf1q50z9ga7r4ljnrh1qz49kwlcqpri4bknx732lqq0v5";
+ };
+ }
+ ];
+ nativeBuildInputs = [ go-bindata go-bindata-assetfs ];
+
+ preBuild = ''
+ go generate github.com/drone/drone/server/template
+ go generate github.com/drone/drone/store/datastore/ddl
+ '';
+
+ postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+ install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/drone
+ '';
+
+ src = fetchFromGitHub {
+ owner = "drone";
+ repo = "drone";
+ rev = revision;
+ sha256 = "0xrijcrlv3ag9n2kywkrhdkxyhxc8fs6zqn0hyav6a6jpqnsahg3";
+ };
+
+ meta = with stdenv.lib; {
+ maintainer = with maintainers; [ avnik ];
+ license = licenses.asl20;
+ description = "Continuous Integration platform built on container technology";
+ };
+}
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
old mode 100755
new mode 100644
index c66c0fc93b7..2a546c8c907
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
let
- version = "1.7.0";
+ version = "1.8.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
- sha256 = "1qc0kmb6wxsy73vf0k2x95jlfb5dicgxw8c63mfn7ryxrh8a42z5";
+ sha256 = "0fa8hfdxg903n1dqrqbm4069sr8rq6zx7zzybfyj7qz4mmayp24m";
};
docker_arm = fetchurl {
url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
- sha256 = "0jbgpv4y0fmvl1plri4ifj1vmk6rr82pncrccpz2k640nlniyhqi";
+ sha256 = "1rvvz34rsjxrgg59rda6v4k8zw16slwprnh4h5b16yhyp7lcx93q";
};
in
buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-ci-multi-runner";
rev = "v${version}";
- sha256 = "18wlab63fmmq9kgr0zmkgsr1kj6rjdqmyg87b7ryb9f40gmygcvj";
+ sha256 = "0svmy2dc4h6jll80y8j2ml7k0a9krknsp9d0zpsfkw3wcz1wfipl";
};
buildInputs = [ go-bindata ];
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 01d1c97ba96..6a752d08cff 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/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index 27c9cc7955f..b49719ae0b9 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -1,13 +1,22 @@
-{ stdenv, fetchurl, jre, makeWrapper }:
+{ stdenv, fetchurl, writeText, jre, makeWrapper, fetchMavenArtifact
+, mysqlSupport ? true, mysql_jdbc ? null }:
+
+assert mysqlSupport -> mysql_jdbc != null;
+
+with stdenv.lib;
+let
+ extraJars = optional mysqlSupport mysql_jdbc;
+
+in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "liquibase";
- version = "3.4.2";
+ version = "3.5.3";
src = fetchurl {
url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz";
- sha256 = "1kvxqjz8jmqpmb1clhp2asxmgfk6ynqjir8fldc321v9a5wnqby5";
+ sha256 = "04cpnfycv0ms70d70w8ijqp2yacj2svs7v3lk99z1bpq3rzx51gv";
};
buildInputs = [ jre makeWrapper ];
@@ -16,18 +25,38 @@ stdenv.mkDerivation rec {
tar xfz ${src}
'';
- installPhase = ''
- mkdir -p $out/{bin,lib,sdk}
- mv ./* $out/
- wrapProgram $out/liquibase --prefix PATH ":" ${jre}/bin --set LIQUIBASE_HOME $out;
- ln -s $out/liquibase $out/bin/liquibase
+ installPhase =
+ let addJars = dir: ''
+ for jar in ${dir}/*.jar; do
+ CP="\$CP":"\$jar"
+ done
+ '';
+ in ''
+ mkdir -p $out/{bin,lib,sdk}
+ mv ./* $out/
+
+ # we provide our own script
+ rm $out/liquibase
+
+ # there’s a lot of escaping, but I’m not sure how to improve that
+ cat > $out/bin/liquibase < 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 00000000000..ef89517966d
--- /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 00000000000..d80bd70dd72
--- /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/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix
index a7d6c42e6af..6919b03d47c 100644
--- a/pkgs/development/tools/misc/autobuild/default.nix
+++ b/pkgs/development/tools/misc/autobuild/default.nix
@@ -12,11 +12,6 @@ stdenv.mkDerivation rec {
doCheck = true;
- postInstall = ''
- wrapProgram $out/bin/ab{put,build}-sourceforge \
- --prefix PATH ":" "${stdenv.lib.makeBinPath [ openssh rsync ]}"
- '';
-
meta = {
description = "Continuous integration tool";
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index d4a2f80599f..6386d3176a9 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/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index 5ecc0421c36..e7520091d1d 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -1,16 +1,18 @@
{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev
-, libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3 }:
+, libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod
+, procps }:
stdenv.mkDerivation rec {
- name = "intel-gpu-tools-1.16";
+ name = "intel-gpu-tools-1.17";
src = fetchurl {
url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2";
- sha256 = "1q9sfb15081zm1rq4z67sfj13ryvbdha4fa6pdzdsfd9261nvgn6";
+ sha256 = "06pvmbsbff4bsi67n6x3jjngzy2llf8bplc75447ra1fwphc9jx6";
};
- buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11
- libXext libXv libXrandr glib bison libunwind python3 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod
+ libXext libXv libXrandr glib bison libunwind python3 procps ];
preBuild = ''
patchShebangs debugger/system_routine/pre_cpp.py
diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index e1741118fb0..4da105f9303 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation {
description = ''A package manager for Lua'';
license = stdenv.lib.licenses.mit ;
maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
};
}
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index 5eafbf68fb7..5152067efa1 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "strace-${version}";
- version = "4.13";
+ version = "4.14";
src = fetchurl {
url = "mirror://sourceforge/strace/${name}.tar.xz";
- sha256 = "d48f732576c91ece36a5843d63f9be054c40ef59f1e4773986042636861625d7";
+ sha256 = "0bvicjkqk3c09zyxgkakymiqr3618sa2dfpd9f3fdp23n8853vav";
};
nativeBuildInputs = [ perl ];
diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index 212ebd9c967..d88a06c6404 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
diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix
index 4b83c12bed7..e73d77f772d 100644
--- a/pkgs/development/tools/misc/trv/default.nix
+++ b/pkgs/development/tools/misc/trv/default.nix
@@ -1,6 +1,7 @@
{stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core_p4, async_p4, async_unix_p4
, re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find
-, cohttp, uri, tzdata}:
+, cohttp, conduit, magic-mime, uri, tzdata
+}:
assert stdenv.lib.versionOlder "4.02" ocaml.version;
@@ -16,7 +17,7 @@ stdenv.mkDerivation rec {
};
- buildInputs = [ ocaml findlib camlp4 ];
+ buildInputs = [ ocaml findlib camlp4 conduit magic-mime ];
propagatedBuildInputs = [ core_p4 async_p4 async_unix_p4
async_extra_p4 sexplib_p4 async_shell core_extended_p4
async_find cohttp uri re2_p4 ];
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
createFindlibDestdir = true;
dontStrip = true;
- installFlags = "SEMVER=${version} PREFIX=$out";
+ installFlags = "SEMVER=${version} PREFIX=$(out)";
meta = with stdenv.lib; {
homepage = https://github.com/afiniate/trv;
diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix
index 9c0d81cf004..8857e1d1e91 100644
--- a/pkgs/development/tools/misc/uhd/default.nix
+++ b/pkgs/development/tools/misc/uhd/default.nix
@@ -9,7 +9,7 @@
stdenv.mkDerivation rec {
name = "uhd-${version}";
- version = "3.9.3";
+ version = "3.10.1";
# UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz
# and xxx.yyy.zzz. Hrmpf...
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "EttusResearch";
repo = "uhd";
- rev = "release_003_009_003";
- sha256 = "0nbm8nrjd0l8jj1wq0kkgd8pifzysdyc7pvraq16m0dc01mr638h";
+ rev = "release_003_010_001_000";
+ sha256 = "1wypn1cspwx331ah7awajjhnpyjykiif0h1l4fb3lahxvsnkwi51";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix
index 234ff82b50a..6e2498bde64 100644
--- a/pkgs/development/tools/misc/uisp/default.nix
+++ b/pkgs/development/tools/misc/uisp/default.nix
@@ -8,9 +8,12 @@ stdenv.mkDerivation {
sha256 = "1bncxp5yxh9r1yrp04vvhfiva8livi1pwic7v8xj99q09zrwahvw";
};
+ NIX_CFLAGS_COMPILE = "-Wno-error";
+
meta = {
description = "Tool for AVR microcontrollers which can interface to many hardware in-system programmers";
license = stdenv.lib.licenses.gpl2;
homepage = http://savannah.nongnu.org/projects/uisp;
+ platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix
index a4c61a58b89..57c57969a88 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/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix
index 9adaa368997..b4710cc8406 100644
--- a/pkgs/development/tools/misc/universal-ctags/default.nix
+++ b/pkgs/development/tools/misc/universal-ctags/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "universal-ctags-${version}";
- version = "2016-07-06";
+ version = "2016-12-17";
src = fetchFromGitHub {
owner = "universal-ctags";
repo = "ctags";
- rev = "44a325a9db23063b231f6f041af9aaf19320d9b9";
- sha256 = "11vq901h121ckqgw52k9x7way3q38b7jd08vr1n2sjz7kxh0zdd0";
+ rev = "3093f73e81cddbea5d122dccd4fd9a6323ebbbd3";
+ sha256 = "091359v3p865d39gchpc1x5qplf1s1y4nsph344ng5x1nkx44qsi";
};
buildInputs = [ autoreconfHook pkgconfig ];
@@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
sed -i 's|/usr/bin/env perl|${perl}/bin/perl|' misc/optlib2c
'';
+ doCheck = true;
+
+ checkFlags = "units";
+
meta = with stdenv.lib; {
description = "A maintained ctags implementation";
homepage = "https://ctags.io/";
diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix
index 07cc55465d1..51f4de8eacc 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/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index 75d371b4ec8..57b4fe99b2f 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchgit, cmake, python, llvmPackages, boost, pythonPackages
+{ stdenv, fetchgit, cmake, llvmPackages, boost, python2Packages
}:
let
- inherit (pythonPackages) python;
-in pythonPackages.mkPythonDerivation rec {
+ inherit (python2Packages) python mkPythonDerivation waitress frozendict bottle;
+in mkPythonDerivation rec {
name = "ycmd-2016-01-12";
namePrefix = "";
@@ -15,7 +15,7 @@ in pythonPackages.mkPythonDerivation rec {
buildInputs = [ cmake boost ];
- propagatedBuildInputs = with pythonPackages; [ waitress frozendict bottle ];
+ propagatedBuildInputs = [ waitress frozendict bottle ];
buildPhase = ''
export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped}
@@ -24,7 +24,7 @@ in pythonPackages.mkPythonDerivation rec {
configurePhase = ":";
- installPhase = with pythonPackages; ''
+ installPhase = ''
mkdir -p $out/lib/ycmd/third_party $out/bin
cp -r ycmd/ CORE_VERSION libclang.so.* ycm_client_support.so ycm_core.so $out/lib/ycmd/
ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd
diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index 3e37de9bd10..12148625a05 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, transitional ? false}:
+{ stdenv, fetchzip, ocaml, transitional ? false }:
let
metafile = ./META;
@@ -6,11 +6,11 @@ in
stdenv.mkDerivation {
- name = "camlp5${if transitional then "_transitional" else ""}-6.16";
+ name = "camlp5${if transitional then "_transitional" else ""}-6.17";
- src = fetchurl {
- url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.16.tgz;
- sha256 = "1caqa2rl7rav7pfwv1l1j0j18yr1qzyyqz0wa9519x91ckznqi7x";
+ src = fetchzip {
+ url = https://github.com/camlp5/camlp5/archive/rel617.tar.gz;
+ sha256 = "0finmr6y0lyd7mnl61kmvwd32cmmf64m245vdh1iy0139rxf814c";
};
buildInputs = [ ocaml ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
Camlp5 is a preprocessor and pretty-printer for OCaml programs.
It also provides parsing and printing tools.
'';
- homepage = http://pauillac.inria.fr/~ddr/camlp5/;
+ homepage = https://camlp5.github.io/;
license = licenses.bsd3;
platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 1391bc6eb8a..71da6dd6d32 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ocaml-findlib-${version}";
- version = "1.6.1";
+ version = "1.7.1";
src = fetchurl {
url = "http://download.camlcity.org/download/findlib-${version}.tar.gz";
- sha256 = "02abg1lsnwvjg3igdyb8qjgr5kv1nbwl4gaf8mdinzfii5p82721";
+ sha256 = "1vsys5gpahi36nxv5yx29zhwn8b2d7sqqswza05vxy5bx5wrljsx";
};
buildInputs = [m4 ncurses ocaml];
diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch
index 7c9f8e1a6cc..096330a31ae 100644
--- a/pkgs/development/tools/ocaml/findlib/install_topfind.patch
+++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch
@@ -6,7 +6,7 @@
mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
+ test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)"
- files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a findlib.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
- cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
- f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
+ files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib.a findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top.a findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
+ cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
+ f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index 3c99c3b9580..7af1b5ccd7a 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.3";
hashes = {
"2.3.1" = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn";
- "2.5.1" = "0p3hqxawp18q43ws6506cnndi49f3gxzmai0x2qch7h42dgh1cb8";
+ "2.5.3" = "0qljklgcrpqdxzvcqj7b4785zcz322pjvw9cddbmzla33hagglha";
};
in
diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix
index 6feab7645f1..df6c66cb98f 100644
--- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix
@@ -1,17 +1,17 @@
{stdenv, fetchFromGitHub, ocaml, findlib, buildOcaml, type_conv, camlp4,
ocamlmod, ocamlify, ounit, expect}:
let
- version = "0.9.2";
+ version = "0.9.3";
in
stdenv.mkDerivation {
- name = "ocamlbuild";
+ name = "ocamlbuild-${version}";
inherit version;
src = fetchFromGitHub {
owner = "ocaml";
repo = "ocamlbuild";
rev = version;
- sha256 = "0q4bvik08v444g1pill9zgwal48xs50jf424lbryfvqghhw5xjjc";
+ sha256 = "1ikm51lx4jz5vmbvrdwsm5p59bwbz3pi22vqkyz5lmqcciyn69i3";
};
createFindlibDestdir = true;
@@ -25,18 +25,12 @@ stdenv.mkDerivation {
"OCAMLBUILD_LIBDIR=$OCAMLFIND_DESTDIR"
'';
- # configurePhase = "ocaml setup.ml -configure --prefix $out";
- # buildPhase = "ocaml setup.ml -build";
- # installPhase = "ocaml setup.ml -install";
-
- # meta = with stdenv.lib; {
- # homepage = http://oasis.forge.ocamlcore.org/;
- # description = "Configure, build and install system for OCaml projects";
- # license = licenses.lgpl21;
- # platforms = ocaml.meta.platforms or [];
- # maintainers = with maintainers; [
- # vbgl z77z
- # ];
- # };
+ meta = with stdenv.lib; {
+ homepage = https://github.com/ocaml/ocamlbuild/;
+ description = "A build system with builtin rules to easily build most OCaml projects";
+ license = licenses.lgpl2;
+ inherit (ocaml.meta) platforms;
+ maintainers = with maintainers; [ vbgl ];
+ };
}
diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix
index 721111f676f..6b865e9709a 100644
--- a/pkgs/development/tools/ocaml/ocp-index/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-index/default.nix
@@ -1,39 +1,30 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }:
+{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }:
let inherit (stdenv.lib) getVersion versionAtLeast optional; in
assert versionAtLeast (getVersion ocaml) "4";
-assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";
+assert versionAtLeast (getVersion ocpBuild) "1.99.13-beta";
assert versionAtLeast (getVersion ocpIndent) "1.4.2";
let
- version = "1.1.4";
- srcs = {
- "4.03.0" = {
- rev = "${version}-4.03";
- sha256 = "0c6s5radwyvxf9hrq2y9lirk72z686k9yzd0vgzy98yrrp1w56mv";
- };
- "4.02.3" = {
- rev = "${version}-4.02";
- sha256 = "057ss3lz754b2pznkb3zda5h65kjgqnvabvfqwqcz4qqxxki2yc8";
- };
- "4.01.0" = {
- rev = "${version}";
- sha256 = "106bnc8jhmjnychcl8k3gl9n6b50bc66qc5hqf1wkbkk9kz4vc9d";
- };
- };
-
- src = fetchFromGitHub ({
- owner = "OCamlPro";
- repo = "ocp-index";
- } // srcs."${ocaml.version}");
+ version = "1.1.5";
in
stdenv.mkDerivation {
name = "ocp-index-${version}";
- inherit src;
+ src = fetchFromGitHub {
+ owner = "OCamlPro";
+ repo = "ocp-index";
+ rev = version;
+ sha256 = "0gir0fm8mq609371kmwpsqfvpfx2b26ax3f9rg5fjf5r0bjk9pqd";
+ };
+
+ patches = [ (fetchpatch {
+ url = https://github.com/OCamlPro/ocp-index/commit/618872a0980d077857a63d502eadbbf0d1b05c0f.diff;
+ sha256 = "07snnydczkzapradh1c22ggv9vaff67nc36pi3218azb87mb1p7z";
+ }) ];
buildInputs = [ ocaml findlib ocpBuild opam cmdliner ncurses re libev ]
++ optional (versionAtLeast (getVersion lambdaTerm) "1.7") lambdaTerm;
diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix
index 451d025aa3c..53152898fd6 100644
--- a/pkgs/development/tools/ocaml/omake/default.nix
+++ b/pkgs/development/tools/ocaml/omake/default.nix
@@ -1,38 +1,24 @@
-{stdenv, fetchurl, makeWrapper, ocaml, ncurses}:
-let
- pname = "omake";
- version = "0.9.8.5-3";
- webpage = "http://omake.metaprl.org";
-in
-stdenv.mkDerivation {
+{ stdenv, fetchurl, ocaml, ncurses }:
- name = "${pname}-${version}";
+stdenv.mkDerivation rec {
+
+ name = "omake-${version}";
+ version = "0.10.1";
src = fetchurl {
- url = "mirror://debian/pool/main/o/omake/omake_${version}.orig.tar.gz";
- sha256 = "1bfxbsimfivq0ar2g5fkzvr5ql97n5dg562pfyd29y4zyh4mwrsv";
+ url = "http://download.camlcity.org/download/${name}.tar.gz";
+ sha256 = "093ansbppms90hiqvzar2a46fj8gm9iwnf8gn38s6piyp70lrbsj";
};
- patchFlags = "-p0";
- patches = [ ./omake-build-0.9.8.5.diff ./omake-lm_printf-gcc44.diff ];
- buildInputs = [ ocaml makeWrapper ncurses ];
-
- phases = "unpackPhase patchPhase buildPhase";
- buildPhase = ''
- make bootstrap
- make PREFIX=$out all
- make PREFIX=$out install
- '';
-# prefixKey = "-prefix ";
-#
-# configureFlags = if transitional then "--transitional" else "--strict";
-#
-# buildFlags = "world.opt";
+ buildInputs = [ ocaml ncurses ];
meta = {
description = "A build system designed for scalability and portability";
- homepage = "${webpage}";
- license = "GPL";
- broken = true;
+ homepage = http://projects.camlcity.org/projects/omake.html;
+ license = with stdenv.lib.licenses; [
+ mit /* scripts */
+ gpl2 /* program */
+ ];
+ inherit (ocaml.meta) platforms;
};
}
diff --git a/pkgs/development/tools/ocaml/omake/omake-build-0.9.8.5.diff b/pkgs/development/tools/ocaml/omake/omake-build-0.9.8.5.diff
deleted file mode 100644
index b0a091e341c..00000000000
--- a/pkgs/development/tools/ocaml/omake/omake-build-0.9.8.5.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/exec/omake_exec.ml 2006-12-08 23:52:01.000000000 +0100
-+++ src/exec/omake_exec.ml 2009-04-15 22:19:07.000000000 +0200
-@@ -46,7 +46,7 @@
- open Omake_options
- open Omake_command_type
-
--external sync : unit -> unit = "caml_sync"
-+(*external sync : unit -> unit = "caml_sync"*)
-
- module Exec =
- struct
diff --git a/pkgs/development/tools/ocaml/omake/omake-lm_printf-gcc44.diff b/pkgs/development/tools/ocaml/omake/omake-lm_printf-gcc44.diff
deleted file mode 100644
index 03665340f5f..00000000000
--- a/pkgs/development/tools/ocaml/omake/omake-lm_printf-gcc44.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/libmojave-external/cutil/lm_printf.c.orig 2007-07-15 19:55:23.000000000 +0200
-+++ src/libmojave-external/cutil/lm_printf.c 2009-06-21 19:20:40.000000000 +0200
-@@ -144,3 +144,3 @@
- if(bufp != buffer)
-- free(buffer);
-+ free(bufp);
- failwith("ml_print_string");
-@@ -149,3 +149,3 @@
- if(bufp != buffer)
-- free(buffer);
-+ free(bufp);
- return v_result;
-@@ -192,3 +192,3 @@
- if(bufp != buffer)
-- free(buffer);
-+ free(bufp);
- failwith("ml_print_string");
-@@ -197,3 +197,3 @@
- if(bufp != buffer)
-- free(buffer);
-+ free(bufp);
- return v_result;
diff --git a/pkgs/development/tools/parsing/jikespg/default.nix b/pkgs/development/tools/parsing/jikespg/default.nix
index 7cfb39ebded..6f0eb3735ff 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 753c91aa688..05546da67f0 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -1,30 +1,46 @@
-{stdenv, fetchurl, transfig, tex , ghostscript, colm, build-manual ? false
+{ stdenv, fetchurl, transfig, tex, ghostscript, colm
+, build-manual ? false
}:
-stdenv.mkDerivation rec {
- name = "ragel-${version}";
- version = "7.0.0.6";
+let
+ generic = { version, sha256 }:
+ stdenv.mkDerivation rec {
+ name = "ragel-${version}";
- src = fetchurl {
- url = "http://www.colm.net/files/ragel/${name}.tar.gz";
- sha256 = "1ns3kbcvhinn4rwm54ajg49d1la8filxskl3rgbwws0irzw507vs";
+ src = fetchurl {
+ url = "http://www.colm.net/files/ragel/${name}.tar.gz";
+ inherit sha256;
+ };
+
+ buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript tex ];
+
+ preConfigure = stdenv.lib.optional build-manual ''
+ sed -i "s/build_manual=no/build_manual=yes/g" DIST
+ '';
+
+ configureFlags = [ "--with-colm=${colm}" ];
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ homepage = http://www.complang.org/ragel;
+ description = "State machine compiler";
+ license = licenses.gpl2;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ pSub ];
+ };
+ };
+
+in
+
+{
+ ragelStable = generic {
+ version = "6.9";
+ sha256 = "02k6rwh8cr95f1p5sjjr3wa6dilg06572xz1v71dk8awmc7vw1vf";
};
- buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript tex ];
-
- preConfigure = stdenv.lib.optional build-manual ''
- sed -i "s/build_manual=no/build_manual=yes/g" DIST
- '';
-
- configureFlags = [ "--with-colm=${colm}" ];
-
- doCheck = true;
-
- meta = with stdenv.lib; {
- homepage = http://www.complang.org/ragel;
- description = "State machine compiler";
- license = licenses.gpl2;
- platforms = platforms.unix;
- maintainers = with maintainers; [ pSub ];
+ ragelDev = generic {
+ version = "7.0.0.9";
+ sha256 = "1w2jhfg3fxl15gcmm7z3jbi6splgc83mmwcfbp08lfc8sg2wmrmr";
};
}
diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix
new file mode 100644
index 00000000000..b383812d321
--- /dev/null
+++ b/pkgs/development/tools/rq/default.nix
@@ -0,0 +1,76 @@
+{ stdenv, fetchFromGitHub, rustPlatform, llvmPackages, v8 }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+ name = "rq-${version}";
+ version = "0.9.2";
+
+ src = fetchFromGitHub {
+ owner = "dflemstr";
+ repo = "rq";
+ rev = "v${version}";
+ sha256 = "051k7ls2mbjf584crayd654wm8m7gk3b7s73j97f9l8sbppdhpcq";
+ };
+
+ serde_json = fetchFromGitHub {
+ owner = "serde-rs";
+ repo = "json";
+ rev = "0c05059e4533368020bd356bd708c38286810a7d";
+ sha256 = "0924ngqbsif2vmmpgn8l2gg4bzms0z0i7yng0zx6sdv0x836lw43";
+ };
+
+ v8_rs = fetchFromGitHub {
+ owner = "dflemstr";
+ repo = "v8-rs";
+ rev = "0772be5b2e84842a2d434963702bc2995aeda90b";
+ sha256 = "0h2n431rp6nqpip7dy7xpckkvcr19aq7l1f3x3wlrj02xi4c8mad";
+ };
+
+ cargoDepsHook = ''
+ # use non-git dependencies
+ (cd $sourceRoot && patch -p1 <= '0500':
-+ return 'x86_64'
- return 'i386'
-- version, build = self._XcodeVersion()
-- if version >= '0500':
-+ except:
- return 'x86_64'
-- return 'i386'
-
- class MacPrefixHeader(object):
- """A class that helps with emulating Xcode's GCC_PREFIX_HEADER feature.
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index a45a95680b1..0b6ec87f00a 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -56,7 +56,13 @@ in
'';
postInstall = ''
+ paxmark m $out/bin/node
PATH=$out/bin:$PATH patchShebangs $out
+
+ ${optionalString enableNpm ''
+ mkdir -p $out/share/bash-completion/completions/
+ $out/bin/npm completion > $out/share/bash-completion/completions/npm
+ ''}
'';
meta = {
@@ -66,4 +72,6 @@ in
maintainers = with maintainers; [ goibhniu havvy gilligan cko ];
platforms = platforms.linux ++ platforms.darwin;
};
+
+ passthru.python = python2; # to ensure nodeEnv uses the same version
}
diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix
index 04ea7086f74..9a142a89677 100644
--- a/pkgs/development/web/nodejs/v4.nix
+++ b/pkgs/development/web/nodejs/v4.nix
@@ -10,11 +10,11 @@ let
baseName = if enableNpm then "nodejs" else "nodejs-slim";
in
stdenv.mkDerivation (nodejs // rec {
- version = "4.6.0";
+ version = "4.6.2";
name = "${baseName}-${version}";
src = fetchurl {
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
- sha256 = "1566q1kkv8j30fgqx8sm2h8323f38wwpa1hfb10gr6z46jyhv4a2";
+ sha256 = "17ick2r2biyxs5zf83i8q8844fbcphm0d5g1z70mcrb86yrmi545";
};
})
diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix
deleted file mode 100644
index 7cd406abd2c..00000000000
--- a/pkgs/development/web/nodejs/v5.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser
-, pkgconfig, runCommand, which, libtool
-, callPackage
-}@args:
-
-import ./nodejs.nix (args // rec {
- version = "5.12.0";
- src = fetchurl {
- url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
- sha256 = "4f926373f11f2a25156eee1804ec012eb912c42e5d34fc2909889da22efdadfe";
- };
-})
diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix
index 50bd2cb672e..b91ec8df687 100644
--- a/pkgs/development/web/nodejs/v6.nix
+++ b/pkgs/development/web/nodejs/v6.nix
@@ -10,19 +10,12 @@ let
baseName = if enableNpm then "nodejs" else "nodejs-slim";
in
stdenv.mkDerivation (nodejs // rec {
- version = "6.8.0";
+ version = "6.9.1";
name = "${baseName}-${version}";
src = fetchurl {
url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
- sha256 = "13arzwki13688hr1lh871y06lrk019g4hkasmg11arm8j1dcwcpq";
+ sha256 = "0a87vzb33xdg8w0xi3c605hfav3c9m4ylab1436whz3p0l9qvp8b";
};
- patches = nodejs.patches ++ [
- (fetchpatch {
- url = "https://github.com/nodejs/node/commit/fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4.patch";
- sha256 = "1rms3n09622xmddn013yvf5c6p3s8w8s0d2h813zs8c1l15k4k1i";
- })
- ];
-
})
diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix
index 420f2b0412f..659aa47985a 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.2.1";
name = "${baseName}-${version}";
src = fetchurl {
url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
- sha256 = "16l9r91z4dxmgc01fs1y8jdh8xjnmyyrq60isyznnxfnq9v3qv71";
+ sha256 = "03fqv6k8y42ldnrz4iirhwg6wdyw8z95h9h40igiriicbnm072y0";
};
- patches = nodejs.patches ++ [
- (fetchpatch {
- url = "https://github.com/nodejs/node/commit/fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4.patch";
- sha256 = "1rms3n09622xmddn013yvf5c6p3s8w8s0d2h813zs8c1l15k4k1i";
- })
- ];
-
})
diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix
index e7a3f74d2b8..4d6c2d6662c 100644
--- a/pkgs/development/web/remarkjs/nodepkgs.nix
+++ b/pkgs/development/web/remarkjs/nodepkgs.nix
@@ -6,7 +6,7 @@
let
nodeEnv = import ../../node-packages/node-env.nix {
- inherit (pkgs) stdenv python utillinux runCommand writeTextFile;
+ inherit (pkgs) stdenv utillinux runCommand writeTextFile;
inherit nodejs;
};
in
diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix
index 6b4dface0e1..68ef1fd5392 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 e4d4e3cb8e4..f038673f4c0 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/crawl/crawl_purify.patch b/pkgs/games/crawl/crawl_purify.patch
index bfd79844bcb..766b633057d 100644
--- a/pkgs/games/crawl/crawl_purify.patch
+++ b/pkgs/games/crawl/crawl_purify.patch
@@ -1,6 +1,6 @@
-diff -ru3 crawl-ref-0.18.1-src-old/crawl-ref/source/Makefile crawl-ref-0.18.1-src/crawl-ref/source/Makefile
---- crawl-ref-0.18.1-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300
-+++ crawl-ref-0.18.1-src/crawl-ref/source/Makefile 2016-09-04 17:25:54.310929928 +0300
+diff -ru3 crawl-ref-0.19.1-src-old/crawl-ref/source/Makefile crawl-ref-0.19.1-src/crawl-ref/source/Makefile
+--- crawl-ref-0.19.1-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300
++++ crawl-ref-0.19.1-src/crawl-ref/source/Makefile 2016-11-23 15:37:15.303077886 +0300
@@ -285,7 +285,7 @@
LIBZ := contrib/install/$(ARCH)/lib/libz.a
@@ -10,27 +10,22 @@ diff -ru3 crawl-ref-0.18.1-src-old/crawl-ref/source/Makefile crawl-ref-0.18.1-sr
else
# This is totally wrong, works only with some old-style setups, and
# on some architectures of Debian/new FHS multiarch -- excluding, for
-@@ -957,9 +957,9 @@
- SYS_PROPORTIONAL_FONT = $(shell { name=$(OUR_PROPORTIONAL_FONT);\
- {\
- fc-list | sed 's/: .*//' | grep -Fi "/$$name";\
-- for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\
-+ for dir in ${dejavu_fonts}/share/fonts;\
- do [ -d $$dir ] && echo $$dir; done;\
-- } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null)
-+ } | xargs -I% find -L % -type f -iname $$name -print | head -n1; } 2>/dev/null)
- ifneq (,$(SYS_PROPORTIONAL_FONT))
- ifeq (,$(COPY_FONTS))
- DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\"
-@@ -982,9 +982,9 @@
- SYS_MONOSPACED_FONT = $(shell { name=$(OUR_MONOSPACED_FONT);\
- {\
- fc-list | sed 's/: .*//' | grep -Fi "/$$name";\
-- for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\
-+ for dir in ${dejavu_fonts}/share/fonts;\
- do [ -d $$dir ] && echo $$dir; done;\
-- } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null)
-+ } | xargs -I% find -L % -type f -iname $$name -print | head -n1; } 2>/dev/null)
- ifneq (,$(SYS_MONOSPACED_FONT))
- ifeq (,$(COPY_FONTS))
- DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\"
+diff -ru3 crawl-ref-0.19.1-src-old/crawl-ref/source/util/find_font crawl-ref-0.19.1-src/crawl-ref/source/util/find_font
+--- crawl-ref-0.19.1-src-old/crawl-ref/source/util/find_font 1970-01-01 03:00:01.000000000 +0300
++++ crawl-ref-0.19.1-src/crawl-ref/source/util/find_font 2016-11-23 15:39:04.044031141 +0300
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+
+-FONTDIRS="/usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts"
++FONTDIRS="${fontsPath}/share/fonts"
+
+ name=$1
+ [ "$name" ] || { echo "Usage: $0 " >&2; exit 100; }
+@@ -11,6 +11,6 @@
+ for dir in $FONTDIRS; do
+ [ -d "$dir" ] && echo "$dir"
+ done
+- } | xargs -I% find % \( -type f -o -type l \) -iname "$name" -print \
++ } | xargs -I% find -L % \( -type f -o -type l \) -iname "$name" -print \
+ | head -n1
+ } 2>/dev/null
diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index 2a1e9232c23..dc84b18547b 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -1,27 +1,26 @@
-{ stdenv, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses
-, dejavu_fonts, libpng, SDL2, SDL2_image, mesa, freetype, pngcrush
+{ stdenv, lib, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses
+, dejavu_fonts, libpng, SDL2, SDL2_image, mesa, freetype, pngcrush, advancecomp
, tileMode ? false
}:
stdenv.mkDerivation rec {
- name = "crawl-${version}" + (if tileMode then "-tiles" else "");
- version = "0.18.1";
+ name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
+ version = "0.19.1";
src = fetchFromGitHub {
owner = "crawl-ref";
repo = "crawl-ref";
rev = version;
- sha256 = "1cg5mxhx0lfhadls6n8avcpkjx08nqf1y085li97zqxl3gjaj64j";
+ sha256 = "02iklz5q5h7h27gw86ws8wk5gz1fg86jclkar05nd7zxxgiwsk96";
};
patches = [ ./crawl_purify.patch ];
- nativeBuildInputs = [ pkgconfig which perl pngcrush ];
+ nativeBuildInputs = [ pkgconfig which perl pngcrush advancecomp ];
# Still unstable with luajit
buildInputs = [ lua5_1 zlib sqlite ncurses ]
- ++ stdenv.lib.optionals tileMode
- [ libpng SDL2 SDL2_image freetype mesa ];
+ ++ lib.optionals tileMode [ libpng SDL2 SDL2_image freetype mesa ];
preBuild = ''
cd crawl-ref/source
@@ -33,17 +32,19 @@ stdenv.mkDerivation rec {
rm -rf contrib
'';
- makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++"
- "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" ]
- ++ stdenv.lib.optionals tileMode [ "TILES=y" "dejavu_fonts=${dejavu_fonts}" ];
+ fontsPath = lib.optionalString tileMode dejavu_fonts;
- postInstall = if tileMode then "mv $out/bin/crawl $out/bin/crawl-tiles" else "";
+ makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++"
+ "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}"
+ ] ++ lib.optional tileMode "TILES=y";
+
+ postInstall = lib.optionalString tileMode "mv $out/bin/crawl $out/bin/crawl-tiles";
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Open-source, single-player, role-playing roguelike game";
- homepage = http://crawl.develz.org/;
+ homepage = "http://crawl.develz.org/";
longDescription = ''
Open-source, single-player, role-playing roguelike game of exploration and
treasure-hunting in dungeons filled with dangerous and unfriendly monsters
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index 64109279060..d26258081fc 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -7,11 +7,8 @@ let
self = rec {
dwarf-fortress-original = callPackage ./game.nix { };
- dfhack = callPackage_i686 ./dfhack {
- inherit (pkgsi686Linux.perlPackages) XMLLibXML XMLLibXSLT;
- protobuf = with pkgsi686Linux; protobuf.override {
- stdenv = overrideInStdenv stdenv [ useOldCXXAbi ];
- };
+ dfhack = callPackage ./dfhack {
+ inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT;
};
dwarf-fortress-unfuck = callPackage ./unfuck.nix { };
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index 17697192007..74dddbe8df9 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -1,16 +1,23 @@
{ stdenv, fetchgit, cmake, writeScriptBin
, perl, XMLLibXML, XMLLibXSLT
, zlib
-, jsoncpp, protobuf, tinyxml
}:
let
- dfVersion = "0.43.03";
- version = "${dfVersion}-r1";
+ dfVersion = "0.43.05";
+ # version = "${dfVersion}-r1";
+ # rev = "refs/tags/${version}";
+ version = "${dfVersion}-alpha2";
+ rev = "13eb5e702beb6d8e40c0e17be64cda9a8d9d1efb";
+ sha256 = "18i8qfhhfnfrpa519akwagn73q2zns1pry2sdfag63vffxh60zr5";
- rev = "refs/tags/${version}";
# revision of library/xml submodule
- xmlRev = "98cc1e01886aaea161d651cf97229ad08e9782b0";
+ xmlRev = "84f6e968a9ec5515f9dbef96b445e3fc83f83e8b";
+
+ arch =
+ if stdenv.system == "x86_64-linux" then "64"
+ else if stdenv.system == "i686-linux" then "32"
+ else throw "Unsupported architecture";
fakegit = writeScriptBin "git" ''
#! ${stdenv.shell}
@@ -35,17 +42,20 @@ in stdenv.mkDerivation rec {
# Beware of submodules
src = fetchgit {
url = "https://github.com/DFHack/dfhack";
- inherit rev;
- sha256 = "0m5kqpaz0ypji4c32w0hhbsicvgvnjh56pqvq7af6pqqnyg1nzcx";
+ inherit rev sha256;
};
- patches = [ ./use-system-libraries.patch ];
+ patches = [ ./skip-ruby.patch ];
nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ];
- # we can't use native Lua; upstream uses private headers
- buildInputs = [ zlib jsoncpp protobuf tinyxml ];
+ # We don't use system libraries because dfhack needs old C++ ABI.
+ buildInputs = [ zlib ];
- cmakeFlags = [ "-DEXTERNAL_TINYXML=ON" ];
+ preBuild = ''
+ export LD_LIBRARY_PATH="$PWD/depends/protobuf:$LD_LIBRARY_PATH"
+ '';
+
+ cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" ];
enableParallelBuilding = true;
@@ -55,7 +65,7 @@ in stdenv.mkDerivation rec {
description = "Memory hacking library for Dwarf Fortress and a set of tools that use it";
homepage = "https://github.com/DFHack/dfhack/";
license = licenses.zlib;
- platforms = [ "i686-linux" ];
+ platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = with maintainers; [ robbinch a1russell abbradar ];
};
}
diff --git a/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch b/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch
new file mode 100644
index 00000000000..619060dc253
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch
@@ -0,0 +1,16 @@
+diff -ru3 dfhack-ae59b4f/plugins/ruby/CMakeLists.txt dfhack-ae59b4f-new/plugins/ruby/CMakeLists.txt
+--- dfhack-ae59b4f/plugins/ruby/CMakeLists.txt 1970-01-01 03:00:01.000000000 +0300
++++ dfhack-ae59b4f-new/plugins/ruby/CMakeLists.txt 2016-11-23 15:29:09.907286546 +0300
+@@ -1,3 +1,4 @@
++IF(FALSE)
+ IF (APPLE)
+ SET(RUBYLIB ${CMAKE_CURRENT_SOURCE_DIR}/osx${DFHACK_BUILD_ARCH}/libruby.dylib)
+ SET(RUBYLIB_INSTALL_NAME "libruby.dylib")
+@@ -48,6 +49,7 @@
+ "482c1c418f4ee1a5f04203eee1cda0ef")
+ ENDIF()
+ ENDIF()
++ENDIF()
+
+ IF (APPLE OR UNIX)
+ SET(RUBYAUTOGEN ruby-autogen-gcc.rb)
diff --git a/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch b/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch
deleted file mode 100644
index e33fec9f87e..00000000000
--- a/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 956edfc..fb0e6bc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -160,8 +160,6 @@ ELSEIF(MSVC)
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od")
- ENDIF()
-
--# use shared libraries for protobuf
--ADD_DEFINITIONS(-DPROTOBUF_USE_DLLS)
- ADD_DEFINITIONS(-DLUA_BUILD_AS_DLL)
-
- if(APPLE)
-@@ -182,10 +180,8 @@ else()
- set(ZLIB_ROOT /usr/lib/i386-linux-gnu)
- endif()
- find_package(ZLIB REQUIRED)
--include_directories(depends/protobuf)
- include_directories(depends/lua/include)
- include_directories(depends/md5)
--include_directories(depends/jsoncpp)
-
- # Support linking against external tinyxml
- # If we find an external tinyxml, set the DFHACK_TINYXML variable to "tinyxml"
-diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
-index d8442b1..b47dc2a 100644
---- a/depends/CMakeLists.txt
-+++ b/depends/CMakeLists.txt
-@@ -1,7 +1,6 @@
- #list depends here.
- add_subdirectory(lua)
- add_subdirectory(md5)
--add_subdirectory(protobuf)
-
- # Don't build tinyxml if it's being externally linked against.
- if(NOT TinyXML_FOUND)
-@@ -9,7 +8,6 @@ if(NOT TinyXML_FOUND)
- endif()
-
- add_subdirectory(tthread)
--add_subdirectory(jsoncpp)
- # build clsocket static and only as a dependency. Setting those options here overrides its own default settings.
- OPTION(CLSOCKET_SHARED "Build clsocket lib as shared." OFF)
- OPTION(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependency." ON)
-diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
-index d3e3480..5d4b572 100644
---- a/library/CMakeLists.txt
-+++ b/library/CMakeLists.txt
-@@ -223,10 +223,10 @@ LIST(APPEND PROJECT_SOURCES ${PROJECT_PROTO_SRCS})
-
- ADD_CUSTOM_COMMAND(
- OUTPUT ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS}
-- COMMAND protoc-bin -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/
-+ COMMAND protoc -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/
- --cpp_out=dllexport_decl=DFHACK_EXPORT:${CMAKE_CURRENT_SOURCE_DIR}/proto/
- ${PROJECT_PROTOS}
-- DEPENDS protoc-bin ${PROJECT_PROTOS}
-+ DEPENDS ${PROJECT_PROTOS}
- )
-
- # Merge headers into sources
-diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
-index c24b940..afeb888 100644
---- a/plugins/CMakeLists.txt
-+++ b/plugins/CMakeLists.txt
-@@ -47,11 +47,11 @@ STRING(REPLACE ".proto" ".pb.h" PROJECT_PROTO_HDRS "${PROJECT_PROTOS}")
-
- ADD_CUSTOM_COMMAND(
- OUTPUT ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS}
-- COMMAND protoc-bin -I=${dfhack_SOURCE_DIR}/library/proto/
-+ COMMAND protoc -I=${dfhack_SOURCE_DIR}/library/proto/
- -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/
- --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto/
- ${PROJECT_PROTOS}
-- DEPENDS protoc-bin ${PROJECT_PROTOS}
-+ DEPENDS ${PROJECT_PROTOS}
- )
- add_custom_target(generate_proto DEPENDS ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS})
-
-diff --git a/plugins/stockpiles/CMakeLists.txt b/plugins/stockpiles/CMakeLists.txt
-index 713c3d6..dd2d4cb 100644
---- a/plugins/stockpiles/CMakeLists.txt
-+++ b/plugins/stockpiles/CMakeLists.txt
-@@ -33,8 +33,8 @@ LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS})
- #Generate sources from our proto files and store them in the source tree
- ADD_CUSTOM_COMMAND(
- OUTPUT ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS}
--COMMAND protoc-bin -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto/ ${PROJECT_PROTOS}
--DEPENDS protoc-bin ${PROJECT_PROTOS}
-+COMMAND protoc -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto/ ${PROJECT_PROTOS}
-+DEPENDS ${PROJECT_PROTOS}
- )
-
- IF(WIN32)
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index c13bfd4d3f2..57610fb1c1c 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -26,11 +26,11 @@ stdenv.mkDerivation rec {
rm $out/bin/dwarftherapist
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Tool to manage dwarves in in a running game of Dwarf Fortress";
- maintainers = with stdenv.lib.maintainers; [ the-kenny abbradar ];
- license = stdenv.lib.licenses.mit;
- platforms = stdenv.lib.platforms.linux;
+ maintainers = with maintainers; [ the-kenny abbradar ];
+ license = licenses.mit;
+ platforms = platforms.linux;
homepage = "https://github.com/splintermind/Dwarf-Therapist";
};
}
diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix
index 3933d62b1d3..d5b6ac6c686 100644
--- a/pkgs/games/dwarf-fortress/themes/cla.nix
+++ b/pkgs/games/dwarf-fortress/themes/cla.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "cla-theme-${version}";
- version = "43.04-v23";
+ version = "43.05-v23";
src = fetchFromGitHub {
owner = "DFgraphics";
repo = "CLA";
rev = version;
- sha256 = "0a88jkcli9iq0prg5w0xh1cyms0b7dnc9rdahn7wy7fyakyp7s27";
+ sha256 = "1i74lyz7mpfrvh5g7rajxldhw7zddc2kp8f6bgfr3hl5l8ym5ci9";
};
installPhase = ''
diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix
index 01ae192e75e..57f00e89b99 100644
--- a/pkgs/games/dwarf-fortress/themes/phoebus.nix
+++ b/pkgs/games/dwarf-fortress/themes/phoebus.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "phoebus-theme-${version}";
- version = "43.03";
+ version = "43.05c";
src = fetchFromGitHub {
owner = "DFgraphics";
repo = "Phoebus";
rev = version;
- sha256 = "1mga5w3mks3bm6qch7azffr51g3q26za7hnas4qmxfs3m56bjav7";
+ sha256 = "0wiz9rd5ypibgh8854h5n2xwksfxylaziyjpbp3p1rkm3r7kr4fd";
};
installPhase = ''
diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index 89000115f4a..4b71b437705 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -30,11 +30,14 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
+ # Breaks dfhack because of inlining.
+ hardeningDisable = [ "fortify" ];
+
passthru.dfVersion = "0.43.05";
meta = with stdenv.lib; {
description = "Unfucked multimedia layer for Dwarf Fortress";
- homepage = https://github.com/svenstaro/dwarf_fortress_unfuck;
+ homepage = "https://github.com/svenstaro/dwarf_fortress_unfuck";
license = licenses.free;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 5493cdb3faf..15b51631b33 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -17,17 +17,12 @@ let
env = buildEnv {
name = "dwarf-fortress-env-${dwarf-fortress-original.dfVersion}";
+
paths = pkgs;
+ pathsToLink = [ "/" "/hack" ];
ignoreCollisions = true;
+
postBuild = lib.optionalString enableDFHack ''
- # #4621
- if [ -L "$out/hack" ]; then
- rm $out/hack
- mkdir $out/hack
- for i in ${dfhack}/hack/*; do
- ln -s $i $out/hack
- done
- fi
rm $out/hack/symbols.xml
substitute ${dfhack}/hack/symbols.xml $out/hack/symbols.xml \
--replace $(cat ${dwarf-fortress-original}/hash.md5.orig) \
diff --git a/pkgs/games/dwarf-fortress/wrapper/dfhack.in b/pkgs/games/dwarf-fortress/wrapper/dfhack.in
index d53769ca4b6..c8d8d287403 100644
--- a/pkgs/games/dwarf-fortress/wrapper/dfhack.in
+++ b/pkgs/games/dwarf-fortress/wrapper/dfhack.in
@@ -8,4 +8,4 @@ done
cd "$DF_DIR"
LD_LIBRARY_PATH="$env_dir/hack/libs:$env_dir/hack:$LD_LIBRARY_PATH" \
- LD_PRELOAD=$env_dir/hack/libdfhack.so exec $env_dir/libs/Dwarf_Fortress "$@"
+ LD_PRELOAD="$env_dir/hack/libdfhack.so:$LD_PRELOAD" exec $env_dir/libs/Dwarf_Fortress "$@"
diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix
new file mode 100644
index 00000000000..f993ad1b8e0
--- /dev/null
+++ b/pkgs/games/endless-sky/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchFromGitHub
+, SDL2, libpng, libjpeg, glew, openal, scons
+}:
+
+let
+ version = "0.9.4";
+
+in
+stdenv.mkDerivation rec {
+ name = "endless-sky-${version}";
+
+ src = fetchFromGitHub {
+ owner = "endless-sky";
+ repo = "endless-sky";
+ rev = "v${version}";
+ sha256 = "1mirdcpap0a280j472lhmhqg605b7glvdr4l93qcapk8an8d46m7";
+ };
+
+ enableParallelBuilding = true;
+
+ buildInputs = [
+ SDL2 libpng libjpeg glew openal scons
+ ];
+
+ patches = [
+ ./fixes.patch
+ ];
+
+ buildPhase = ''
+ scons -j$NIX_BUILD_CORES PREFIX="$out"
+ '';
+
+ installPhase = ''
+ scons -j$NIX_BUILD_CORES install PREFIX="$out"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A sandbox-style space exploration game similar to Elite, Escape Velocity, or Star Control";
+ homepage = "https://endless-sky.github.io/";
+ license = with licenses; [
+ gpl3Plus cc-by-sa-30 cc-by-sa-40 publicDomain
+ ];
+ maintainers = with maintainers; [ lheckemann ];
+ platforms = with platforms; allBut darwin;
+ };
+}
diff --git a/pkgs/games/endless-sky/fixes.patch b/pkgs/games/endless-sky/fixes.patch
new file mode 100644
index 00000000000..cad7a6acaed
--- /dev/null
+++ b/pkgs/games/endless-sky/fixes.patch
@@ -0,0 +1,45 @@
+diff --git a/SConstruct b/SConstruct
+index 48fd080..419b40d 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1,7 +1,7 @@
+ import os
+
+ # Load any environment variables that alter the build.
+-env = Environment()
++env = Environment(ENV = os.environ)
+ if 'CCFLAGS' in os.environ:
+ env.Append(CCFLAGS = os.environ['CCFLAGS'])
+ if 'CXXFLAGS' in os.environ:
+@@ -55,7 +55,7 @@ sky = env.Program("endless-sky", Glob("build/" + env["mode"] + "/*.cpp"))
+
+
+ # Install the binary:
+-env.Install("$DESTDIR$PREFIX/games", sky)
++env.Install("$DESTDIR$PREFIX/bin", sky)
+
+ # Install the desktop file:
+ env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop")
+diff --git a/source/Files.cpp b/source/Files.cpp
+index c8c8957..d196459 100644
+--- a/source/Files.cpp
++++ b/source/Files.cpp
+@@ -114,15 +114,9 @@ void Files::Init(const char * const *argv)
+ if(resources.back() != '/')
+ resources += '/';
+ #if defined __linux__ || defined __FreeBSD__ || defined __DragonFly__
+- // Special case, for Linux: the resource files are not in the same place as
+- // the executable, but are under the same prefix (/usr or /usr/local).
+- static const string LOCAL_PATH = "/usr/local/";
+- static const string STANDARD_PATH = "/usr/";
+- static const string RESOURCE_PATH = "share/games/endless-sky/";
+- if(!resources.compare(0, LOCAL_PATH.length(), LOCAL_PATH))
+- resources = LOCAL_PATH + RESOURCE_PATH;
+- else if(!resources.compare(0, STANDARD_PATH.length(), STANDARD_PATH))
+- resources = STANDARD_PATH + RESOURCE_PATH;
++ // Workaround for NixOS. Not sure how to proceed with other OSes, feedback
++ // is welcome.
++ resources += "../share/games/endless-sky/";
+ #elif defined __APPLE__
+ // Special case for Mac OS X: the resources are in ../Resources relative to
+ // the folder the binary is in.
diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix
index 9aee664a50e..9b0ada3f926 100644
--- a/pkgs/games/gnuchess/default.nix
+++ b/pkgs/games/gnuchess/default.nix
@@ -3,10 +3,10 @@ let
s = # Generated upstream information
rec {
baseName="gnuchess";
- version="6.2.3";
+ version="6.2.4";
name="${baseName}-${version}";
url="mirror://gnu/chess/${name}.tar.gz";
- sha256="10hvnfhj9bkpz80x20jgxyqvgvrcgfdp8sfcbcrf1dgjn9v936bq";
+ sha256="1vw2w3jwnmn44d5vsw47f8y70xvxcsz9m5msq9fgqlzjch15qhiw";
};
buildInputs = [
flex
diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix
new file mode 100644
index 00000000000..e89d16b788a
--- /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/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index 332c2fbeff1..9e6cc48b435 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -1,34 +1,51 @@
-{stdenv, fetchFromGitHub, cmake, fmod, mesa, SDL2}:
+{ stdenv, fetchFromGitHub, cmake, zdoom
+, openal, fluidsynth, soundfont-fluid, mesa_noglu, SDL2
+, bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }:
-stdenv.mkDerivation {
- name = "gzdoom-2015-05-07";
- src = fetchFromGitHub{
+stdenv.mkDerivation rec {
+ name = "gzdoom-${version}";
+ version = "2.2.0";
+
+ src = fetchFromGitHub {
owner = "coelckers";
repo = "gzdoom";
- rev = "a59824cd8897dea5dd452c31be1328415478f990";
- sha256 = "1lg9dk5prn2bjmyznq941a862alljvfgbb42whbpg0vw9vhpikak";
+ rev = "g${version}";
+ sha256 = "0xxgd8fa29pcdir1xah5cvx41bfy76p4dydpp13mf44p9pr29hrb";
};
- buildInputs = [ cmake fmod mesa SDL2 ];
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [
+ SDL2 mesa_noglu openal fluidsynth bzip2 zlib libjpeg libsndfile mpg123
+ game-music-emu
+ ];
- cmakeFlags = [ "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" ];
+ enableParallelBuilding = true;
- preConfigure=''
- sed s@gzdoom.pk3@$out/share/gzdoom.pk3@ -i src/version.h
+ NIX_CFLAGS_LINK = [ "-lopenal" "-lfluidsynth" ];
+
+ preConfigure = ''
+ sed -i \
+ -e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \
+ -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \
+ src/sound/music_fluidsynth_mididevice.cpp
'';
installPhase = ''
- mkdir -p $out/bin
- cp gzdoom $out/bin
- mkdir -p $out/share
- cp gzdoom.pk3 $out/share
+ install -Dm755 gzdoom "$out/lib/gzdoom/gzdoom"
+ for i in *.pk3; do
+ install -Dm644 "$i" "$out/lib/gzdoom/$i"
+ done
+ mkdir $out/bin
+ ln -s $out/lib/gzdoom/gzdoom $out/bin/gzdoom
'';
- meta = {
- homepage = https://github.com/coelckers/gzdoom;
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/coelckers/gzdoom";
description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features";
- license = stdenv.lib.licenses.unfree;
- maintainers = [ stdenv.lib.maintainers.lassulus ];
+ # Doom source license, MAME license
+ license = licenses.unfreeRedistributable;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ lassulus ];
};
}
diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix
index 3cd35c728bf..781dc5e31d8 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.1";
src = fetchurl {
url = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar";
- sha256 = "08bss3laa265aavdgivzsv7asd5s2sdqnlqr767j3yf54y14cpqr";
+ sha256 = "161cwwcv73zisac1biz9arrby8y8n0j4bn9hz9rvy8dszlrbq0l0";
};
preferLocalBuild = true;
diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix
index 2e528a8203f..00d4fbf8451 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/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix
index f03b8dde13e..81077d9461f 100644
--- a/pkgs/games/quake3/ioquake/default.nix
+++ b/pkgs/games/quake3/ioquake/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "ioquake3-git-${version}";
- version = "2016-08-11";
+ version = "2016-11-02";
src = fetchFromGitHub {
owner = "ioquake";
repo = "ioq3";
- rev = "1cf0b21cda562bade9152958f1525e5ac281ab9c";
- sha256 = "104yrgi9dnfb493pm9wvk2kn80nazcr1nllb5vd7di66jnvcjks0";
+ rev = "1c1e1f61f180596c925a4ac0eddba4806d1369cd";
+ sha256 = "1sx78hzvcbc05g2ikxcmnm6lq7bhgd86dzxnfzqpibcvgrlgsmy1";
};
nativeBuildInputs = [ which pkgconfig ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = http://ioquake3.org/;
+ homepage = "http://ioquake3.org/";
description = "First person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix
index 6be9b06e907..b246a94715e 100644
--- a/pkgs/games/rogue/default.nix
+++ b/pkgs/games/rogue/default.nix
@@ -4,7 +4,11 @@ stdenv.mkDerivation {
name = "rogue-5.4.4";
src = fetchurl {
- url = http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz;
+ urls = [
+ "http://pkgs.fedoraproject.org/repo/pkgs/rogue/rogue5.4.4-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue5.4.4-src.tar.gz"
+ "http://ftp.vim.org/ftp/pub/ftp/os/Linux/distr/slitaz/sources/packages-cooking/r/rogue5.4.4-src.tar.gz"
+ "http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz"
+ ];
sha256 = "18g81274d0f7sr04p7h7irz0d53j6kd9j1y3zbka1gcqq0gscdvx";
};
diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix
index be921bf1189..dd4069e1c11 100644
--- a/pkgs/games/scorched3d/default.nix
+++ b/pkgs/games/scorched3d/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = [ "-lopenal" ];
meta = with stdenv.lib; {
- homepage = http://scorched3d.co.uk/;
+ homepage = "http://scorched3d.co.uk/";
description = "3D Clone of the classic Scorched Earth";
license = licenses.gpl2Plus;
platforms = platforms.linux; # maybe more
diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix
index 2cdbfb096e2..38d73f59dee 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@@ -58,7 +58,6 @@ let
SDL
SDL2_image
glew110
- openssl
libidn
# Other things from runtime
@@ -88,6 +87,7 @@ let
alsaLib
openalSoft
libva
+ openssl-steam
] ++ lib.optional newStdcpp gcc.cc;
ourRuntime = if runtimeOnly then []
diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix
index 043861b6166..bb297c1af4e 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/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix
index ea337c208df..504353afebe 100644
--- a/pkgs/games/teeworlds/default.nix
+++ b/pkgs/games/teeworlds/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "teeworlds-0.6.3";
+ name = "teeworlds-0.6.4";
src = fetchurl {
- url = "https://downloads.teeworlds.com/teeworlds-0.6.3-src.tar.gz";
- sha256 = "0yq7f3yan07sxrhz7mzwqv344nfmdc67p3dg173631w9fb1yf3j9";
+ url = "https://downloads.teeworlds.com/teeworlds-0.6.4-src.tar.gz";
+ sha256 = "1qlqzp4wqh1vnip081lbsjnx5jj5m5y4msrcm8glbd80pfgd2qf2";
};
# we always want to use system libs instead of these
diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix
index e07117172ce..f72307e0172 100644
--- a/pkgs/games/the-powder-toy/default.nix
+++ b/pkgs/games/the-powder-toy/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A free 2D physics sandbox game";
- homepage = http://powdertoy.co.uk/;
+ homepage = "http://powdertoy.co.uk/";
platforms = platforms.unix;
license = licenses.gpl3;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 46dd24acbb7..7e5cdae57fa 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, pkgconfig, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf
, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre
-, enableTools ? false
+, makeWrapper, enableTools ? false
}:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0kifp6g1dsr16m6ngjq2hx19h851fqg326ps3krnhpyix963h3x5";
};
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext boost
libvorbis fribidi dbus libpng pcre ];
@@ -23,6 +23,13 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ # Wesnoth doesn't support input frameworks and Unicode input breaks when they are enabled.
+ postInstall = ''
+ for i in $out/bin/*; do
+ wrapProgram "$i" --unset XMODIFIERS
+ done
+ '';
+
meta = with stdenv.lib; {
description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme";
longDescription = ''
@@ -33,7 +40,7 @@ stdenv.mkDerivation rec {
adventures.
'';
- homepage = http://www.wesnoth.org/;
+ homepage = "http://www.wesnoth.org/";
license = licenses.gpl2;
maintainers = with maintainers; [ kkallio abbradar ];
platforms = platforms.linux;
diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix
index a7e621460b6..0b335812ff0 100644
--- a/pkgs/games/wesnoth/dev.nix
+++ b/pkgs/games/wesnoth/dev.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "wesnoth";
- version = "1.13.5";
+ version = "1.13.6";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
- sha256 = "15hvf06r7086plwmagh89plcxal2zql8k4mg0yf1zgwjvdz284dx";
+ sha256 = "0z4k2r4ss46ik9fx5clffpd7vfr0l4l6d0j1war676dwz0z1j2m1";
};
nativeBuildInputs = [ cmake pkgconfig ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
adventures.
'';
- homepage = http://www.wesnoth.org/;
+ homepage = "http://www.wesnoth.org/";
license = licenses.gpl2;
maintainers = with maintainers; [ abbradar ];
platforms = platforms.linux;
diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix
index 502771e18ee..47d05b7e3f6 100644
--- a/pkgs/games/xsokoban/default.nix
+++ b/pkgs/games/xsokoban/default.nix
@@ -11,16 +11,19 @@ stdenv.mkDerivation rec {
buildInputs = [ libX11 xproto libXpm libXt ];
+ NIX_CFLAGS_COMPILE = "-I${libXpm.dev}/include/X11";
+
+ hardeningDisable = [ "format" ];
+
preConfigure = ''
sed -e 's/getline/my_getline/' -i score.c
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXpm.dev}/include/X11"
- for i in $NIX_CFLAGS_COMPILE; do echo $i; ls ''${i#-I}; done
+
chmod a+rw config.h
cat >>config.h < _allowedClients;
++ std::vector _allowableClients;
+ std::vector _reexportedLibraries;
+ std::vector _symbols;
+ std::vector _classes;
+@@ -246,6 +247,14 @@ class TBDFile {
+ });
+ }
+
++ void parseAllowableClients(DynamicLibrary& lib) {
++ if ( !hasOptionalToken("allowable-clients") )
++ return;
++ parseFlowSequence([&](Token name) {
++ lib._allowableClients.emplace_back(name);
++ });
++ }
++
+ void parseReexportedDylibs(DynamicLibrary& lib) {
+ if ( !hasOptionalToken("re-exports") )
+ return;
+@@ -306,6 +315,21 @@ class TBDFile {
+ return false;
+ }
+
++ void skipUUIDs(DynamicLibrary& lib) {
++ expectToken("uuids");
++ while ( true ) {
++ auto token = next();
++ if ( token == "]" )
++ break;
++ }
++ }
++
++ void skipParentUmbrella(DynamicLibrary& lib) {
++ if (!hasOptionalToken("parent-umbrella"))
++ return;
++ next();
++ }
++
+ void parsePlatform(DynamicLibrary& lib) {
+ expectToken("platform");
+
+@@ -410,6 +434,7 @@ class TBDFile {
+ }
+
+ parseAllowedClients(lib);
++ parseAllowableClients(lib);
+ parseReexportedDylibs(lib);
+ parseSymbols(lib);
+ if ( !hasOptionalToken("-") )
+@@ -455,17 +480,21 @@ class TBDFile {
+ return result.front();
+ }
+
+- void parseDocument(DynamicLibrary& lib, std::string &requestedArchName) {
++ void parseDocument(DynamicLibrary& lib, std::string &requestedArchName, bool isTbdV2) {
+ auto selectedArchName = parseAndSelectArchitecture(requestedArchName);
+ if (selectedArchName.empty())
+ throwf("invalid arch");
+
++ if(isTbdV2)
++ skipUUIDs(lib);
+ parsePlatform(lib);
+ parseInstallName(lib);
+ parseCurrentVersion(lib);
+ parseCompatibilityVersion(lib);
+ parseSwiftVersion(lib);
+ parseObjCConstraint(lib);
++ if(isTbdV2)
++ skipParentUmbrella(lib);
+ parseExportsBlock(lib, selectedArchName);
+ }
+
+@@ -476,7 +505,8 @@ public:
+ _tokenizer.reset();
+ DynamicLibrary lib;
+ expectToken("---");
+- parseDocument(lib, requestedArchName);
++ auto isTbdV2 = hasOptionalToken("!tapi-tbd-v2");
++ parseDocument(lib, requestedArchName, isTbdV2);
+ expectToken("...");
+ return lib;
+ }
+@@ -486,6 +516,7 @@ public:
+ auto token = next();
+ if ( token != "---" )
+ return false;
++ hasOptionalToken("!tapi-tbd-v2");
+ return !parseAndSelectArchitecture(requestedArchName).empty();
+ }
+
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index 2f13277d70c..41fb090710c 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -25,6 +25,7 @@ let
] ++ stdenv.lib.optionals stdenv.isDarwin [
# See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed.
./undo-unknown-triple.patch
+ ./ld-tbd-v2.patch
];
enableParallelBuilding = true;
diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix
new file mode 100644
index 00000000000..1d26a8b350b
--- /dev/null
+++ b/pkgs/os-specific/darwin/ios-cross/default.nix
@@ -0,0 +1,63 @@
+{ runCommand
+, lib
+, llvm
+, clang
+, binutils
+, stdenv
+, coreutils
+, gnugrep
+}:
+
+/* 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";
+
+ /* TODO: Properly integrate with gcc-cross-wrapper */
+ wrapper = import ../../../build-support/cc-wrapper {
+ inherit stdenv coreutils gnugrep;
+ nativeTools = false;
+ nativeLibc = false;
+ inherit binutils;
+ libc = runCommand "empty-libc" {} "mkdir -p $out/{lib,include}";
+ cc = clang;
+ extraBuildCommands = ''
+ # ugh
+ tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp
+ mv cc-cflags.tmp $out/nix-support/cc-cflags
+ 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 ${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 {
+ cc = runCommand "${prefix}-cc" {} ''
+ mkdir -p $out/bin
+ ln -sv ${wrapper}/bin/clang $out/bin/${prefix}-cc
+ mkdir -p $out/nix-support
+ echo ${llvm} > $out/nix-support/propagated-native-build-inputs
+ cat > $out/nix-support/setup-hook <
+Date: Sun, 25 Sep 2016 15:30:26 +0100
+Subject: [PATCH 01/14] Find correct System.map
+
+---
+ pre-build.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pre-build.sh b/pre-build.sh
+index 95457bd..169ccf0 100755
+--- a/pre-build.sh
++++ b/pre-build.sh
+@@ -27,7 +27,7 @@ source amd/backport/symbols
+
+ echo '// auto generated by DKMS pre-build.sh' > amd/backport/symbols.c
+ for sym in $SYMS; do
+- addr=$(grep $sym /boot/System.map-$KERNELVER | awk -F' ' '{print $1}')
++ addr=$(grep $sym /boot/System.map*-$KERNELVER | awk -F' ' '{print $1}')
+ echo "void *$sym = (void *)0x$addr;" >> amd/backport/symbols.c
+ done
+
+--
+2.10.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch
deleted file mode 100644
index 46302ae0ea8..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e78ede724fff53fc0220999f6381242142ce8c33 Mon Sep 17 00:00:00 2001
-From: David McFarland
-Date: Sun, 21 Aug 2016 16:30:25 -0300
-Subject: [PATCH 1/8] add OS detection for arch
-
----
- amd/backport/Makefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/amd/backport/Makefile b/amd/backport/Makefile
-index 0c285ef..6447a15 100644
---- a/amd/backport/Makefile
-+++ b/amd/backport/Makefile
-@@ -17,6 +17,9 @@ else ifeq ("ubuntu",$(OS_NAME))
- ccflags-y += -DOS_NAME_UBUNTU
- else ifeq ("steamos",$(OS_NAME))
- ccflags-y += -DOS_NAME_STEAMOS
-+else ifeq ("arch",$(OS_NAME))
-+ccflags-y += -DOS_NAME_ARCH
-+OS_VERSION = "0.0"
- else
- ccflags-y += -DOS_NAME_UNKNOWN
- endif
---
-2.9.3
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Fix-kernel-module-install-location.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Fix-kernel-module-install-location.patch
new file mode 100644
index 00000000000..be886883556
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Fix-kernel-module-install-location.patch
@@ -0,0 +1,25 @@
+From c1860b4e8c2ebb784a07d6ba067c510950e67d24 Mon Sep 17 00:00:00 2001
+From: "Luke A. Guest"
+Date: Sun, 25 Sep 2016 15:31:13 +0100
+Subject: [PATCH 02/14] Fix kernel module install location
+
+---
+ dkms.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dkms.conf b/dkms.conf
+index d1a5e1d..0e03f08 100644
+--- a/dkms.conf
++++ b/dkms.conf
+@@ -2,7 +2,7 @@ PACKAGE_NAME="amdgpu-pro"
+ PACKAGE_VERSION="16.40-348864"
+ BUILT_MODULE_NAME[0]="amdgpu"
+ BUILT_MODULE_LOCATION[0]="amd/amdgpu"
+-DEST_MODULE_LOCATION[0]="/extra"
++DEST_MODULE_LOCATION[0]="/kernel/drivers/gpu/drm/amd/amdgpu"
+ AUTOINSTALL="yes"
+ PRE_BUILD="pre-build.sh $kernelver"
+ REMAKE_INITRD="yes"
+--
+2.10.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch
deleted file mode 100644
index 4101662a4eb..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d84bd62a10308efb6a414e8f6582a7b1e9860638 Mon Sep 17 00:00:00 2001
-From: David McFarland
-Date: Sun, 21 Aug 2016 16:31:12 -0300
-Subject: [PATCH 2/8] update kcl_ttm_bo_reserve for linux-4.7
-
----
- amd/backport/include/kcl/kcl_ttm.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/amd/backport/include/kcl/kcl_ttm.h b/amd/backport/include/kcl/kcl_ttm.h
-index 3575004..0d1560d 100644
---- a/amd/backport/include/kcl/kcl_ttm.h
-+++ b/amd/backport/include/kcl/kcl_ttm.h
-@@ -84,7 +84,7 @@ static inline int kcl_ttm_bo_reserve(struct ttm_buffer_object *bo,
- bool interruptible, bool no_wait,
- struct ww_acquire_ctx *ticket)
- {
--#if defined(BUILD_AS_DKMS)
-+#if defined(BUILD_AS_DKMS) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
- return ttm_bo_reserve(bo, interruptible, no_wait, false, ticket);
- #else
- return ttm_bo_reserve(bo, interruptible, no_wait, ticket);
---
-2.9.3
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Add-Gentoo-as-build-option.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Add-Gentoo-as-build-option.patch
new file mode 100644
index 00000000000..d8b0f289d84
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Add-Gentoo-as-build-option.patch
@@ -0,0 +1,30 @@
+From c26c7670869e02c39c0d0f6dee9094a621f42252 Mon Sep 17 00:00:00 2001
+From: "Luke A. Guest"
+Date: Sun, 25 Sep 2016 15:31:49 +0100
+Subject: [PATCH 03/14] Add Gentoo as build option
+
+---
+ amd/backport/Makefile | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/amd/backport/Makefile b/amd/backport/Makefile
+index 0c285ef..dcc94d5 100644
+--- a/amd/backport/Makefile
++++ b/amd/backport/Makefile
+@@ -17,8 +17,13 @@ else ifeq ("ubuntu",$(OS_NAME))
+ ccflags-y += -DOS_NAME_UBUNTU
+ else ifeq ("steamos",$(OS_NAME))
+ ccflags-y += -DOS_NAME_STEAMOS
++else ifeq ("gentoo",$(OS_NAME))
++ccflags-y += -DOS_NAME_GENTOO
++# We don't have a version inside /etc/os-release.
++OS_VERSION = "0.0"
+ else
+ ccflags-y += -DOS_NAME_UNKNOWN
++OS_VERSION = "0.0"
+ endif
+
+ ccflags-y += \
+--
+2.10.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch
deleted file mode 100644
index 214b8effd9d..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-From 2637dfe990e4c277bc724f6ba48e6661506805ec Mon Sep 17 00:00:00 2001
-From: David McFarland
-Date: Sun, 21 Aug 2016 16:37:34 -0300
-Subject: [PATCH 3/8] add kcl_drm_gem_object_lookup
-
----
- amd/amdgpu/amdgpu_atpx_handler.c | 4 ++++
- amd/amdgpu/amdgpu_bo_list.c | 2 +-
- amd/amdgpu/amdgpu_cs.c | 2 +-
- amd/amdgpu/amdgpu_display.c | 2 +-
- amd/amdgpu/amdgpu_gem.c | 10 +++++-----
- amd/amdgpu/dce_v10_0.c | 2 +-
- amd/amdgpu/dce_v11_0.c | 2 +-
- amd/amdgpu/dce_v8_0.c | 2 +-
- amd/backport/include/kcl/kcl_drm.h | 11 +++++++++++
- amd/dal/amdgpu_dm/amdgpu_dm_types.c | 2 +-
- 10 files changed, 27 insertions(+), 12 deletions(-)
-
-diff --git a/amd/amdgpu/amdgpu_atpx_handler.c b/amd/amdgpu/amdgpu_atpx_handler.c
-index cc9b998..7e47478 100644
---- a/amd/amdgpu/amdgpu_atpx_handler.c
-+++ b/amd/amdgpu/amdgpu_atpx_handler.c
-@@ -565,7 +565,11 @@ void amdgpu_register_atpx_handler(void)
- if (!r)
- return;
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
-+ vga_switcheroo_register_handler(&amdgpu_atpx_handler, 0);
-+#else
- vga_switcheroo_register_handler(&amdgpu_atpx_handler);
-+#endif
- }
-
- /**
-diff --git a/amd/amdgpu/amdgpu_bo_list.c b/amd/amdgpu/amdgpu_bo_list.c
-index 35d0856..1d163ec 100644
---- a/amd/amdgpu/amdgpu_bo_list.c
-+++ b/amd/amdgpu/amdgpu_bo_list.c
-@@ -106,7 +106,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev,
- struct amdgpu_bo *bo;
- struct mm_struct *usermm;
-
-- gobj = drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle);
-+ gobj = kcl_drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle);
- if (!gobj) {
- r = -ENOENT;
- goto error_free;
-diff --git a/amd/amdgpu/amdgpu_cs.c b/amd/amdgpu/amdgpu_cs.c
-index d16ed26..b0390b5 100644
---- a/amd/amdgpu/amdgpu_cs.c
-+++ b/amd/amdgpu/amdgpu_cs.c
-@@ -92,7 +92,7 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p,
- {
- struct drm_gem_object *gobj;
-
-- gobj = drm_gem_object_lookup(p->adev->ddev, p->filp,
-+ gobj = kcl_drm_gem_object_lookup(p->adev->ddev, p->filp,
- data->handle);
- if (gobj == NULL)
- return -EINVAL;
-diff --git a/amd/amdgpu/amdgpu_display.c b/amd/amdgpu/amdgpu_display.c
-index 46326b3..9b5441f 100644
---- a/amd/amdgpu/amdgpu_display.c
-+++ b/amd/amdgpu/amdgpu_display.c
-@@ -594,7 +594,7 @@ amdgpu_user_framebuffer_create(struct drm_device *dev,
- struct amdgpu_framebuffer *amdgpu_fb;
- int ret;
-
-- obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
-+ obj = kcl_drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
- if (obj == NULL) {
- dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, "
- "can't create framebuffer\n", mode_cmd->handles[0]);
-diff --git a/amd/amdgpu/amdgpu_gem.c b/amd/amdgpu/amdgpu_gem.c
-index 0069aec..d10c282 100644
---- a/amd/amdgpu/amdgpu_gem.c
-+++ b/amd/amdgpu/amdgpu_gem.c
-@@ -397,7 +397,7 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp,
- struct drm_gem_object *gobj;
- struct amdgpu_bo *robj;
-
-- gobj = drm_gem_object_lookup(dev, filp, handle);
-+ gobj = kcl_drm_gem_object_lookup(dev, filp, handle);
- if (gobj == NULL) {
- return -ENOENT;
- }
-@@ -461,7 +461,7 @@ int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data,
- int r = 0;
- long ret;
-
-- gobj = drm_gem_object_lookup(dev, filp, handle);
-+ gobj = kcl_drm_gem_object_lookup(dev, filp, handle);
- if (gobj == NULL) {
- return -ENOENT;
- }
-@@ -495,7 +495,7 @@ int amdgpu_gem_metadata_ioctl(struct drm_device *dev, void *data,
- int r = -1;
-
- DRM_DEBUG("%d \n", args->handle);
-- gobj = drm_gem_object_lookup(dev, filp, args->handle);
-+ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle);
- if (gobj == NULL)
- return -ENOENT;
- robj = gem_to_amdgpu_bo(gobj);
-@@ -643,7 +643,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
- return -EINVAL;
- }
-
-- gobj = drm_gem_object_lookup(dev, filp, args->handle);
-+ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle);
- if (gobj == NULL)
- return -ENOENT;
- rbo = gem_to_amdgpu_bo(gobj);
-@@ -705,7 +705,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,
- struct amdgpu_bo *robj;
- int r;
-
-- gobj = drm_gem_object_lookup(dev, filp, args->handle);
-+ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle);
- if (gobj == NULL) {
- return -ENOENT;
- }
-diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c
-index 7554dd7..6d38754 100644
---- a/amd/amdgpu/dce_v10_0.c
-+++ b/amd/amdgpu/dce_v10_0.c
-@@ -2594,7 +2594,7 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc,
- return -EINVAL;
- }
-
-- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
-+ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle);
- if (!obj) {
- DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
- return -ENOENT;
-diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c
-index d9c9b88..93dbc1a 100644
---- a/amd/amdgpu/dce_v11_0.c
-+++ b/amd/amdgpu/dce_v11_0.c
-@@ -2604,7 +2604,7 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc,
- return -EINVAL;
- }
-
-- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
-+ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle);
- if (!obj) {
- DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
- return -ENOENT;
-diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c
-index 7a027ce..c56a298 100644
---- a/amd/amdgpu/dce_v8_0.c
-+++ b/amd/amdgpu/dce_v8_0.c
-@@ -2501,7 +2501,7 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc,
- return -EINVAL;
- }
-
-- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
-+ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle);
- if (!obj) {
- DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
- return -ENOENT;
-diff --git a/amd/backport/include/kcl/kcl_drm.h b/amd/backport/include/kcl/kcl_drm.h
-index a65ee25..5a8a7b3 100644
---- a/amd/backport/include/kcl/kcl_drm.h
-+++ b/amd/backport/include/kcl/kcl_drm.h
-@@ -3,6 +3,7 @@
-
- #include
- #include
-+#include
-
- #if defined(BUILD_AS_DKMS)
- extern int drm_pcie_get_max_link_width(struct drm_device *dev, u32 *mlw);
-@@ -123,4 +124,14 @@ static inline int kcl_drm_universal_plane_init(struct drm_device *dev, struct dr
- #endif
- }
-
-+static inline struct drm_gem_object *kcl_drm_gem_object_lookup(struct drm_device *dev,
-+ struct drm_file *filp,
-+ u32 handle) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+ return drm_gem_object_lookup(filp, handle);
-+#else
-+ return drm_gem_object_lookup(dev, filp, handle);
-+#endif
-+}
-+
- #endif /* AMDGPU_BACKPORT_KCL_DRM_H */
-diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-index 3f357a5..2e2d2e6 100644
---- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-+++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-@@ -152,7 +152,7 @@ static int dm_crtc_pin_cursor_bo_new(
-
- amdgpu_crtc = to_amdgpu_crtc(crtc);
-
-- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
-+ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle);
-
- if (!obj) {
- DRM_ERROR(
---
-2.9.3
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch
new file mode 100644
index 00000000000..794da9b5fb7
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch
@@ -0,0 +1,28 @@
+From d21e811c6f26674a0e1c2398dce6d247a1dd4918 Mon Sep 17 00:00:00 2001
+From: "Luke A. Guest"
+Date: Sun, 25 Sep 2016 15:46:58 +0100
+Subject: [PATCH 04/14] Remove extra parameter from ttm_bo_reserve for 4.7.0
+
+---
+ amd/backport/include/kcl/kcl_ttm.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/amd/backport/include/kcl/kcl_ttm.h b/amd/backport/include/kcl/kcl_ttm.h
+index 05c444b..c5a602c 100644
+--- a/amd/backport/include/kcl/kcl_ttm.h
++++ b/amd/backport/include/kcl/kcl_ttm.h
+@@ -106,7 +106,11 @@ static inline int kcl_ttm_bo_reserve(struct ttm_buffer_object *bo,
+ struct ww_acquire_ctx *ticket)
+ {
+ #if defined(BUILD_AS_DKMS)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++ return ttm_bo_reserve(bo, interruptible, no_wait, ticket);
++#else
+ return ttm_bo_reserve(bo, interruptible, no_wait, false, ticket);
++#endif
+ #else
+ return ttm_bo_reserve(bo, interruptible, no_wait, ticket);
+ #endif
+--
+2.10.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch
deleted file mode 100644
index 54394b7879b..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 2bd83488ccea22bb9e399986c171cccc3b6beb93 Mon Sep 17 00:00:00 2001
-From: David McFarland
-Date: Sun, 21 Aug 2016 16:40:32 -0300
-Subject: [PATCH 4/8] paging changes for linux-4.6
-
----
- amd/amdgpu/amdgpu_ttm.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c
-index 7bdebde..8b676c2 100644
---- a/amd/amdgpu/amdgpu_ttm.c
-+++ b/amd/amdgpu/amdgpu_ttm.c
-@@ -548,8 +548,12 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages)
- list_add(&guptask.list, >t->guptasks);
- spin_unlock(>t->guptasklock);
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
-+ r = get_user_pages(userptr, num_pages, write, 0, p, NULL);
-+#else
- r = get_user_pages(current, current->mm, userptr, num_pages,
-- write, 0, p, NULL);
-+ write, 0, p, NULL);
-+#endif
-
- spin_lock(>t->guptasklock);
- list_del(&guptask.list);
-@@ -625,7 +629,11 @@ static void amdgpu_ttm_tt_unpin_userptr(struct ttm_tt *ttm)
- set_page_dirty(page);
-
- mark_page_accessed(page);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
-+ put_page(page);
-+#else
- page_cache_release(page);
-+#endif
- }
-
- sg_free_table(ttm->sg);
---
-2.9.3
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch
deleted file mode 100644
index 6da3e46a3ee..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From c41c15fa04e363c41272e7b5d767710170691347 Mon Sep 17 00:00:00 2001
-From: "Luke A. Guest"
-Date: Mon, 4 Jul 2016 19:19:45 +0100
-Subject: [PATCH 5/8] LRU stuff isn't available until >= 4.7.x
-
----
- amd/amdgpu/amdgpu_ttm.c | 4 ++--
- amd/backport/kcl_ttm.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c
-index 8b676c2..752d065 100644
---- a/amd/amdgpu/amdgpu_ttm.c
-+++ b/amd/amdgpu/amdgpu_ttm.c
-@@ -907,7 +907,7 @@ uint32_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm,
- return flags;
- }
-
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-
- static void amdgpu_ttm_lru_removal(struct ttm_buffer_object *tbo)
- {
-@@ -969,7 +969,7 @@ static struct ttm_bo_driver amdgpu_bo_driver = {
- .fault_reserve_notify = &amdgpu_bo_fault_reserve_notify,
- .io_mem_reserve = &amdgpu_ttm_io_mem_reserve,
- .io_mem_free = &amdgpu_ttm_io_mem_free,
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
- .lru_removal = &amdgpu_ttm_lru_removal,
- .lru_tail = &amdgpu_ttm_lru_tail,
- .swap_lru_tail = &amdgpu_ttm_swap_lru_tail,
-diff --git a/amd/backport/kcl_ttm.c b/amd/backport/kcl_ttm.c
-index 24f7a83..1a2cb7b 100644
---- a/amd/backport/kcl_ttm.c
-+++ b/amd/backport/kcl_ttm.c
-@@ -7,7 +7,7 @@ static int _kcl_ttm_bo_del_from_lru(struct ttm_buffer_object *bo)
- {
- int put_count = 0;
-
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
- struct ttm_bo_device *bdev = bo->bdev;
-
- if (bdev->driver->lru_removal)
---
-2.9.3
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0005-Remove-first-param-from-drm_gem_object_lookup.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0005-Remove-first-param-from-drm_gem_object_lookup.patch
new file mode 100644
index 00000000000..94cb3e72ed5
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0005-Remove-first-param-from-drm_gem_object_lookup.patch
@@ -0,0 +1,196 @@
+From 4ac701dce0a4139e89c80237fc4eaa65f48c6f07 Mon Sep 17 00:00:00 2001
+From: "Luke A. Guest"
+Date: Sun, 25 Sep 2016 15:53:50 +0100
+Subject: [PATCH 05/14] Remove first param from drm_gem_object_lookup
+
+---
+ amd/amdgpu/amdgpu_bo_list.c | 4 ++++
+ amd/amdgpu/amdgpu_cs.c | 4 ++++
+ amd/amdgpu/amdgpu_display.c | 4 ++++
+ amd/amdgpu/amdgpu_gem.c | 20 ++++++++++++++++++++
+ amd/amdgpu/dce_v10_0.c | 4 ++++
+ amd/amdgpu/dce_v11_0.c | 4 ++++
+ amd/amdgpu/dce_v8_0.c | 4 ++++
+ amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++++
+ 8 files changed, 48 insertions(+)
+
+diff --git a/amd/amdgpu/amdgpu_bo_list.c b/amd/amdgpu/amdgpu_bo_list.c
+index 844214d..7ae09cf 100644
+--- a/amd/amdgpu/amdgpu_bo_list.c
++++ b/amd/amdgpu/amdgpu_bo_list.c
+@@ -107,7 +107,11 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev,
+ struct amdgpu_bo *bo;
+ struct mm_struct *usermm;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++ gobj = drm_gem_object_lookup(filp, info[i].bo_handle);
++#else
+ gobj = drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle);
++#endif
+ if (!gobj) {
+ r = -ENOENT;
+ goto error_free;
+diff --git a/amd/amdgpu/amdgpu_cs.c b/amd/amdgpu/amdgpu_cs.c
+index 20f6ab2..22363ab 100644
+--- a/amd/amdgpu/amdgpu_cs.c
++++ b/amd/amdgpu/amdgpu_cs.c
+@@ -92,8 +92,12 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p,
+ {
+ struct drm_gem_object *gobj;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++ gobj = drm_gem_object_lookup(p->filp, data->handle);
++#else
+ gobj = drm_gem_object_lookup(p->adev->ddev, p->filp,
+ data->handle);
++#endif
+ if (gobj == NULL)
+ return -EINVAL;
+
+diff --git a/amd/amdgpu/amdgpu_display.c b/amd/amdgpu/amdgpu_display.c
+index 96c4fa5..862611c 100644
+--- a/amd/amdgpu/amdgpu_display.c
++++ b/amd/amdgpu/amdgpu_display.c
+@@ -601,7 +601,11 @@ amdgpu_user_framebuffer_create(struct drm_device *dev,
+ struct amdgpu_framebuffer *amdgpu_fb;
+ int ret;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++ obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]);
++#else
+ obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
++#endif
+ if (obj == NULL) {
+ dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, "
+ "can't create framebuffer\n", mode_cmd->handles[0]);
+diff --git a/amd/amdgpu/amdgpu_gem.c b/amd/amdgpu/amdgpu_gem.c
+index 0069aec..6da025b 100644
+--- a/amd/amdgpu/amdgpu_gem.c
++++ b/amd/amdgpu/amdgpu_gem.c
+@@ -397,7 +397,11 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp,
+ struct drm_gem_object *gobj;
+ struct amdgpu_bo *robj;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++ gobj = drm_gem_object_lookup(filp, handle);
++#else
+ gobj = drm_gem_object_lookup(dev, filp, handle);
++#endif
+ if (gobj == NULL) {
+ return -ENOENT;
+ }
+@@ -461,7 +465,11 @@ int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data,
+ int r = 0;
+ long ret;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++ gobj = drm_gem_object_lookup(filp, handle);
++#else
+ gobj = drm_gem_object_lookup(dev, filp, handle);
++#endif
+ if (gobj == NULL) {
+ return -ENOENT;
+ }
+@@ -495,7 +503,11 @@ int amdgpu_gem_metadata_ioctl(struct drm_device *dev, void *data,
+ int r = -1;
+
+ DRM_DEBUG("%d \n", args->handle);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++ gobj = drm_gem_object_lookup(filp, args->handle);
++#else
+ gobj = drm_gem_object_lookup(dev, filp, args->handle);
++#endif
+ if (gobj == NULL)
+ return -ENOENT;
+ robj = gem_to_amdgpu_bo(gobj);
+@@ -643,7 +655,11 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
+ return -EINVAL;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++ gobj = drm_gem_object_lookup(filp, args->handle);
++#else
+ gobj = drm_gem_object_lookup(dev, filp, args->handle);
++#endif
+ if (gobj == NULL)
+ return -ENOENT;
+ rbo = gem_to_amdgpu_bo(gobj);
+@@ -705,7 +721,11 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,
+ struct amdgpu_bo *robj;
+ int r;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++ gobj = drm_gem_object_lookup(filp, args->handle);
++#else
+ gobj = drm_gem_object_lookup(dev, filp, args->handle);
++#endif
+ if (gobj == NULL) {
+ return -ENOENT;
+ }
+diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c
+index 3fae88d..0fd1e4f 100644
+--- a/amd/amdgpu/dce_v10_0.c
++++ b/amd/amdgpu/dce_v10_0.c
+@@ -2594,7 +2594,11 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc,
+ return -EINVAL;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++ obj = drm_gem_object_lookup(file_priv, handle);
++#else
+ obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
++#endif
+ if (!obj) {
+ DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
+ return -ENOENT;
+diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c
+index fe87795..a85eb5f 100644
+--- a/amd/amdgpu/dce_v11_0.c
++++ b/amd/amdgpu/dce_v11_0.c
+@@ -2604,7 +2604,11 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc,
+ return -EINVAL;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++ obj = drm_gem_object_lookup(file_priv, handle);
++#else
+ obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
++#endif
+ if (!obj) {
+ DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
+ return -ENOENT;
+diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c
+index 1f5959b..308f5e4 100644
+--- a/amd/amdgpu/dce_v8_0.c
++++ b/amd/amdgpu/dce_v8_0.c
+@@ -2448,7 +2448,11 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc,
+ return -EINVAL;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++ obj = drm_gem_object_lookup(file_priv, handle);
++#else
+ obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
++#endif
+ if (!obj) {
+ DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
+ return -ENOENT;
+diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
+index d14c96f..a9de2e5 100644
+--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c
++++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
+@@ -156,7 +156,11 @@ static int dm_crtc_pin_cursor_bo_new(
+
+ amdgpu_crtc = to_amdgpu_crtc(crtc);
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++ obj = drm_gem_object_lookup(file_priv, handle);
++#else
+ obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
++#endif
+
+ if (!obj) {
+ DRM_ERROR(
+--
+2.10.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch
deleted file mode 100644
index 5be5acad00d..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5b90b8d8ab44637c707623b25ee98aa4ebded308 Mon Sep 17 00:00:00 2001
-From: "Luke A. Guest"
-Date: Mon, 4 Jul 2016 19:30:08 +0100
-Subject: [PATCH 6/8] Change name of vblank_disable_allowed to
- vblank_disable_immediate under 4.7.x.
-
----
- amd/amdgpu/amdgpu_irq.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/amd/amdgpu/amdgpu_irq.c b/amd/amdgpu/amdgpu_irq.c
-index d13865a..5cfa69f 100644
---- a/amd/amdgpu/amdgpu_irq.c
-+++ b/amd/amdgpu/amdgpu_irq.c
-@@ -240,7 +240,11 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
- INIT_WORK(&adev->hotplug_work,
- amdgpu_hotplug_work_func);
- }
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+ adev->ddev->vblank_disable_immediate = true;
-+#else
- adev->ddev->vblank_disable_allowed = true;
-+#endif
-
- INIT_WORK(&adev->reset_work, amdgpu_irq_reset_work_func);
-
---
-2.9.3
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Remove-vblank_disable_allowed-assignment.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Remove-vblank_disable_allowed-assignment.patch
new file mode 100644
index 00000000000..dc35fe4c96a
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Remove-vblank_disable_allowed-assignment.patch
@@ -0,0 +1,26 @@
+From d4a070e6d68ff7ce8ac49c6135acc759c9a1cf6e Mon Sep 17 00:00:00 2001
+From: "Luke A. Guest"
+Date: Sun, 25 Sep 2016 16:01:43 +0100
+Subject: [PATCH 06/14] Remove vblank_disable_allowed assignment
+
+---
+ amd/amdgpu/amdgpu_irq.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/amd/amdgpu/amdgpu_irq.c b/amd/amdgpu/amdgpu_irq.c
+index 6e85e69..71358c9 100644
+--- a/amd/amdgpu/amdgpu_irq.c
++++ b/amd/amdgpu/amdgpu_irq.c
+@@ -240,7 +240,9 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
+ INIT_WORK(&adev->hotplug_work,
+ amdgpu_hotplug_work_func);
+ }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
+ adev->ddev->vblank_disable_allowed = true;
++#endif
+
+ INIT_WORK(&adev->reset_work, amdgpu_irq_reset_work_func);
+
+--
+2.10.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-__drm_atomic_helper_connector_destroy_state-call.patch
similarity index 59%
rename from pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch
rename to pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-__drm_atomic_helper_connector_destroy_state-call.patch
index 13d4a282ac8..9e8749a31ca 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-__drm_atomic_helper_connector_destroy_state-call.patch
@@ -1,23 +1,22 @@
-From 27ef2ce0d4d8eeb3bca32ddeae503f0a334832aa Mon Sep 17 00:00:00 2001
+From 406bb3a83b51b2bcf61a972721aa116e69c0a771 Mon Sep 17 00:00:00 2001
From: "Luke A. Guest"
-Date: Mon, 4 Jul 2016 19:41:08 +0100
-Subject: [PATCH 7/8] Remove connector parameter from
- __drm_atomic_helper_connector_destroy_state for 4.7.x kernels.
+Date: Sun, 25 Sep 2016 16:10:27 +0100
+Subject: [PATCH 07/14] Fix __drm_atomic_helper_connector_destroy_state call
---
amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-index 2e2d2e6..cd34607 100644
+index a9de2e5..fedf490 100644
--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c
+++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-@@ -1205,7 +1205,11 @@ void amdgpu_dm_connector_atomic_destroy_state(
+@@ -1224,7 +1224,11 @@ void amdgpu_dm_connector_atomic_destroy_state(
struct dm_connector_state *dm_state =
to_dm_connector_state(state);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+ __drm_atomic_helper_connector_destroy_state(state);
++ __drm_atomic_helper_connector_destroy_state(connector->state);
+#else
__drm_atomic_helper_connector_destroy_state(connector, state);
+#endif
@@ -25,5 +24,5 @@ index 2e2d2e6..cd34607 100644
kfree(dm_state);
}
--
-2.9.3
+2.10.1
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0008-Change-seq_printf-format-for-64-bit-context.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0008-Change-seq_printf-format-for-64-bit-context.patch
new file mode 100644
index 00000000000..827237a5f9a
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0008-Change-seq_printf-format-for-64-bit-context.patch
@@ -0,0 +1,30 @@
+From f268e7fa537fd8e12f4023803df795b2e29747e7 Mon Sep 17 00:00:00 2001
+From: "Luke A. Guest"
+Date: Sun, 25 Sep 2016 16:46:39 +0100
+Subject: [PATCH 08/14] Change seq_printf format for 64 bit context
+
+---
+ amd/amdgpu/amdgpu_sa.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/amd/amdgpu/amdgpu_sa.c b/amd/amdgpu/amdgpu_sa.c
+index 768a265..51d118e 100644
+--- a/amd/amdgpu/amdgpu_sa.c
++++ b/amd/amdgpu/amdgpu_sa.c
+@@ -428,8 +428,13 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
+ soffset, eoffset, eoffset - soffset);
+
+ if (i->fence)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++ seq_printf(m, " protected by 0x%08x on context %llu",
++ i->fence->seqno, i->fence->context);
++#else
+ seq_printf(m, " protected by 0x%08x on context %d",
+ i->fence->seqno, i->fence->context);
++#endif
+
+ seq_printf(m, "\n");
+ }
+--
+2.10.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch
deleted file mode 100644
index 693ad8b2f40..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c9f2501131da0d9173e21f7e8ff5741a7fcfedb6 Mon Sep 17 00:00:00 2001
-From: David McFarland
-Date: Sun, 21 Aug 2016 16:58:45 -0300
-Subject: [PATCH 8/8] fix apparent typo in bandwidth_calcs causing array error
-
----
- amd/dal/dc/calcs/bandwidth_calcs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/amd/dal/dc/calcs/bandwidth_calcs.c b/amd/dal/dc/calcs/bandwidth_calcs.c
-index 8a19139..c4ededd 100644
---- a/amd/dal/dc/calcs/bandwidth_calcs.c
-+++ b/amd/dal/dc/calcs/bandwidth_calcs.c
-@@ -3181,7 +3181,7 @@ static void calculate_bandwidth(
- bw_int_to_fixed(
- 2),
- vbios->mcifwrmc_urgent_latency),
-- results->dmif_burst_time[i][j]),
-+ results->dmif_burst_time[results->y_clk_level][results->sclk_level]),
- results->mcifwr_burst_time[results->y_clk_level][results->sclk_level])),
- results->dispclk),
- bw_int_to_fixed(
---
-2.9.3
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0009-Fix-vblank-calls.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0009-Fix-vblank-calls.patch
new file mode 100644
index 00000000000..82db5905a45
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0009-Fix-vblank-calls.patch
@@ -0,0 +1,135 @@
+From 9da98ec93816277a2d4e93d3205da044bace08bc Mon Sep 17 00:00:00 2001
+From: "Luke A. Guest"
+Date: Sun, 25 Sep 2016 16:49:09 +0100
+Subject: [PATCH 09/14] Fix vblank calls
+
+---
+ amd/amdgpu/amdgpu_display.c | 8 ++++++++
+ amd/amdgpu/dce_v10_0.c | 8 ++++++++
+ amd/amdgpu/dce_v11_0.c | 8 ++++++++
+ amd/amdgpu/dce_v8_0.c | 8 ++++++++
+ amd/dal/amdgpu_dm/amdgpu_dm.c | 4 ++++
+ 5 files changed, 36 insertions(+)
+
+diff --git a/amd/amdgpu/amdgpu_display.c b/amd/amdgpu/amdgpu_display.c
+index 862611c..267c65f 100644
+--- a/amd/amdgpu/amdgpu_display.c
++++ b/amd/amdgpu/amdgpu_display.c
+@@ -268,7 +268,11 @@ int amdgpu_crtc_page_flip(struct drm_crtc *crtc,
+
+ work->base = base;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++ r = drm_crtc_vblank_get(crtc);
++#else
+ r = drm_vblank_get(crtc->dev, amdgpu_crtc->crtc_id);
++#endif
+ if (r) {
+ DRM_ERROR("failed to get vblank before flip\n");
+ goto pflip_cleanup;
+@@ -296,7 +300,11 @@ int amdgpu_crtc_page_flip(struct drm_crtc *crtc,
+ return 0;
+
+ vblank_cleanup:
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++ drm_crtc_vblank_put(&amdgpu_crtc->base);
++#else
+ drm_vblank_put(crtc->dev, amdgpu_crtc->crtc_id);
++#endif
+
+ pflip_cleanup:
+ if (unlikely(amdgpu_bo_reserve(new_rbo, false) != 0)) {
+diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c
+index 0fd1e4f..5f0044c 100644
+--- a/amd/amdgpu/dce_v10_0.c
++++ b/amd/amdgpu/dce_v10_0.c
+@@ -3372,11 +3372,19 @@ static int dce_v10_0_pageflip_irq(struct amdgpu_device *adev,
+
+ /* wakeup usersapce */
+ if (works->event)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++ drm_crtc_send_vblank_event(&amdgpu_crtc->base, works->event);
++#else
+ drm_send_vblank_event(adev->ddev, crtc_id, works->event);
++#endif
+
+ spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++ drm_crtc_vblank_put(&amdgpu_crtc->base);
++#else
+ drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id);
++#endif
+ schedule_work(&works->unpin_work);
+
+ return 0;
+diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c
+index a85eb5f..8edc670 100644
+--- a/amd/amdgpu/dce_v11_0.c
++++ b/amd/amdgpu/dce_v11_0.c
+@@ -3432,11 +3432,19 @@ static int dce_v11_0_pageflip_irq(struct amdgpu_device *adev,
+
+ /* wakeup usersapce */
+ if(works->event)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++ drm_crtc_send_vblank_event(&amdgpu_crtc->base, works->event);
++#else
+ drm_send_vblank_event(adev->ddev, crtc_id, works->event);
++#endif
+
+ spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++ drm_crtc_vblank_put(&amdgpu_crtc->base);
++#else
+ drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id);
++#endif
+ schedule_work(&works->unpin_work);
+
+ return 0;
+diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c
+index 308f5e4..57e8014 100644
+--- a/amd/amdgpu/dce_v8_0.c
++++ b/amd/amdgpu/dce_v8_0.c
+@@ -3323,11 +3323,19 @@ static int dce_v8_0_pageflip_irq(struct amdgpu_device *adev,
+
+ /* wakeup usersapce */
+ if (works->event)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++ drm_crtc_send_vblank_event(&amdgpu_crtc->base, works->event);
++#else
+ drm_send_vblank_event(adev->ddev, crtc_id, works->event);
++#endif
+
+ spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++ drm_crtc_vblank_put(&amdgpu_crtc->base);
++#else
+ drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id);
++#endif
+ schedule_work(&works->unpin_work);
+
+ return 0;
+diff --git a/amd/dal/amdgpu_dm/amdgpu_dm.c b/amd/dal/amdgpu_dm/amdgpu_dm.c
+index 30865ec..f49999b 100644
+--- a/amd/dal/amdgpu_dm/amdgpu_dm.c
++++ b/amd/dal/amdgpu_dm/amdgpu_dm.c
+@@ -196,10 +196,14 @@ static void dm_pflip_high_irq(void *interrupt_params)
+
+ /* wakeup usersapce */
+ if(works->event)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++ drm_crtc_send_vblank_event(&amdgpu_crtc->base, works->event);
++#else
+ drm_send_vblank_event(
+ adev->ddev,
+ amdgpu_crtc->crtc_id,
+ works->event);
++#endif
+
+ spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
+
+--
+2.10.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0010-Fix-crtc_gamma-functions-for-4.8.0.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0010-Fix-crtc_gamma-functions-for-4.8.0.patch
new file mode 100644
index 00000000000..b11ab3e557e
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0010-Fix-crtc_gamma-functions-for-4.8.0.patch
@@ -0,0 +1,163 @@
+From b41eafa282a003cde9729e2ff486f55dc54f12c6 Mon Sep 17 00:00:00 2001
+From: "Luke A. Guest"
+Date: Sun, 25 Sep 2016 16:56:47 +0100
+Subject: [PATCH 10/14] Fix crtc_gamma functions for 4.8.0
+
+---
+ amd/amdgpu/dce_v10_0.c | 19 +++++++++++++++++++
+ amd/amdgpu/dce_v11_0.c | 19 +++++++++++++++++++
+ amd/amdgpu/dce_v8_0.c | 19 +++++++++++++++++++
+ amd/dal/amdgpu_dm/amdgpu_dm_types.c | 12 ++++++++++++
+ 4 files changed, 69 insertions(+)
+
+diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c
+index 5f0044c..85378aa 100644
+--- a/amd/amdgpu/dce_v10_0.c
++++ b/amd/amdgpu/dce_v10_0.c
+@@ -2671,6 +2671,24 @@ static void dce_v10_0_cursor_reset(struct drm_crtc *crtc)
+ }
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++static int dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
++ u16 *blue, uint32_t size)
++{
++ struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
++ int i;
++
++ /* userspace palettes are always correct as is */
++ for (i = 0; i < size; i++) {
++ amdgpu_crtc->lut_r[i] = red[i] >> 6;
++ amdgpu_crtc->lut_g[i] = green[i] >> 6;
++ amdgpu_crtc->lut_b[i] = blue[i] >> 6;
++ }
++ dce_v10_0_crtc_load_lut(crtc);
++
++ return 0;
++}
++#else
+ static void dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
+ u16 *blue, uint32_t start, uint32_t size)
+ {
+@@ -2685,6 +2703,7 @@ static void dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green
+ }
+ dce_v10_0_crtc_load_lut(crtc);
+ }
++#endif
+
+ static void dce_v10_0_crtc_destroy(struct drm_crtc *crtc)
+ {
+diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c
+index 8edc670..0129543 100644
+--- a/amd/amdgpu/dce_v11_0.c
++++ b/amd/amdgpu/dce_v11_0.c
+@@ -2681,6 +2681,24 @@ static void dce_v11_0_cursor_reset(struct drm_crtc *crtc)
+ }
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++static int dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
++ u16 *blue, uint32_t size)
++{
++ struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
++ int i;
++
++ /* userspace palettes are always correct as is */
++ for (i = 0; i < size; i++) {
++ amdgpu_crtc->lut_r[i] = red[i] >> 6;
++ amdgpu_crtc->lut_g[i] = green[i] >> 6;
++ amdgpu_crtc->lut_b[i] = blue[i] >> 6;
++ }
++ dce_v11_0_crtc_load_lut(crtc);
++
++ return 0;
++}
++#else
+ static void dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
+ u16 *blue, uint32_t start, uint32_t size)
+ {
+@@ -2695,6 +2713,7 @@ static void dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green
+ }
+ dce_v11_0_crtc_load_lut(crtc);
+ }
++#endif
+
+ static void dce_v11_0_crtc_destroy(struct drm_crtc *crtc)
+ {
+diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c
+index 57e8014..d0d9267 100644
+--- a/amd/amdgpu/dce_v8_0.c
++++ b/amd/amdgpu/dce_v8_0.c
+@@ -2525,6 +2525,24 @@ static void dce_v8_0_cursor_reset(struct drm_crtc *crtc)
+ }
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++static int dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
++ u16 *blue, uint32_t size)
++{
++ struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
++ int i;
++
++ /* userspace palettes are always correct as is */
++ for (i = 0; i < size; i++) {
++ amdgpu_crtc->lut_r[i] = red[i] >> 6;
++ amdgpu_crtc->lut_g[i] = green[i] >> 6;
++ amdgpu_crtc->lut_b[i] = blue[i] >> 6;
++ }
++ dce_v8_0_crtc_load_lut(crtc);
++
++ return 0;
++}
++#else
+ static void dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
+ u16 *blue, uint32_t start, uint32_t size)
+ {
+@@ -2539,6 +2557,7 @@ static void dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
+ }
+ dce_v8_0_crtc_load_lut(crtc);
+ }
++#endif
+
+ static void dce_v8_0_crtc_destroy(struct drm_crtc *crtc)
+ {
+diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
+index fedf490..c1f3c27 100644
+--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c
++++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
+@@ -995,6 +995,13 @@ void amdgpu_dm_crtc_destroy(struct drm_crtc *crtc)
+ kfree(crtc);
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++static int amdgpu_dm_atomic_crtc_gamma_set(struct drm_crtc *crtc,
++ u16 *red,
++ u16 *green,
++ u16 *blue,
++ uint32_t size)
++#else
+ static void amdgpu_dm_atomic_crtc_gamma_set(
+ struct drm_crtc *crtc,
+ u16 *red,
+@@ -1002,6 +1009,7 @@ static void amdgpu_dm_atomic_crtc_gamma_set(
+ u16 *blue,
+ uint32_t start,
+ uint32_t size)
++#endif
+ {
+ struct drm_device *dev = crtc->dev;
+ struct drm_property *prop = dev->mode_config.prop_crtc_id;
+@@ -1009,6 +1017,10 @@ static void amdgpu_dm_atomic_crtc_gamma_set(
+ crtc->state->mode.private_flags |= AMDGPU_CRTC_MODE_PRIVATE_FLAGS_GAMMASET;
+
+ drm_atomic_helper_crtc_set_property(crtc, prop, 0);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++ return 0;
++#endif
+ }
+
+ static int dm_crtc_funcs_atomic_set_property(
+--
+2.10.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0010-remove-dependency-on-System.map.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0010-remove-dependency-on-System.map.patch
deleted file mode 100644
index ec8f2c5a599..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0010-remove-dependency-on-System.map.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From fbc0d704f47526ca38f518b60237962cc6b08305 Mon Sep 17 00:00:00 2001
-From: David McFarland
-Date: Thu, 25 Aug 2016 23:08:02 -0300
-Subject: [PATCH] remove dependency on System.map
-
----
- amd/backport/Makefile | 3 +--
- amd/backport/kcl_fence.c | 10 ++++++++--
- amd/backport/symbols | 3 ---
- dkms.conf | 1 -
- pre-build.sh | 32 --------------------------------
- 5 files changed, 9 insertions(+), 40 deletions(-)
- delete mode 100644 amd/backport/symbols
- delete mode 100755 pre-build.sh
-
-diff --git a/amd/backport/Makefile b/amd/backport/Makefile
-index 6447a15..4682e0f 100644
---- a/amd/backport/Makefile
-+++ b/amd/backport/Makefile
-@@ -53,10 +53,9 @@ ccflags-y += -DOS_NAME_RHEL_7
- endif
- endif
-
--BACKPORT_OBJS = symbols.o
- endif
-
--BACKPORT_OBJS += kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o
-+BACKPORT_OBJS = kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o
-
- amdgpu-y += $(addprefix ../backport/,$(BACKPORT_OBJS))
-
-diff --git a/amd/backport/kcl_fence.c b/amd/backport/kcl_fence.c
-index 2141eef..ceef1fe 100644
---- a/amd/backport/kcl_fence.c
-+++ b/amd/backport/kcl_fence.c
-@@ -22,8 +22,14 @@ struct default_wait_cb {
- struct task_struct *task;
- };
-
--extern void
--(*fence_default_wait_cb)(struct fence *fence, struct fence_cb *cb);
-+static void
-+fence_default_wait_cb(struct fence *fence, struct fence_cb *cb)
-+{
-+ struct default_wait_cb *wait =
-+ container_of(cb, struct default_wait_cb, base);
-+
-+ wake_up_process(wait->task);
-+}
-
- signed long
- _kcl_fence_wait_any_timeout(struct fence **fences, uint32_t count,
-diff --git a/amd/backport/symbols b/amd/backport/symbols
-deleted file mode 100644
-index 2d3f2ee..0000000
---- a/amd/backport/symbols
-+++ /dev/null
-@@ -1,3 +0,0 @@
--SYMS=""
--
--SYMS+="fence_default_wait_cb"
-diff --git a/dkms.conf b/dkms.conf
-index 9ca148e..36be480 100644
---- a/dkms.conf
-+++ b/dkms.conf
-@@ -4,4 +4,3 @@ BUILT_MODULE_NAME[0]="amdgpu"
- BUILT_MODULE_LOCATION[0]="amd/amdgpu"
- DEST_MODULE_LOCATION[0]="/extra"
- AUTOINSTALL="yes"
--PRE_BUILD="pre-build.sh $kernelver"
-\ No newline at end of file
-diff --git a/pre-build.sh b/pre-build.sh
-deleted file mode 100755
-index 88ec680..0000000
---- a/pre-build.sh
-+++ /dev/null
-@@ -1,32 +0,0 @@
--#!/bin/bash
--
--KERNELVER=$1
--KERNELVER_BASE=${KERNELVER%%-*}
--
--version_lt () {
-- newest=$((echo "$1"; echo "$2") | sort -V | tail -n1)
-- [ "$1" != "$newest" ]
--}
--
--version_ge () {
-- newest=$((echo "$1"; echo "$2") | sort -V | tail -n1)
-- [ "$1" = "$newest" ]
--}
--
--version_gt () {
-- oldest=$((echo "$1"; echo "$2") | sort -V | head -n1)
-- [ "$1" != "$oldest" ]
--}
--
--version_le () {
-- oldest=$((echo "$1"; echo "$2") | sort -V | head -n1)
-- [ "$1" = "$oldest" ]
--}
--
--source amd/backport/symbols
--
--echo '// auto generated by DKMS pre-build.sh' > amd/backport/symbols.c
--for sym in $SYMS; do
-- addr=$(grep $sym /boot/System.map-$KERNELVER | awk -F' ' '{print $1}')
-- echo "void *$sym = (void *)0x$addr;" >> amd/backport/symbols.c
--done
---
-2.9.3
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0011-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0011-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch
new file mode 100644
index 00000000000..d205fc3189c
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0011-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch
@@ -0,0 +1,28 @@
+From 32422de1ddaf539d284b32de5fe43d07b7553499 Mon Sep 17 00:00:00 2001
+From: "Luke A. Guest"
+Date: Sun, 25 Sep 2016 17:00:32 +0100
+Subject: [PATCH 11/14] Fix drm_atomic_helper_swap_state for 4.8.0
+
+---
+ amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
+index c1f3c27..60cba1a 100644
+--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c
++++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
+@@ -2331,7 +2331,11 @@ int amdgpu_dm_atomic_commit(
+ * the software side now.
+ */
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++ drm_atomic_helper_swap_state(state, true);
++#else
+ drm_atomic_helper_swap_state(dev, state);
++#endif
+
+ /*
+ * From this point state become old state really. New state is
+--
+2.10.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0012-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0012-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch
new file mode 100644
index 00000000000..77b0cf79640
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0012-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch
@@ -0,0 +1,40 @@
+From 69207f061e13e6f02418d5706d230135abcc1a72 Mon Sep 17 00:00:00 2001
+From: "Luke A. Guest"
+Date: Sun, 25 Sep 2016 19:19:45 +0100
+Subject: [PATCH 12/14] Add extra flag to ttm_bo_move_ttm for >=4.8.0-rc2
+
+---
+ amd/amdgpu/amdgpu_ttm.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c
+index 145732a..dd691fa 100644
+--- a/amd/amdgpu/amdgpu_ttm.c
++++ b/amd/amdgpu/amdgpu_ttm.c
+@@ -344,7 +344,11 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo,
+ if (unlikely(r)) {
+ goto out_cleanup;
+ }
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++ r = ttm_bo_move_ttm(bo, true, interruptible, no_wait_gpu, new_mem);
++#else
+ r = ttm_bo_move_ttm(bo, true, no_wait_gpu, new_mem);
++#endif
+ out_cleanup:
+ ttm_bo_mem_put(bo, &tmp_mem);
+ return r;
+@@ -377,7 +381,11 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo,
+ if (unlikely(r)) {
+ return r;
+ }
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++ r = ttm_bo_move_ttm(bo, true, interruptible, no_wait_gpu, &tmp_mem);
++#else
+ r = ttm_bo_move_ttm(bo, true, no_wait_gpu, &tmp_mem);
++#endif
+ if (unlikely(r)) {
+ goto out_cleanup;
+ }
+--
+2.10.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0013-Remove-dependency-on-System.map.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0013-Remove-dependency-on-System.map.patch
new file mode 100644
index 00000000000..23a648e0d52
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0013-Remove-dependency-on-System.map.patch
@@ -0,0 +1,61 @@
+From 115cdb5a06b112674d9652ef44d7f19583ff0136 Mon Sep 17 00:00:00 2001
+From: David McFarland
+Date: Wed, 26 Oct 2016 22:26:39 -0300
+Subject: [PATCH 13/14] Remove dependency on System.map
+
+---
+ amd/backport/Makefile | 3 +--
+ amd/backport/kcl_fence.c | 10 ++++++++--
+ amd/backport/symbols | 3 ---
+ 3 files changed, 9 insertions(+), 7 deletions(-)
+ delete mode 100644 amd/backport/symbols
+
+diff --git a/amd/backport/Makefile b/amd/backport/Makefile
+index dcc94d5..ef27e94 100644
+--- a/amd/backport/Makefile
++++ b/amd/backport/Makefile
+@@ -55,10 +55,9 @@ ccflags-y += -DOS_NAME_RHEL_7
+ endif
+ endif
+
+-BACKPORT_OBJS = symbols.o
+ endif
+
+-BACKPORT_OBJS += kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o
++BACKPORT_OBJS = kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o
+
+ amdgpu-y += $(addprefix ../backport/,$(BACKPORT_OBJS))
+
+diff --git a/amd/backport/kcl_fence.c b/amd/backport/kcl_fence.c
+index 8c697aa..85d96d3 100644
+--- a/amd/backport/kcl_fence.c
++++ b/amd/backport/kcl_fence.c
+@@ -25,8 +25,14 @@ struct default_wait_cb {
+ struct task_struct *task;
+ };
+
+-extern void
+-(*fence_default_wait_cb)(struct fence *fence, struct fence_cb *cb);
++static void
++fence_default_wait_cb(struct fence *fence, struct fence_cb *cb)
++{
++ struct default_wait_cb *wait =
++ container_of(cb, struct default_wait_cb, base);
++
++ wake_up_process(wait->task);
++}
+
+ signed long
+ _kcl_fence_wait_any_timeout(struct fence **fences, uint32_t count,
+diff --git a/amd/backport/symbols b/amd/backport/symbols
+deleted file mode 100644
+index 2d3f2ee..0000000
+--- a/amd/backport/symbols
++++ /dev/null
+@@ -1,3 +0,0 @@
+-SYMS=""
+-
+-SYMS+="fence_default_wait_cb"
+--
+2.10.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0009-disable-dal-by-default.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0014-disable-dal-by-default.patch
similarity index 79%
rename from pkgs/os-specific/linux/amdgpu-pro/patches/0009-disable-dal-by-default.patch
rename to pkgs/os-specific/linux/amdgpu-pro/patches/0014-disable-dal-by-default.patch
index 05bcbf8bd06..693985ec2a2 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0009-disable-dal-by-default.patch
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0014-disable-dal-by-default.patch
@@ -1,14 +1,14 @@
-From 49d45957ddaafe13a9cc7bacd1b9665fe9c517ac Mon Sep 17 00:00:00 2001
+From 942064886eae63ed7aa0a63c07e9f175898dddf7 Mon Sep 17 00:00:00 2001
From: David McFarland
Date: Thu, 25 Aug 2016 22:17:06 -0300
-Subject: [PATCH] disable dal by default
+Subject: [PATCH 14/14] disable dal by default
---
amd/amdgpu/amdgpu_drv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/amd/amdgpu/amdgpu_drv.c b/amd/amdgpu/amdgpu_drv.c
-index 793528b..9a4dfcc 100644
+index 66f3242..df62815 100644
--- a/amd/amdgpu/amdgpu_drv.c
+++ b/amd/amdgpu/amdgpu_drv.c
@@ -79,7 +79,7 @@ int amdgpu_vm_block_size = -1;
@@ -21,5 +21,5 @@ index 793528b..9a4dfcc 100644
int amdgpu_sched_hw_submission = 2;
int amdgpu_powerplay = -1;
--
-2.9.3
+2.10.1
diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index 3bfd59de7ed..395850384d1 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernel ? null, which
+{ stdenv, lib, fetchurl, kernel ? null, which
, xorg, makeWrapper, glibc, patchelf, unzip
, fontconfig, freetype, mesa # for fgl_glxgears
, # Whether to build the libraries only (i.e. not the kernel module or
@@ -75,9 +75,12 @@ stdenv.mkDerivation rec {
./patches/15.9-preempt.patch
./patches/15.9-sep_printf.patch ]
++ optionals ( kernel != null &&
- (builtins.compareVersions kernel.version "4.6") >= 0 )
+ (lib.versionAtLeast kernel.version "4.6") )
[ ./patches/kernel-4.6-get_user_pages.patch
- ./patches/kernel-4.6-page_cache_release-put_page.patch ];
+ ./patches/kernel-4.6-page_cache_release-put_page.patch ]
+ ++ optionals ( kernel != null &&
+ (lib.versionAtLeast kernel.version "4.7") )
+ [ ./patches/4.7-arch-cpu_has_pge-v2.patch ];
buildInputs =
[ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM
@@ -124,7 +127,7 @@ stdenv.mkDerivation rec {
description = "ATI Catalyst display drivers";
homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx;
license = licenses.unfree;
- maintainers = with maintainers; [ marcweber offline jgeerds ];
+ maintainers = with maintainers; [ marcweber offline jgeerds jerith666 ];
platforms = platforms.linux;
hydraPlatforms = [];
# Copied from the nvidia default.nix to prevent a store collision.
diff --git a/pkgs/os-specific/linux/ati-drivers/patches/4.7-arch-cpu_has_pge-v2.patch b/pkgs/os-specific/linux/ati-drivers/patches/4.7-arch-cpu_has_pge-v2.patch
new file mode 100644
index 00000000000..cb86f5aff27
--- /dev/null
+++ b/pkgs/os-specific/linux/ati-drivers/patches/4.7-arch-cpu_has_pge-v2.patch
@@ -0,0 +1,70 @@
+diff -uNr 16.8/common/lib/modules/fglrx/build_mod/firegl_public.c 16.8b/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- 16.8/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-12-18 19:47:41.000000000 +0100
++++ 16.8b/common/lib/modules/fglrx/build_mod/firegl_public.c 2016-08-15 15:09:37.228538907 +0200
+@@ -4518,7 +4518,11 @@
+ write_cr0(cr0);
+ wbinvd();
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
++ if (boot_cpu_has(X86_FEATURE_PGE))
++#else
+ if (cpu_has_pge)
++#endif
+ {
+ cr4 = READ_CR4();
+ WRITE_CR4(cr4 & ~X86_CR4_PGE);
+@@ -4532,7 +4536,11 @@
+ wbinvd();
+ __flush_tlb();
+ write_cr0(cr0 & 0xbfffffff);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
++ if (boot_cpu_has(X86_FEATURE_PGE))
++#else
+ if (cpu_has_pge)
++#endif
+ {
+ WRITE_CR4(cr4);
+ }
+@@ -4559,7 +4567,11 @@
+ write_cr0(cr0);
+ wbinvd();
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
++ if (boot_cpu_has(X86_FEATURE_PGE))
++#else
+ if (cpu_has_pge)
++#endif
+ {
+ cr4 = READ_CR4();
+ WRITE_CR4(cr4 & ~X86_CR4_PGE);
+@@ -4572,7 +4584,11 @@
+ wbinvd();
+ __flush_tlb();
+ write_cr0(cr0 & 0xbfffffff);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
++ if (boot_cpu_has(X86_FEATURE_PGE))
++#else
+ if (cpu_has_pge)
++#endif
+ {
+ WRITE_CR4(cr4);
+ }
+diff -uNr 16.8/common/lib/modules/fglrx/build_mod/firegl_public.h 16.8b/common/lib/modules/fglrx/build_mod/firegl_public.h
+--- 16.8/common/lib/modules/fglrx/build_mod/firegl_public.h 2015-12-18 19:47:41.000000000 +0100
++++ 16.8b/common/lib/modules/fglrx/build_mod/firegl_public.h 2016-08-15 15:09:05.815141238 +0200
+@@ -650,9 +650,15 @@
+ #define cpu_has_pat test_bit(X86_FEATURE_PAT, (void *) &boot_cpu_data.x86_capability)
+ #endif
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
++#ifndef boot_cpu_has(X86_FEATURE_PGE)
++#define boot_cpu_has(X86_FEATURE_PGE) test_bit(X86_FEATURE_PGE, &boot_cpu_data.x86_capability)
++#endif
++#else
+ #ifndef cpu_has_pge
+ #define cpu_has_pge test_bit(X86_FEATURE_PGE, &boot_cpu_data.x86_capability)
+ #endif
++#endif
+
+ /* 2.6.29 defines pgprot_writecombine as a macro which resolves to a
+ * GPL-only function with the same name. So we always use our own
diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix
index 885aec52dc7..0ee928754db 100644
--- a/pkgs/os-specific/linux/batman-adv/alfred.nix
+++ b/pkgs/os-specific/linux/batman-adv/alfred.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }:
let
- ver = "2016.3";
+ ver = "2016.5";
in
stdenv.mkDerivation rec {
name = "alfred-${ver}";
src = fetchurl {
url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
- sha256 = "0a92n570hrsh58ivr29c0lkjs7y6zxi1hk0l5mvaqs7k3w7z691l";
+ sha256 = "1ln997qyknkfm7xp4vx5lm0z833ksn1gn4dyjvr3qr1pgyzvmcrp";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix
index 279261745fb..c8cab86413f 100644
--- a/pkgs/os-specific/linux/batman-adv/batctl.nix
+++ b/pkgs/os-specific/linux/batman-adv/batctl.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, libnl }:
let
- ver = "2016.3";
+ ver = "2016.5";
in
stdenv.mkDerivation rec {
name = "batctl-${ver}";
src = fetchurl {
url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
- sha256 = "0ckh11dw9l6kljwa953384y295jd36x4kwzcw5wpplnx7rkg42cj";
+ sha256 = "1saa088ggsr7bwlvnzpgjj6zqn51j0km96f4x1djhj55hwfypv87";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix
index 3170569d563..04446998624 100644
--- a/pkgs/os-specific/linux/batman-adv/default.nix
+++ b/pkgs/os-specific/linux/batman-adv/default.nix
@@ -2,14 +2,14 @@
#assert stdenv.lib.versionOlder kernel.version "3.17";
-let base = "batman-adv-2016.3"; in
+let base = "batman-adv-2016.5"; in
stdenv.mkDerivation rec {
name = "${base}-${kernel.version}";
src = fetchurl {
url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz";
- sha256 = "0rzhgj0g2hwlrzr8l9ymj6s60vk2zpk1a8x1lm4lhnhsqs9qj4kf";
+ sha256 = "1dqdzpxdrgqpgkc6bqfvbvx5x18bpd9y459j0iyva47lqj8gr86h";
};
hardeningDisable = [ "pic" ];
diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index de318a9474a..b5429812441 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -5,11 +5,11 @@
assert stdenv.isLinux;
stdenv.mkDerivation rec {
- name = "bluez-5.40";
+ name = "bluez-5.43";
src = fetchurl {
url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
- sha256 = "09ywk3lvgis0nbi0d5z8d4qp5r33lzwnd6bdakacmbsm420qpnns";
+ sha256 = "05cdnpz0w2lwq2x5ba87q1h2wgb4lfnpbnbh6p7499hx59fw1j8n";
};
pythonPath = with pythonPackages;
diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index c3842959883..c548b55105d 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
name = "broadcom-sta-${version}-${kernel.version}";
src = fetchurl {
- url = "http://www.broadcom.com/docs/linux_sta/${tarball}";
+ url = "https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/${tarball}";
sha256 = hashes."${stdenv.system}";
};
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
(fetchpatch {
name = "linux-4.8.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/004-linux48.patch?h=broadcom-wl-dkms";
- sha256 = "0s8apf6l3qm9kln451g4z0pr13f4jdgyval1vfl2abg0dqc5xfhs";
+ sha256 = "1g1gazxx67kxyw242cli6bf62il7ikzmf0w6v14k44j6b4bihcax";
})
];
diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix
index 6dcf8e11a3e..f69319b5256 100644
--- a/pkgs/os-specific/linux/cifs-utils/default.nix
+++ b/pkgs/os-specific/linux/cifs-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kerberos, keyutils, pam }:
+{ stdenv, fetchurl, kerberos, keyutils, pam, talloc }:
stdenv.mkDerivation rec {
name = "cifs-utils-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1xs9rwqfpx8qj5mcmagw6y1hzwc71zhzb5r8hv06sz16p1w6axz2";
};
- buildInputs = [ kerberos keyutils pam ];
+ buildInputs = [ kerberos keyutils pam talloc ];
makeFlags = "root_sbindir=$(out)/sbin";
diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index 8e92aaf6346..5e028ffc74a 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, devicemapper, openssl, libuuid, pkgconfig, popt
-, enablePython ? false, python ? null
+, enablePython ? false, python2 ? null
}:
-assert enablePython -> python != null;
+assert enablePython -> python2 != null;
stdenv.mkDerivation rec {
name = "cryptsetup-1.7.0";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional enablePython "--enable-python";
buildInputs = [ devicemapper openssl libuuid pkgconfig popt ]
- ++ stdenv.lib.optional enablePython python;
+ ++ stdenv.lib.optional enablePython python2;
meta = {
homepage = https://gitlab.com/cryptsetup/cryptsetup/;
diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix
index 8f7772de1fd..ccedc381504 100644
--- a/pkgs/os-specific/linux/dstat/default.nix
+++ b/pkgs/os-specific/linux/dstat/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, python, pythonPackages }:
+{ stdenv, fetchurl, python2Packages }:
-stdenv.mkDerivation rec {
+python2Packages.mkPythonDerivation rec {
name = "dstat-${version}";
version = "0.7.3";
@@ -9,21 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "16286z3y2lc9nsq8njzjkv6k2vyxrj9xiixj1k3gnsbvhlhkirj6";
};
- buildInputs = with pythonPackages; [ python-wifi wrapPython ];
-
- pythonPath = with pythonPackages; [ python-wifi ];
-
- patchPhase = ''
- sed -i -e 's|/usr/bin/env python|${python}/bin/python|' \
- -e "s|/usr/share/dstat|$out/share/dstat|" dstat
- '';
+ propagatedBuildInputs = with python2Packages; [ python-wifi ];
makeFlags = [ "prefix=$(out)" ];
- postInstall = ''
- wrapPythonProgramsIn $out/bin "$out $pythonPath"
- '';
-
meta = with stdenv.lib; {
homepage = http://dag.wieers.com/home-made/dstat/;
description = "Versatile resource statistics tool";
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index 2ee232e877d..1c1b11f1ef4 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "raspberrypi-firmware-${version}";
- version = "1.20160620";
+ version = "1.20161020";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "firmware";
rev = version;
- sha256 = "06g691px0abndp5zvz2ba1g675rcqb64n055h5ahgnlck5cdpawg";
+ sha256 = "073cry7xqrbkn8p1qzl4f3z6jvcbks4i61fz7i2pbwa60vddcp34";
};
dontStrip = true; # Stripping breaks some of the binaries
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 4d5fac82d93..bd99a7979ee 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -27,8 +27,11 @@ with stdenv.lib;
MODULE_COMPRESS_XZ y
''}
+ KERNEL_XZ y
+
# Debugging.
DEBUG_KERNEL y
+ DYNAMIC_DEBUG y
TIMER_STATS y
BACKTRACE_SELF_TEST n
CPU_NOTIFIER_ERROR_INJECT? n
@@ -258,6 +261,12 @@ with stdenv.lib;
CIFS_XATTR y
CIFS_POSIX y
CIFS_FSCACHE y
+ CIFS_STATS y
+ CIFS_WEAK_PW_HASH y
+ CIFS_UPCALL y
+ CIFS_ACL y
+ CIFS_DFS_UPCALL y
+ CIFS_SMB2 y
${optionalString (versionAtLeast version "3.12") ''
CEPH_FSCACHE y
''}
@@ -341,6 +350,7 @@ with stdenv.lib;
CGROUPS y # used by systemd
FHANDLE y # used by systemd
SECCOMP y # used by systemd >= 231
+ SECCOMP_FILTER y # ditto
POSIX_MQUEUE y
FRONTSWAP y
FUSION y # Fusion MPT device support
@@ -363,7 +373,9 @@ with stdenv.lib;
${optionalString (versionAtLeast version "3.15" && versionOlder version "4.8") ''
MLX4_EN_VXLAN y
''}
- MODVERSIONS y
+ ${optionalString (versionOlder version "4.9") ''
+ MODVERSIONS y
+ ''}
MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
MTRR_SANITIZER y
NET_FC y # Fibre Channel driver support
diff --git a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix
index 2193dabd0bc..ed8942b1066 100644
--- a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix
+++ b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix
@@ -22,6 +22,8 @@ PAX_PT_PAX_FLAGS y
PAX_XATTR_PAX_FLAGS y
PAX_EI_PAX n
+PAX_INITIFY y
+
# The bts instrumentation method is compatible with binary only modules.
#
# Note: if platform supports SMEP, we could do without this
@@ -29,6 +31,10 @@ PAX_KERNEXEC_PLUGIN_METHOD_BTS y
# Additional grsec hardening not implied by auto constraints
GRKERNSEC_IO y
+GRKERNSEC_SYSFS_RESTRICT y
+GRKERNSEC_ROFS y
+
+GRKERNSEC_MODHARDEN y
# Disable protections rendered useless by redistribution
GRKERNSEC_HIDESYM n
@@ -50,10 +56,8 @@ GRKERNSEC_FORKFAIL y
# Wishlist: support trusted path execution
GRKERNSEC_TPE n
-# Wishlist: enable this, but breaks user initiated module loading
-GRKERNSEC_MODHARDEN n
-
GRKERNSEC_SYSCTL y
GRKERNSEC_SYSCTL_DISTRO y
-GRKERNSEC_SYSCTL_ON y
+# Assume that appropriate sysctls are toggled once the system is up
+GRKERNSEC_SYSCTL_ON n
''
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 48f12307bd1..72fbe15b02d 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
- version = "3.12.66";
+ version = "3.12.68";
extraMeta.branch = "3.12";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
- sha256 = "02nac7sr0c1h10mxp5azlsmz0gsr7qllsn2hibjknhk7jg8ry8cc";
+ sha256 = "0k4kwxmm6vj840k4v6iyswsajaxsb5g9vrc7mzr4grflfbjrgh14";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix
index 67d8d267b54..b7f98829931 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
- version = "4.1.35";
+ version = "4.1.36";
extraMeta.branch = "4.1";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0jn09hs91d5fi6615v9fnbpggyh1x192q6faggpbb90q110g0jjl";
+ sha256 = "140my5r39w795gsaglqxaw97hwpy8qf95c6hy2cr7a122bgnslp1";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 2930ebdfc7b..6eb6e4663e9 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.30";
+ version = "4.4.39";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0p4r779fyhjp9fxc00qqfanjxm1xlajabd2b8d7y1p8jplrr294x";
+ sha256 = "188ij72z05sbzrn438r9awpf2pvpv8p2iykfcxs2kxibn23c2jw6";
};
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 b3a5e97e5d5..7a6ce4533e9 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.6";
+ version = "4.8.15";
extraMeta.branch = "4.8";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0szk5m4wj6w0avpri9168acid8apbsjv78wz0k4cymh88804wx3l";
+ sha256 = "1vlgacsdcww333n9vm2pmdfkcpkjhavrh1aalrr7p6vj2c4jc18n";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
new file mode 100644
index 00000000000..f154e143e03
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
+
+import ./generic.nix (args // rec {
+ version = "4.9";
+ modDirVersion = "4.9.0";
+ extraMeta.branch = "4.9";
+
+ src = fetchurl {
+ url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+ sha256 = "029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a";
+ };
+
+ kernelPatches = args.kernelPatches;
+
+ features.iwlwifi = true;
+ features.efiBootStub = true;
+ features.needsCifsUtils = true;
+ features.canDisableNetfilterConntrackHelpers = true;
+ features.netfilterRPFilter = true;
+} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index eda2dd26163..7a6ce4533e9 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.7.10";
- extraMeta.branch = "4.7";
+ version = "4.8.15";
+ extraMeta.branch = "4.8";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1p2r5d0jcrak9gxp0339g9z198x9laf09h08ck4jllhhaajrnicj";
+ sha256 = "1vlgacsdcww333n9vm2pmdfkcpkjhavrh1aalrr7p6vj2c4jc18n";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
index 199ff9122cb..a037343751c 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/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index a069e7606cc..f41c53da5a6 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, perl, buildLinux, ... } @ args:
let
- modDirVersion = "4.4.13";
- tag = "1.20160620-1";
+ modDirVersion = "4.4.26";
+ tag = "1.20161020-1";
in
stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
version = "${modDirVersion}-${tag}";
@@ -12,10 +12,13 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
owner = "raspberrypi";
repo = "linux";
rev = "raspberrypi-kernel_${tag}";
- sha256 = "0bydlzmd9mar07j6dihhzn1xm6vpn92y33vf1qsdkl3hjil6brfc";
+ sha256 = "0y76xrapq7710zzf6sif94xzly72gg505y65lslfirng500ncnv5";
};
features.iwlwifi = true;
+ features.needsCifsUtils = true;
+ features.canDisableNetfilterConntrackHelpers = true;
+ features.netfilterRPFilter = true;
extraMeta.hydraPlatforms = [];
})) (oldAttrs: {
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 39bfbe76e6c..394469d06fa 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
- version = "4.9-rc3";
- modDirVersion = "4.9.0-rc3";
+ version = "4.9-rc8";
+ modDirVersion = "4.9.0-rc8";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
- sha256 = "16dvjxh1i0s18mzm2bcj1v1drv7n2id39jgy71n7i5pyvzc5ffhj";
+ sha256 = "1xyham8by966mavk5wxy6va5cq2lf2d1jiqps70kcc4064v365r7";
};
features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 4ab688c26af..5f890b9b9fe 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -129,9 +129,7 @@ let
'' + (optionalString installsFirmware ''
mkdir -p $out/lib/firmware
'') + (if (platform ? kernelDTB && platform.kernelDTB) then ''
- make $makeFlags "''${makeFlagsArray[@]}" dtbs
- mkdir -p $out/dtbs
- cp $buildRoot/arch/$karch/boot/dts/*.dtb $out/dtbs
+ make $makeFlags "''${makeFlagsArray[@]}" dtbs dtbs_install INSTALL_DTBS_PATH=$out/dtbs
'' else "") + (if isModular then ''
if [ -z "$dontStrip" ]; then
installFlagsArray+=("INSTALL_MOD_STRIP=1")
diff --git a/pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch b/pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch
new file mode 100644
index 00000000000..9f5790862b6
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch
@@ -0,0 +1,45 @@
+
+From Yang Shi <>
+Subject [PATCH] crypto: rsa - fix a potential race condition in build
+Date Fri, 2 Dec 2016 15:41:04 -0800
+
+
+When building kernel with RSA enabled with multithreaded, the below
+compile failure might be caught:
+
+| /buildarea/kernel-source/crypto/rsa_helper.c:18:28: fatal error: rsapubkey-asn1.h: No such file or directory
+| #include "rsapubkey-asn1.h"
+| ^
+| compilation terminated.
+| CC crypto/rsa-pkcs1pad.o
+| CC crypto/algboss.o
+| CC crypto/testmgr.o
+| make[3]: *** [/buildarea/kernel-source/scripts/Makefile.build:289: crypto/rsa_helper.o] Error 1
+| make[3]: *** Waiting for unfinished jobs....
+| make[2]: *** [/buildarea/kernel-source/Makefile:969: crypto] Error 2
+| make[1]: *** [Makefile:150: sub-make] Error 2
+| make: *** [Makefile:24: __sub-make] Error 2
+
+The header file is not generated before rsa_helper is compiled, so
+adding dependency to avoid such issue.
+
+Signed-off-by: Yang Shi
+
+---
+ crypto/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/crypto/Makefile b/crypto/Makefile
+index 99cc64a..8db39f9 100644
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -40,6 +40,7 @@ obj-$(CONFIG_CRYPTO_ECDH) += ecdh_generic.o
+
+ $(obj)/rsapubkey-asn1.o: $(obj)/rsapubkey-asn1.c $(obj)/rsapubkey-asn1.h
+ $(obj)/rsaprivkey-asn1.o: $(obj)/rsaprivkey-asn1.c $(obj)/rsaprivkey-asn1.h
++$(obj)/rsa_helper.o: $(obj)/rsa_helper.c $(obj)/rsaprivkey-asn1.h
+ clean-files += rsapubkey-asn1.c rsapubkey-asn1.h
+ clean-files += rsaprivkey-asn1.c rsaprivkey-asn1.h
+
+--
+2.0.2
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 6bba248374b..74cf8d156af 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -25,10 +25,13 @@ let
inherit grver kver grrev;
patch = fetchurl {
- # When updating versions/hashes, ALWAYS use the official version; we use
- # this mirror only because upstream removes sources files immediately upon
- # releasing a new version ...
- url = "https://raw.githubusercontent.com/slashbeast/grsecurity-scrape/master/${grbranch}/${name}.patch";
+ urls = [
+ "https://grsecurity.net/${grbranch}/${name}.patch"
+ # When updating versions/hashes, ALWAYS use the official
+ # version; we use this mirror only because upstream removes
+ # source files immediately upon releasing a new version ...
+ "https://raw.githubusercontent.com/slashbeast/grsecurity-scrape/master/${grbranch}/${name}.patch"
+ ];
inherit sha256;
};
@@ -38,6 +41,12 @@ in
rec {
+ multithreaded_rsapubkey =
+ {
+ name = "multithreaded-rsapubkey-asn1.patch";
+ patch = ./multithreaded-rsapubkey-asn1.patch;
+ };
+
bridge_stp_helper =
{ name = "bridge-stp-helper";
patch = ./bridge-stp-helper.patch;
@@ -86,9 +95,9 @@ rec {
};
grsecurity_testing = grsecPatch
- { kver = "4.7.10";
- grrev = "201611011946";
- sha256 = "0nva1007r4shlcxzflbxvd88yzvb98si2kjlgnhdqphyz1c0qhql";
+ { kver = "4.8.15";
+ grrev = "201612151923";
+ sha256 = "1di4v0b0sn7ibg9vrn8w7d5vjxd2mdlxdmqsnyd6xyn8g00fra89";
};
# This patch relaxes grsec constraints on the location of usermode helpers,
@@ -146,6 +155,14 @@ rec {
url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git"
+ "/patch/drivers/lguest/x86/core.c?id=cdd77e87eae52";
sha256 = "04xlx6al10cw039av6jkby7gx64zayj8m1k9iza40sw0fydcfqhc";
+ };
+ };
+
+ packet_fix_race_condition_CVE_2016_8655 =
+ { name = "packet_fix_race_condition_CVE_2016_8655.patch";
+ patch = fetchpatch {
+ url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=84ac7260236a49c79eede91617700174c2c19b0c";
+ sha256 = "19viqjjgq8j8jiz5yhgmzwhqvhwv175q645qdazd1k69d25nv2ki";
+ };
};
- };
}
diff --git a/pkgs/os-specific/linux/kexectools/arm.patch b/pkgs/os-specific/linux/kexectools/arm.patch
new file mode 100644
index 00000000000..9c1d482c81a
--- /dev/null
+++ b/pkgs/os-specific/linux/kexectools/arm.patch
@@ -0,0 +1,28 @@
+Upstream kexec-tools 2.0.13 does not pack arm phys_to_virt.h and iomem.h,
+include them here for a temporary fix
+
+diff -uprN kexec-tools/kexec/arch/arm/iomem.h kexec-tools.1/kexec/arch/arm/iomem.h
+--- kexec-tools/kexec/arch/arm/iomem.h 1970-01-01 08:00:00.000000000 +0800
++++ kexec-tools.1/kexec/arch/arm/iomem.h 2016-08-09 15:38:26.938594379 +0800
+@@ -0,0 +1,9 @@
++#ifndef IOMEM_H
++#define IOMEM_H
++
++#define SYSTEM_RAM "System RAM\n"
++#define SYSTEM_RAM_BOOT "System RAM (boot alias)\n"
++#define CRASH_KERNEL "Crash kernel\n"
++#define CRASH_KERNEL_BOOT "Crash kernel (boot alias)\n"
++
++#endif
+diff -uprN kexec-tools/kexec/arch/arm/phys_to_virt.h kexec-tools.1/kexec/arch/arm/phys_to_virt.h
+--- kexec-tools/kexec/arch/arm/phys_to_virt.h 1970-01-01 08:00:00.000000000 +0800
++++ kexec-tools.1/kexec/arch/arm/phys_to_virt.h 2016-08-09 14:50:30.104143361 +0800
+@@ -0,0 +1,8 @@
++#ifndef PHYS_TO_VIRT_H
++#define PHYS_TO_VIRT_H
++
++#include
++
++extern uint64_t phys_offset;
++
++#endif
diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index cb30de44a81..cd2833617b9 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -2,17 +2,19 @@
stdenv.mkDerivation rec {
name = "kexec-tools-${version}";
- version = "2.0.12";
+ version = "2.0.13";
src = fetchurl {
urls = [
"mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz"
"http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz"
];
- sha256 = "03cj7w2l5fqn72xfhl4q6z0zbziwkp9bfn0gs7gaf9i44jv6gkhl";
+ sha256 = "1k75p9h29xx57l1c69ravm4pg9pmriqxmwja12hgrnvi251ayjw7";
};
- hardeningDisable = [ "format" ];
+ patches = [ ./arm.patch ];
+
+ hardeningDisable = [ "format" "pic" "relro" ];
buildInputs = [ zlib ];
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index aad73844a66..3c413ca2426 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -12,11 +12,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "lxc-${version}";
- version = "2.0.4";
+ version = "2.0.6";
src = fetchurl {
url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
- sha256 = "10lm7vfw4j7arcynmgyjqd8v2fqn7spbablj42j26kmzljcydj8l";
+ sha256 = "0ynddnfirh9pmy7ijg300jrgzdhjzm07fsmvdw71mb2x0p82qabw";
};
nativeBuildInputs = [
@@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
"localstatedir=\${TMPDIR}"
"sysconfdir=\${out}/etc"
"sysconfigdir=\${out}/etc/default"
+ "bashcompdir=\${out}/share/bash-completion/completions"
"READMEdir=\${TMPDIR}/var/lib/lxc/rootfs"
"LXCPATH=\${TMPDIR}/var/lib/lxc"
];
diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix
new file mode 100644
index 00000000000..ceaed205db9
--- /dev/null
+++ b/pkgs/os-specific/linux/lxcfs/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, pkgconfig, help2man, fuse, pam }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+ name = "lxcfs-${version}";
+ version = "2.0.4";
+
+ src = fetchurl {
+ url = "https://linuxcontainers.org/downloads/lxcfs/lxcfs-${version}.tar.gz";
+ sha256 = "0pfrsn7hqccpcnwg4xk8ds0avb2yc9gyvj7bk2bl90vpwsm35j7y";
+ };
+
+ nativeBuildInputs = [ pkgconfig help2man ];
+ buildInputs = [ fuse pam ];
+
+ configureFlags = [
+ "--with-init-script=systemd"
+ "--sysconfdir=/etc"
+ "--localstatedir=/var"
+ ];
+
+ installFlags = [ "SYSTEMD_UNIT_DIR=\${out}/lib/systemd" ];
+
+ postFixup = ''
+ # liblxcfs.so is reloaded with dlopen()
+ patchelf --set-rpath "$(patchelf --print-rpath "$out/bin/lxcfs"):$out/lib" "$out/bin/lxcfs"
+ '';
+
+ meta = {
+ homepage = https://linuxcontainers.org/lxcfs;
+ description = "FUSE filesystem for LXC";
+ license = licenses.asl20;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ mic92 ];
+ };
+}
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 590d2b4a854..dee201c1778 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "mcelog-${version}";
- version = "142";
+ version = "144";
src = fetchFromGitHub {
- sha256 = "1cqx7w75d570vxqi2gk9bkqqclakkhp4kjanv5j3nhqwg3p38zyv";
+ sha256 = "05b1x9z6x9yz3xmb93qvwwssjbvp28bawy8as9bfm29pyhzdxx6k";
rev = "v${version}";
repo = "mcelog";
owner = "andikleen";
diff --git a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix
index f4e7ad1f234..8887237b304 100644
--- a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = https://archlinux.org/;
+ homepage = "https://archlinux.org/";
description = "ipconfig and nfsmount tools for root on NFS, ported from klibc";
license = licenses.gpl2;
platforms = platforms.linux;
diff --git a/pkgs/os-specific/linux/molly-guard/default.nix b/pkgs/os-specific/linux/molly-guard/default.nix
new file mode 100644
index 00000000000..ac083e545fe
--- /dev/null
+++ b/pkgs/os-specific/linux/molly-guard/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, dpkg, busybox, systemd }:
+
+stdenv.mkDerivation rec {
+ name = "molly-guard-${version}";
+ version = "0.6.3";
+
+ src = fetchurl {
+ url = "https://launchpad.net/ubuntu/+source/molly-guard/${version}/+build/8892607/+files/molly-guard_${version}_all.deb";
+ sha256 = "1d1x60m6kh9wfh9lc22g5s0j40aivwgsczykk27ymwl1pvk58dxn";
+ };
+
+ buildInputs = [ dpkg ];
+
+ sourceRoot = ".";
+
+ unpackCmd = ''
+ dpkg-deb -x "$src" .
+ '';
+
+ installPhase = ''
+ sed -i "s|/lib/molly-guard|${systemd}/sbin|g" lib/molly-guard/molly-guard
+ sed -i "s|run-parts|${busybox}/bin/run-parts|g" lib/molly-guard/molly-guard
+ sed -i "s|/etc/molly-guard/|$out/etc/molly-guard/|g" lib/molly-guard/molly-guard
+ cp -r ./ $out/
+ '';
+
+ postFixup = ''
+ for modus in init halt poweroff reboot runlevel shutdown telinit; do
+ ln -sf $out/lib/molly-guard/molly-guard $out/bin/$modus;
+ done;
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Attempts to prevent you from accidentally shutting down or rebooting machines";
+ homepage = https://anonscm.debian.org/git/collab-maint/molly-guard.git/;
+ license = licenses.artistic2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ DerTim1 ];
+ priority = -10;
+ };
+}
diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix
index f60ece0fcec..0e0178e8845 100644
--- a/pkgs/os-specific/linux/multipath-tools/default.nix
+++ b/pkgs/os-specific/linux/multipath-tools/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
' libmultipath/defaults.h
sed -i -e 's,\$(DESTDIR)/\(usr/\)\?,$(prefix)/,g' \
kpartx/Makefile libmpathpersist/Makefile
+ sed -i -e "s,GZIP = .*, GZIP = gzip -9n -c," \
+ Makefile.inc
'';
nativeBuildInputs = [ gzip ];
diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index ae0c7703de6..dd12a18dc82 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
stdenv.mkDerivation rec {
name = "musl-${version}";
- version = "1.1.11";
+ version = "1.1.15";
src = fetchurl {
url = "http://www.musl-libc.org/releases/${name}.tar.gz";
- sha256 = "0grmmah3d9wajii26010plpinv3cbiq3kfqsblgn84kv3fjnv7mv";
+ sha256 = "1ymhxkskivzph0q34zadwfglc5gyahqajm7chqqn2zraxv3lgr4p";
};
enableParallelBuilding = true;
@@ -22,6 +22,15 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-shared"
"--enable-static"
+ "--disable-gcc-wrapper"
+ ];
+
+ patches = [
+ # CVE-2016-8859: http://www.openwall.com/lists/oss-security/2016/10/19/1
+ (fetchpatch {
+ url = "https://git.musl-libc.org/cgit/musl/patch/?id=c3edc06d1e1360f3570db9155d6b318ae0d0f0f7";
+ sha256 = "15ih0aj27lz4sgq8r5jndc3qy5gz3ciraavrqpp0vw8h5wjcsb9v";
+ })
];
dontDisableStatic = true;
diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix
index eabc2840881..c22ffb60df8 100644
--- a/pkgs/os-specific/linux/ndiswrapper/default.nix
+++ b/pkgs/os-specific/linux/ndiswrapper/default.nix
@@ -38,5 +38,6 @@ stdenv.mkDerivation {
description = "Ndis driver wrapper for the Linux kernel";
homepage = http://sourceforge.net/projects/ndiswrapper;
license = "GPL";
+ broken = true;
};
}
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 229865b49a3..69e4de69f9c 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null;
let
- versionNumber = "367.57";
+ versionNumber = "375.20";
# Policy: use the highest stable version as the default (on our master).
inherit (stdenv.lib) makeLibraryPath;
@@ -30,12 +30,12 @@ stdenv.mkDerivation {
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
- sha256 = "1fw87nvbf8dmy7clwmm7jwp842c78mkz9bcb060wbihsywkfkm23";
+ sha256 = "0da3mgfmkhs576wfkdmk8pbmvsksalkwz8a75vnhk0385fnd6yfc";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}.run";
- sha256 = "0lc87bgr29l9idhy2a4bsplkwx9r0dz9kjhcc5xq2xqkkyr5sqd1";
+ sha256 = "02v20xns8w4flpllibc684g5yghi5dy28avsarccjyn5knhl03ni";
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";
diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix
index 4246e512321..414338702cc 100644
--- a/pkgs/os-specific/linux/pagemon/default.nix
+++ b/pkgs/os-specific/linux/pagemon/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "pagemon-${version}";
- version = "0.01.08";
+ version = "0.01.10";
src = fetchFromGitHub {
- sha256 = "079x8ah33nh4faqcy0jy24x30l40j5m00d57aawaayaq18smqs3f";
+ sha256 = "04dbcr7bzgp4kvhw1rsn084cz4qbfhf7ifyh3ikgdka9w98057h1";
rev = "V${version}";
repo = "pagemon";
owner = "ColinIanKing";
diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/pkgs/os-specific/linux/pam_pgsql/default.nix
index 42949a3557a..10383a13e7e 100644
--- a/pkgs/os-specific/linux/pam_pgsql/default.nix
+++ b/pkgs/os-specific/linux/pam_pgsql/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, postgresql, libgcrypt, pam }:
stdenv.mkDerivation rec {
- version = "0.7.3.2";
name = "pam_pgsql-${version}";
+ version = "0.7.3.2";
src = fetchFromGitHub {
owner = "pam-pgsql";
diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix
index 65cbf1c4589..1e4373f286c 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 0c2fd9b6f86..4611a3c09b7 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/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index e56f285d526..e99d7d86bfb 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -43,7 +43,8 @@ stdenv.mkDerivation rec {
postInstall =
''
# Don't install ‘groups’, since coreutils already provides it.
- rm $out/bin/groups $out/share/man/man1/groups.*
+ rm $out/bin/groups
+ rm $man/share/man/man1/groups.*
# Move the su binary into the su package
mkdir -p $su/bin
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index c86efe22f6e..e84c964d675 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/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix
index f0f25f14e49..272b1368dec 100644
--- a/pkgs/os-specific/linux/tp_smapi/default.nix
+++ b/pkgs/os-specific/linux/tp_smapi/default.nix
@@ -1,13 +1,12 @@
-{stdenv, fetchurl, kernel}:
+{ stdenv, fetchurl, kernel, writeScript, coreutils, gnugrep, jq, curl
+}:
-stdenv.mkDerivation rec {
- version = "0.42";
- name = "tp_smapi-${version}-${kernel.version}";
+let
+ data = stdenv.lib.importJSON ./update.json;
+in stdenv.mkDerivation rec {
+ name = "tp_smapi-${data.version}-${kernel.version}";
- src = fetchurl {
- url = "https://github.com/evgeni/tp_smapi/releases/download/tp-smapi%2F0.42/tp_smapi-${version}.tgz";
- sha256 = "09rdg7fm423x6sbbw3lvnvmk4nyc33az8ar93xgq0n9qii49z3bv";
- };
+ src = fetchurl { inherit (data) url sha256; };
hardeningDisable = [ "pic" ];
@@ -25,6 +24,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = import ./update.nix {
+ inherit writeScript coreutils gnugrep jq curl;
+ };
+
meta = {
description = "IBM ThinkPad hardware functions driver";
homepage = "https://github.com/evgeni/tp_smapi/tree/tp-smapi/0.41";
diff --git a/pkgs/os-specific/linux/tp_smapi/update.json b/pkgs/os-specific/linux/tp_smapi/update.json
new file mode 100644
index 00000000000..15e9801e7f2
--- /dev/null
+++ b/pkgs/os-specific/linux/tp_smapi/update.json
@@ -0,0 +1,5 @@
+{
+ "version": "0.42",
+ "url": "https://github.com/evgeni/tp_smapi/archive/tp-smapi/0.42.tar.gz",
+ "sha256": "cd28bf6ee21b2c27b88d947cb0bfcb19648c7daa5d350115403dbcad05849381"
+}
diff --git a/pkgs/os-specific/linux/tp_smapi/update.nix b/pkgs/os-specific/linux/tp_smapi/update.nix
new file mode 100644
index 00000000000..0c97d18472c
--- /dev/null
+++ b/pkgs/os-specific/linux/tp_smapi/update.nix
@@ -0,0 +1,23 @@
+{ writeScript, coreutils, gnugrep, jq, curl
+}:
+
+writeScript "update-tp_smapi" ''
+PATH=${coreutils}/bin:${gnugrep}/bin:${jq}/bin:${curl}/bin
+
+pushd pkgs/os-specific/linux/tp_smapi
+
+tmpfile=`mktemp`
+tags=`curl -s https://api.github.com/repos/evgeni/tp_smapi/tags`
+latest_tag=`echo $tags | jq -r '.[] | .name' | grep -oP "^tp-smapi/\K.*" | sort --version-sort | tail -1`
+sha256=`curl -sL "https://github.com/evgeni/tp_smapi/archive/tp-smapi/$latest_tag.tar.gz" | sha256sum | cut -d" " -f1`
+
+cat > update.json <= 4.1 https://www.wireguard.io/install/#kernel-requirements
assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1";
-# module is incompatible with the PaX constification plugin
-assert kernel != null -> !(kernel.features.grsecurity or false);
let
- name = "wireguard-unstable-${version}";
+ name = "wireguard-${version}";
- version = "2016-10-25";
+ version = "0.0.20161209";
src = fetchurl {
- url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-0.0.20161025.tar.xz";
- sha256 = "09rhap3dzb8rcq1a1af9inf1qz7161yghafbgpbnd9dg016vhgs3";
+ url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
+ sha256 = "11n8dq8a8w0qj8xg5np9w02kmk14hn5hphv2h4bjw9hs8yxvkaya";
};
meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index f2cf9eca4dc..d7e406107b1 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 7725a7272ed..62814b351b6 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/corosync/default.nix b/pkgs/servers/corosync/default.nix
index d04a1d124fa..dc2f0f6fd70 100644
--- a/pkgs/servers/corosync/default.nix
+++ b/pkgs/servers/corosync/default.nix
@@ -1,50 +1,61 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, nss, nspr, libqb
-, dbus ? null
-, librdmacm ? null, libibverbs ? null
-, libstatgrab ? null
-, net_snmp ? null
+, dbus, librdmacm, libibverbs, libstatgrab, net_snmp
+, enableDbus ? false
+, enableInfiniBandRdma ? false
+, enableMonitoring ? false
+, enableSnmp ? false
}:
with stdenv.lib;
+
stdenv.mkDerivation rec {
- name = "corosync-2.4.1";
+ name = "corosync-2.4.2";
src = fetchurl {
url = "http://build.clusterlabs.org/corosync/releases/${name}.tar.gz";
- sha256 = "0w8m97ih7a2g99pmjsckw4xwbgzv96xdgg62s2a4qbgnw4yl637y";
+ sha256 = "1aab380mv4ivy5icmwvk7941jbs6ikm21p5ijk7brr4z608k0vpj";
};
- buildInputs = [
- makeWrapper pkgconfig nss nspr libqb
- dbus librdmacm libibverbs libstatgrab net_snmp
- ];
+ nativeBuildInputs = [ makeWrapper pkgconfig ];
- # Remove when rdma libraries gain pkgconfig support
- ibverbs_CFLAGS = optionalString (libibverbs != null)
- "-I${libibverbs}/include/infiniband";
- ibverbs_LIBS = optionalString (libibverbs != null) "-libverbs";
- rdmacm_CFLAGS = optionalString (librdmacm != null)
- "-I${librdmacm}/include/rdma";
- rdmacm_LIBS = optionalString (librdmacm != null) "-lrdmacm";
+ buildInputs = [
+ nss nspr libqb
+ ] ++ optional enableDbus dbus
+ ++ optional enableInfiniBandRdma [ librdmacm libibverbs ]
+ ++ optional enableMonitoring libstatgrab
+ ++ optional enableSnmp net_snmp;
configureFlags = [
+ "--sysconfdir=/etc"
+ "--localstatedir=/var"
+ "--with-logdir=/var/log/corosync"
"--enable-watchdog"
"--enable-qdevices"
- ] ++ optional (dbus != null) "--enable-dbus"
- ++ optional (librdmacm != null && libibverbs != null) "--enable-rdma"
- ++ optional (libstatgrab != null) "--enable-monitoring"
- ++ optional (net_snmp != null) "--enable-snmp";
+ ] ++ optional enableDbus "--enable-dbus"
+ ++ optional enableInfiniBandRdma "--enable-rdma"
+ ++ optional enableMonitoring "--enable-monitoring"
+ ++ optional enableSnmp "--enable-snmp";
+
+ installFlags = [
+ "sysconfdir=$(out)/etc"
+ "localstatedir=$(out)/var"
+ "COROSYSCONFDIR=$(out)/etc/corosync"
+ "INITDDIR=$(out)/etc/init.d"
+ "LOGROTATEDIR=$(out)/etc/logrotate.d"
+ ];
postInstall = ''
wrapProgram $out/bin/corosync-blackbox \
--prefix PATH ":" "$out/sbin:${libqb}/sbin"
'';
+ enableParallelBuilding = true;
+
meta = {
homepage = http://corosync.org/;
description = "A Group Communication System with features for implementing high availability within applications";
license = licenses.bsd3;
platforms = platforms.linux;
- maintainers = with maintainers; [ wkennington ];
+ maintainers = with maintainers; [ wkennington montag451 ];
};
}
diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix
new file mode 100644
index 00000000000..044d4fa50ab
--- /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/dico/default.nix b/pkgs/servers/dico/default.nix
index 7c2af1dd25e..c530929f79e 100644
--- a/pkgs/servers/dico/default.nix
+++ b/pkgs/servers/dico/default.nix
@@ -2,11 +2,11 @@
, guile, python, pcre, libffi, groff }:
stdenv.mkDerivation rec {
- name = "dico-2.3";
+ name = "dico-2.4";
src = fetchurl {
url = "mirror://gnu/dico/${name}.tar.xz";
- sha256 = "13by0zimx90v2j8v7n4k9y3xwmh4q9jdc2f4f8yjs3x7f5bzm2pk";
+ sha256 = "13m7vahfbdj7hb38bjgd4cmfswavvxrcpppj9n4m4rar3wyzg52g";
};
hardeningDisable = [ "format" ];
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 8cb96d445c8..e3f2364463b 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -48,8 +48,8 @@ stdenv.mkDerivation rec {
ln -sf $dnsutils/bin/{dig,nslookup,nsupdate} $bin/bin
ln -sf $host/bin/host $dnsutils/bin
- for f in "$out/lib/"*.la; do
- sed -i $f -e 's|-L${openssl.dev}|-L${openssl.out}|g'
+ for f in "$lib/lib/"*.la "$dev/bin/"{isc-config.sh,bind*-config}; do
+ sed -i "$f" -e 's|-L${openssl.dev}|-L${openssl.out}|g'
done
'';
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
new file mode 100644
index 00000000000..62343666729
--- /dev/null
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn
+, systemd, nettle, libedit }:
+
+# Note: ATM only the libraries have been tested in nixpkgs.
+stdenv.mkDerivation rec {
+ name = "knot-dns-${version}";
+ version = "2.3.3";
+
+ src = fetchurl {
+ url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
+ sha256 = "a929bce3b957a81776b1db7b43b0e4473339bf16be8dbba5abb4b0593bf43c94";
+ };
+
+ outputs = [ "bin" "out" "dev" ];
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [
+ gnutls jansson liburcu lmdb libcap_ng libidn
+ systemd nettle libedit
+ # without sphinx &al. for developer documentation
+ ];
+
+ enableParallelBuilding = true;
+
+ CFLAGS = [ "-DNDEBUG" ];
+
+ #doCheck = true; problems in combination with dynamic linking
+
+ postInstall = ''rm -r "$out"/var'';
+
+ meta = with stdenv.lib; {
+ description = "Authoritative-only DNS server from .cz domain registry";
+ homepage = https://knot-dns.cz;
+ license = licenses.gpl3Plus;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.vcunat ];
+ };
+}
+
diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix
new file mode 100644
index 00000000000..ceabce82c71
--- /dev/null
+++ b/pkgs/servers/ftp/bftpd/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl}:
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "bftpd";
+ version = "4.4";
+ # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
+ src = fetchurl {
+ url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz";
+ sha256 = "0hgpqwv7mj1yln8ps9bbcjhl5hvs02nxjfkk9nhkr6fysfyyn1dq";
+ };
+ buildInputs = [];
+ preConfigure = ''
+ sed -re 's/-[og] 0//g' -i Makefile*
+ '';
+ meta = {
+ inherit version;
+ description = ''A minimal ftp server'';
+ license = stdenv.lib.licenses.gpl2Plus;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ homepage = "http://bftpd.sf.net/";
+ downloadPage = "http://bftpd.sf.net/download.html";
+ };
+}
diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix
index b8d2498b71e..7670c89f0c6 100644
--- a/pkgs/servers/gpsd/default.nix
+++ b/pkgs/servers/gpsd/default.nix
@@ -2,7 +2,7 @@
, ncurses, libX11, libXt, libXpm, libXaw, libXext
, libusb1, docbook_xml_dtd_412, docbook_xsl, bc
, libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout"
-, pythonPackages
+, python2Packages
}:
# TODO: put the X11 deps behind a guiSupport parameter for headless support
@@ -17,18 +17,18 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
scons pkgconfig docbook_xml_dtd_412 docbook_xsl xmlto bc
- pythonPackages.python
- pythonPackages.wrapPython
+ python2Packages.python
+ python2Packages.wrapPython
];
buildInputs = [
- pythonPackages.python dbus dbus_glib ncurses libX11 libXt libXpm libXaw libXext
+ python2Packages.python dbus dbus_glib ncurses libX11 libXt libXpm libXaw libXext
libxslt libusb1
];
pythonPath = [
- pythonPackages.pygobject2
- pythonPackages.pygtk
+ python2Packages.pygobject2
+ python2Packages.pygtk
];
patches = [
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConstruct
scons prefix="$out" leapfetch=no gpsd_user=${gpsdUser} gpsd_group=${gpsdGroup} \
systemd=yes udevdir="$out/lib/udev" \
- python_libdir="$out/lib/${pythonPackages.python.libPrefix}/site-packages"
+ python_libdir="$out/lib/${python2Packages.python.libPrefix}/site-packages"
'';
checkPhase = ''
diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix
index bbd74de773a..f947bf535cc 100644
--- a/pkgs/servers/http/apache-modules/mod_python/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_python/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, apacheHttpd, python }:
+{ stdenv, fetchurl, apacheHttpd, python2 }:
stdenv.mkDerivation rec {
name = "mod_python-3.5.0";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
passthru = { inherit apacheHttpd; };
- buildInputs = [ apacheHttpd python ];
+ buildInputs = [ apacheHttpd python2 ];
meta = {
homepage = http://modpython.org/;
diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index 4cccf237b9e..1d8507fc4eb 100644
--- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, apacheHttpd, python }:
+{ stdenv, fetchurl, apacheHttpd, python2 }:
stdenv.mkDerivation rec {
name = "mod_wsgi-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "14xz422jlakdhxzsl8xs9if86yf1fnkwdg0havjyqs7my0w4qrzh";
};
- buildInputs = [ apacheHttpd python ];
+ buildInputs = [ apacheHttpd python2 ];
patchPhase = ''
sed -r -i -e "s|^LIBEXECDIR=.*$|LIBEXECDIR=$out/modules|" \
diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index cfd608962d8..c00cc3f4e5d 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix (args // {
- version = "1.11.5";
- sha256 = "1xmn5m1wjx1n11lwwlcg71836acb43gwq9ngk088jpx78liqlgr2";
+ version = "1.11.7";
+ sha256 = "03ihv5v8qasifh4wlql0ggbqkyvak29g0h5fqzka69i15fsvwm8d";
})
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 00aaff899dc..edf1e59931e 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -33,32 +33,32 @@ in {
tomcat6 = common {
versionMajor = "6";
- versionMinor = "0.45";
- sha256 = "0ba8h86padpk23xmscp7sg70g0v8ji2jbwwriz59hxqy5zhd76wg";
+ versionMinor = "0.48";
+ sha256 = "1w4jf28g8p25fmijixw6b02iqlagy2rvr57y3n90hvz341kb0bbc";
};
tomcat7 = common {
versionMajor = "7";
- versionMinor = "0.72";
- sha256 = "1nx5pmz3bq3n20fdspqh8ljqy1nj67rwi1vsqjpkrvd996x7p73p";
+ versionMinor = "0.73";
+ sha256 = "11gaiy56q7pik06sdypr80sl3g6k41s171wqqwlhxffmsxm4v08f";
};
tomcat8 = common {
versionMajor = "8";
- versionMinor = "0.37";
- sha256 = "0f9d4yxjzwdrayj5l3jyiclnmpb5lffvmsnp54qpf6m3gm7cj5i6";
+ versionMinor = "0.39";
+ sha256 = "16hyypdawby66qa8y66sfprcf78wjy319a0gsi4jgfqfywcsm4s0";
};
tomcat85 = common {
versionMajor = "8";
- versionMinor = "5.5";
- sha256 = "0idfxjrw5q45f531gyjnv6xjkbj9nhy2v1w4z7558z96230a0fqj";
+ versionMinor = "5.8";
+ sha256 = "1rfws897m09pbnb1jc4684didpklfhqp86szv2jcqzdx0hlfxxs0";
};
tomcatUnstable = common {
versionMajor = "9";
- versionMinor = "0.0.M10";
- sha256 = "0p3pqwz9zjvr9w73divsyaa53mbazf0icxfs06wvgxsvkbgj5gq9";
+ versionMinor = "0.0.M13";
+ sha256 = "0im3w4iqpar7x50vg7c9zkxyqf9x53xs5jvcq79xqgrmcqb9lk91";
};
}
diff --git a/pkgs/servers/inginious/default.nix b/pkgs/servers/inginious/default.nix
index c85d96100c3..113b297787b 100644
--- a/pkgs/servers/inginious/default.nix
+++ b/pkgs/servers/inginious/default.nix
@@ -38,7 +38,7 @@ in pythonPackages.buildPythonApplication rec {
propagatedBuildInputs = with pythonPackages; [
requests2
- cgroup-utils docker_1_7_2 docutils lti mock pygments
+ cgroup-utils docker_1_7_2 docutils PyLTI mock pygments
pymongo pyyaml rpyc sh simpleldap sphinx_rtd_theme tidylib
websocket_client watchdog webpy-custom flup
];
diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix
index 8d719bec4f5..6ba60ff1772 100644
--- a/pkgs/servers/ldap/389/default.nix
+++ b/pkgs/servers/ldap/389/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap, db, cyrus_sasl
-, svrcore, icu, net_snmp, kerberos, pcre, perlPackages
+{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, pam, nspr, nss, openldap
+, db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages
}:
let
version = "1.3.5.4";
@@ -19,7 +19,15 @@ stdenv.mkDerivation rec {
# TODO: Fix bin/ds-logpipe.py, bin/logconv, bin/cl-dump
- patches = [ ./perl-path.patch ];
+ patches = [ ./perl-path.patch
+ # https://fedorahosted.org/389/ticket/48354
+ (fetchpatch {
+ name = "389-ds-base-CVE-2016-5416.patch";
+ url = "https://fedorahosted.org/389/changeset/3c2cd48b7d2cb0579f7de6d460bcd0c9bb1157bd/?format=diff&new=3c2cd48b7d2cb0579f7de6d460bcd0c9bb1157bd";
+ addPrefixes = true;
+ sha256 = "1kv3a3di1cihkaf8xdbb5mzvhm4c3frx8rc5mji8xgjyj9ni6xja";
+ })
+ ];
preConfigure = ''
# Create perl paths for library imports in perl scripts
diff --git a/pkgs/servers/mail/dovecot/plugins/antispam/default.nix b/pkgs/servers/mail/dovecot/plugins/antispam/default.nix
index 1a1ba1ad448..b972192da7a 100644
--- a/pkgs/servers/mail/dovecot/plugins/antispam/default.nix
+++ b/pkgs/servers/mail/dovecot/plugins/antispam/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
meta = with stdenv.lib; {
- homepage = http://wiki2.dovecot.org/Plugins/Antispam;
+ homepage = "http://wiki2.dovecot.org/Plugins/Antispam";
description = "An antispam plugin for the Dovecot IMAP server";
license = licenses.gpl2;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix
index 5c41f84c683..e0e5fd45b7f 100644
--- a/pkgs/servers/mail/rmilter/default.nix
+++ b/pkgs/servers/mail/rmilter/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, bison, flex, openssl, pcre, libmilter, opendkim,
- libmemcached }:
+{ stdenv, fetchFromGitHub, cmake, bison, flex, pkgconfig, openssl, pcre
+, libmilter, opendkim, libmemcached, glib }:
let patchedLibmilter = stdenv.lib.overrideDerivation libmilter (_ : {
patches = libmilter.patches ++ [ ./fd-passing-libmilter.patch ];
@@ -8,17 +8,17 @@ in
stdenv.mkDerivation rec {
name = "rmilter-${version}";
- version = "1.8.5";
+ version = "1.10.0";
src = fetchFromGitHub {
owner = "vstakhov";
repo = "rmilter";
rev = version;
- sha256 = "1bfql9v243iw3v87kjgwcx4xxw7g5nv1rsi9gk8p7xg5mzrhi3bn";
+ sha256 = "1gbp6jah88l6xqgflim01ycyp63l733bgir65fxnnrmifj1qzymh";
};
- nativeBuildInputs = [ bison cmake flex ];
- buildInputs = [ libmemcached patchedLibmilter openssl pcre opendkim];
+ nativeBuildInputs = [ bison cmake flex pkgconfig ];
+ buildInputs = [ libmemcached patchedLibmilter openssl pcre opendkim glib ];
meta = with stdenv.lib; {
homepage = "https://github.com/vstakhov/rmilter";
diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index c978c9566a3..692227b5094 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, cmake, perl
-, file, glib, gmime, libevent, luajit, openssl, pcre, pkgconfig, sqlite }:
+, file, glib, gmime, libevent, luajit, openssl, pcre, pkgconfig, sqlite, ragel }:
let libmagic = file; # libmagic provided by file package ATM
in
stdenv.mkDerivation rec {
name = "rspamd-${version}";
- version = "1.2.7";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "vstakhov";
repo = "rspamd";
rev = version;
- sha256 = "0wr9lndg5fpsrjknm828zj0zy7zvdqrak9bdr6pga3bnq6xabbik";
+ sha256 = "19hy9qr9lv17br2algig95d64zzdyly7n6c3z8fanwcpk35sgrhr";
};
nativeBuildInputs = [ cmake pkgconfig perl ];
- buildInputs = [ glib gmime libevent libmagic luajit openssl pcre sqlite];
+ buildInputs = [ glib gmime libevent libmagic luajit openssl pcre sqlite ragel ];
postPatch = ''
substituteInPlace conf/common.conf --replace "\$CONFDIR/rspamd.conf.local" "/etc/rspamd/rspamd.conf.local"
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index bcd1793315c..00f9287bea5 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -9,15 +9,28 @@ let
sha256 = "0gmx4y5kqqphnq3m7xk2vpzb0w2a4palicw7wfdr1q2schl9fhz2";
};
};
+ matrix-synapse-ldap3 = pythonPackages.buildPythonApplication rec {
+ name = "matrix-synapse-ldap3-${version}";
+ version = "0.1.1";
+
+ src = fetchFromGitHub {
+ owner = "matrix-org";
+ repo = "matrix-synapse-ldap3";
+ rev = "564eb3f109ce7f1082c47d5f8efaa792d90467f1";
+ sha256 = "1mkjlvy7a3rq405m59ihkh1wq7pa4l03fp8hgwwyjnbmz25bqmbk";
+ };
+
+ propagatedBuildInputs = with pythonPackages; [ service-identity ldap3 twisted ];
+ };
in pythonPackages.buildPythonApplication rec {
name = "matrix-synapse-${version}";
- version = "0.18.0";
+ version = "0.18.5";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "synapse";
rev = "v${version}";
- sha256 = "1wvamw5crncz5ic6waq7v1bw54zg93af1lmw4y45w3r0vzyfxp68";
+ sha256 = "1l9vfx08alf71323jrfjjvcb7pww613dwxskdgc1bplnva4khj4f";
};
patches = [ ./matrix-synapse.patch ];
@@ -25,9 +38,9 @@ in pythonPackages.buildPythonApplication rec {
propagatedBuildInputs = with pythonPackages; [
blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1
pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests2
- service-identity signedjson systemd twisted ujson unpaddedbase64 pyyaml
+ signedjson systemd twisted ujson unpaddedbase64 pyyaml
matrix-angular-sdk bleach netaddr jinja2 psycopg2
- ldap3 psutil msgpack
+ psutil msgpack lxml matrix-synapse-ldap3
];
# Checks fail because of Tox.
diff --git a/pkgs/servers/matrix-synapse/matrix-synapse.patch b/pkgs/servers/matrix-synapse/matrix-synapse.patch
index a6a393ea56c..288e6ff1624 100644
--- a/pkgs/servers/matrix-synapse/matrix-synapse.patch
+++ b/pkgs/servers/matrix-synapse/matrix-synapse.patch
@@ -3,18 +3,18 @@ new file mode 120000
index 0000000..2f1d413
--- /dev/null
+++ b/homeserver
-@@ -0,0 +1 @@
+@@ -0,0 +1,1 @@
+synapse/app/homeserver.py
\ No newline at end of file
diff --git a/setup.py b/setup.py
-index 9d24761..f3e6a00 100755
+index b00c2af..c7f6e0a 100755
--- a/setup.py
+++ b/setup.py
-@@ -85,6 +85,6 @@ setup(
+@@ -92,6 +92,6 @@ setup(
include_package_data=True,
zip_safe=False,
long_description=long_description,
- scripts=["synctl"] + glob.glob("scripts/*"),
+ scripts=["synctl", "homeserver"] + glob.glob("scripts/*"),
- cmdclass={'test': Tox},
+ cmdclass={'test': TestCommand},
)
diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix
index c4a5b0ebd29..75d12a5f66f 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/minio/default.nix b/pkgs/servers/minio/default.nix
index ee37107858b..fef4d55b36c 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
homepage = https://www.minio.io/;
description = "An S3-compatible object storage server";
maintainers = [ lib.maintainers.eelco ];
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.x86_64;
license = lib.licenses.asl20;
};
}
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index de9f75b87cc..821d049c297 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,8 +1,8 @@
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
buildGoPackage rec {
- version = "3.1.1";
- ts = "1470047149";
+ version = "4.0.0";
+ ts = "1480439068";
name = "grafana-v${version}";
goPackagePath = "github.com/grafana/grafana";
@@ -10,12 +10,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
- sha256 = "066qypjl9i0yl9jgqxh2fk6m4scrf84sfdl7b1jxgyq3c7zdzyvk";
+ sha256 = "0ps9bi4mnb3k6g2824crhyb804srk2b4d2j9k306vg0cizirn75c";
};
srcStatic = fetchurl {
url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}-${ts}.linux-x64.tar.gz";
- sha256 = "0zywijk9lg7pzql28r8vswyjixkljfjznbqy7lp5wlq1mmihmxr0";
+ sha256 = "10n3vmmyr1rvq29r5cz1rwz60smavj6fahz4vaqldh1v0qyqzjlm";
};
preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix
index bf43a93a81b..c4d60cabaa3 100644
--- a/pkgs/servers/monitoring/nagios/default.nix
+++ b/pkgs/servers/monitoring/nagios/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, perl, php, gd, libpng, zlib }:
+{ stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip }:
stdenv.mkDerivation rec {
name = "nagios-${version}";
- version = "4.0.8";
+ version = "4.2.3";
src = fetchurl {
url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz";
- sha256 = "0jyad39wa318613awlnpczrrakvjcipz8qp1mdsig1cp1hjqs9lb";
+ sha256 = "0p16sm5pkbzf4py30hwzm38194cl23wfzsvkhk4jkf3p1fq7xvl3";
};
patches = [ ./nagios.patch ];
- buildInputs = [ php perl gd libpng zlib ];
+ buildInputs = [ php perl gd libpng zlib unzip ];
configureFlags = [ "--localstatedir=/var/lib/nagios" ];
buildFlags = "all";
diff --git a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
index 79180f17241..306dee0ec62 100644
--- a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "nagios-plugins-${version}";
- version = "2.0.3";
+ version = "2.1.4";
src = fetchurl {
url = "http://nagios-plugins.org/download/${name}.tar.gz";
- sha256 = "0jm0mn55hqwl8ffx8ww9mql2wrkhp1h2k8jw53q3h0ff5m22204g";
+ sha256 = "146hrpcwciz0niqsv4k5yvkhaggs9mr5v02xnnxp5yp0xpdbama3";
};
# !!! Awful hack. Grrr... this of course only works on NixOS.
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index fcdc4beb3c3..8bf9eef6cd0 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, go, buildGoPackage, fetchFromGitHub }:
+{ stdenv, go, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "alertmanager-${version}";
- version = "0.5.0";
+ version = "0.5.1";
rev = "v${version}";
goPackagePath = "github.com/prometheus/alertmanager";
@@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev;
owner = "prometheus";
repo = "alertmanager";
- sha256 = "1k30v0z5awnd6ys2ybc2m580y98nlifpgl7hly977nfhc6s90kvh";
+ sha256 = "1z0f8jqbd4v00634qcs41h1zb70ahl63svlzn33gavripk84hwzq";
};
# Tests exist, but seem to clash with the firewall.
@@ -31,7 +31,7 @@ buildGoPackage rec {
description = "Alert dispatcher for the Prometheus monitoring system";
homepage = https://github.com/prometheus/alertmanager;
license = licenses.asl20;
- maintainers = with maintainers; [ benley ];
+ maintainers = with maintainers; [ benley fpletz ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
new file mode 100644
index 00000000000..00292afb8ce
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
@@ -0,0 +1,24 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "blackbox_exporter-${version}";
+ version = "0.3.0";
+ rev = version;
+
+ goPackagePath = "github.com/prometheus/blackbox_exporter";
+
+ src = fetchFromGitHub {
+ rev = "v${version}";
+ owner = "prometheus";
+ repo = "blackbox_exporter";
+ sha256 = "0imn7ggxl5zqp8i4i8pnsipacx28dirm1mdmmxxbxc5aal3b656m";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Blackbox probing of endpoints over HTTP, HTTPS, DNS, TCP and ICMP";
+ homepage = https://github.com/prometheus/blackbox_exporter;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ globin fpletz ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
index 6c703e5fa7b..2bd9b6af074 100644
--- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
@@ -14,13 +14,11 @@ buildGoPackage rec {
sha256 = "1p0kb7c8g0r0sp5a6xrx8vnwbw14hhwlqzk4n2xx2y8pvnbivajz";
};
- goDeps = ./collectd-exporter_deps.nix;
-
meta = with stdenv.lib; {
description = "Relay server for exporting metrics from collectd to Prometheus";
homepage = https://github.com/prometheus/collectd_exporter;
license = licenses.asl20;
- maintainers = with maintainers; [ benley ];
+ maintainers = with maintainers; [ benley fpletz ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix
deleted file mode 100644
index 92523d69937..00000000000
--- a/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-[
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "59b73b37c1e45995477aae817e4a653c89a858db";
- sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_model";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_model";
- rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
- sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
- };
- }
- {
- goPackagePath = "github.com/beorn7/perks";
- fetch = {
- type = "git";
- url = "https://github.com/beorn7/perks";
- rev = "b965b613227fddccbfffe13eae360ed3fa822f8d";
- sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk";
- };
- }
- {
- goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
- fetch = {
- type = "git";
- url = "https://github.com/matttproud/golang_protobuf_extensions";
- rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a";
- sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_golang";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_golang";
- rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864";
- sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna";
- };
- }
- {
- goPackagePath = "github.com/prometheus/procfs";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/procfs";
- rev = "c91d8eefde16bd047416409eb56353ea84a186e4";
- sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r";
- };
- }
- {
- goPackagePath = "bitbucket.org/ww/goautoneg";
- fetch = {
- type = "hg";
- url = "bitbucket.org/ww/goautoneg";
- rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675";
- sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi";
- };
- }
-]
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 7f66aef9d11..a5fc6e4d94e 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, go, buildGoPackage, fetchFromGitHub }:
+{ stdenv, go, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "prometheus-${version}";
- version = "1.3.1";
+ version = "1.4.1";
rev = "v${version}";
goPackagePath = "github.com/prometheus/prometheus";
@@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev;
owner = "prometheus";
repo = "prometheus";
- sha256 = "1q29ndi6dnflmv18y2qakipvialy7yfl308kv2vq9y2difij4pwi";
+ sha256 = "05yd3y1b0406qdmx7p27pya9kzcrv66069z1y8dqwj3bf9c7csnm";
};
docheck = true;
diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
index ec63d5e6352..3a61480aea5 100644
--- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
@@ -1,9 +1,9 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "haproxy_exporter-${version}";
- version = "0.7.0";
- rev = version;
+ version = "0.7.1";
+ rev = "v${version}";
goPackagePath = "github.com/prometheus/haproxy_exporter";
@@ -11,16 +11,14 @@ buildGoPackage rec {
inherit rev;
owner = "prometheus";
repo = "haproxy_exporter";
- sha256 = "1jkijdawmnj5yps0yaj47nyfmcah0krwmqsjvicm3sl0dhwmac4w";
+ sha256 = "1svwa1cw4yc5k8acj2r2hkall9csxjw51hgmwkmx5dq55gr9lzai";
};
- goDeps = ./haproxy-exporter_deps.nix;
-
meta = with stdenv.lib; {
description = "HAProxy Exporter for the Prometheus monitoring system";
homepage = https://github.com/prometheus/haproxy_exporter;
license = licenses.asl20;
- maintainers = with maintainers; [ benley ];
+ maintainers = with maintainers; [ benley fpletz ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix
deleted file mode 100644
index 92523d69937..00000000000
--- a/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-[
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "59b73b37c1e45995477aae817e4a653c89a858db";
- sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_model";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_model";
- rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
- sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
- };
- }
- {
- goPackagePath = "github.com/beorn7/perks";
- fetch = {
- type = "git";
- url = "https://github.com/beorn7/perks";
- rev = "b965b613227fddccbfffe13eae360ed3fa822f8d";
- sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk";
- };
- }
- {
- goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
- fetch = {
- type = "git";
- url = "https://github.com/matttproud/golang_protobuf_extensions";
- rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a";
- sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_golang";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_golang";
- rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864";
- sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna";
- };
- }
- {
- goPackagePath = "github.com/prometheus/procfs";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/procfs";
- rev = "c91d8eefde16bd047416409eb56353ea84a186e4";
- sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r";
- };
- }
- {
- goPackagePath = "bitbucket.org/ww/goautoneg";
- fetch = {
- type = "hg";
- url = "bitbucket.org/ww/goautoneg";
- rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675";
- sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi";
- };
- }
-]
diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
index 5a274435e3d..ff6eca621e8 100644
--- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
@@ -1,9 +1,9 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "mysqld_exporter-${version}";
- version = "0.8.1";
- rev = version;
+ version = "0.9.0";
+ rev = "v${version}";
goPackagePath = "github.com/prometheus/mysqld_exporter";
@@ -11,11 +11,9 @@ buildGoPackage rec {
inherit rev;
owner = "prometheus";
repo = "mysqld_exporter";
- sha256 = "0pwf2vii9n9zgad1lxgw28c2743yc9c3qc03516fiwvlqc1cpddr";
+ sha256 = "0ldjrbhm6n7in4lj6l78xii10mg162rsp09ymjm7y2xar9sd70vp";
};
- goDeps = ./mysqld-exporter_deps.nix;
-
meta = with stdenv.lib; {
description = "Prometheus exporter for MySQL server metrics";
homepage = https://github.com/prometheus/mysqld_exporter;
diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix
deleted file mode 100644
index 4910832a62c..00000000000
--- a/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-[
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "59b73b37c1e45995477aae817e4a653c89a858db";
- sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_model";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_model";
- rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
- sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
- };
- }
- {
- goPackagePath = "github.com/beorn7/perks";
- fetch = {
- type = "git";
- url = "https://github.com/beorn7/perks";
- rev = "b965b613227fddccbfffe13eae360ed3fa822f8d";
- sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk";
- };
- }
- {
- goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
- fetch = {
- type = "git";
- url = "https://github.com/matttproud/golang_protobuf_extensions";
- rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a";
- sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_golang";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_golang";
- rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864";
- sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna";
- };
- }
- {
- goPackagePath = "github.com/prometheus/procfs";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/procfs";
- rev = "c91d8eefde16bd047416409eb56353ea84a186e4";
- sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r";
- };
- }
- {
- goPackagePath = "bitbucket.org/ww/goautoneg";
- fetch = {
- type = "hg";
- url = "bitbucket.org/ww/goautoneg";
- rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675";
- sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi";
- };
- }
- {
- goPackagePath = "github.com/go-sql-driver/mysql";
- fetch = {
- type = "git";
- url = "https://github.com/go-sql-driver/mysql";
- rev = "fb7299726d2e68745a8805b14f2ff44b5c2cfa84";
- sha256 = "185af0x475hq2wmm2zdvxjyslkplf8zzqijdxa937zqxq63qiw4w";
- };
- }
-]
diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
index 4c369f40610..013f80411ad 100644
--- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
@@ -1,16 +1,16 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
name = "nginx_exporter-${version}";
- version = "20161104-${stdenv.lib.strings.substring 0 7 rev}";
- rev = "1b2a3d124b6446a0159a68427b0dc3a8b9f32203";
+ version = "20161107-${stdenv.lib.strings.substring 0 7 rev}";
+ rev = "2d7dfd13458c0d82671c03dc54f3aa0110a49a05";
goPackagePath = "github.com/discordianfish/nginx_exporter";
src = fetchgit {
inherit rev;
url = "https://github.com/discordianfish/nginx_exporter";
- sha256 = "19nmkn81m0nyq022bnmjr93wifig4mjcgvns7cbn31i197cydw28";
+ sha256 = "17mjbf8v4h7ja87y02ggmyzl3g8ms8s37mcpcq1niijgli37h75d";
};
goDeps = ./nginx-exporter_deps.nix;
@@ -19,7 +19,7 @@ buildGoPackage rec {
description = "Metrics relay from nginx stats to Prometheus";
homepage = https://github.com/discordianfish/nginx_exporter;
license = licenses.asl20;
- maintainers = with maintainers; [ benley ];
+ maintainers = with maintainers; [ benley fpletz ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix
index 161b56c1d2d..1115ca85f23 100644
--- a/pkgs/servers/monitoring/prometheus/node-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix
@@ -1,9 +1,9 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "node_exporter-${version}";
- version = "0.12.0";
- rev = version;
+ version = "0.13.0";
+ rev = "v${version}";
goPackagePath = "github.com/prometheus/node_exporter";
@@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev;
owner = "prometheus";
repo = "node_exporter";
- sha256 = "0ih8w9ji0fw1smsi45jgvrpqfzm3f5bvk9q3nwrl0my5xkksnr8g";
+ sha256 = "03xk8zns0dvzs13jgiwl2dxj9aq4bbfmwsg0wq5piravxpszs09q";
};
# FIXME: megacli test fails
@@ -21,7 +21,7 @@ buildGoPackage rec {
description = "Prometheus exporter for machine metrics";
homepage = https://github.com/prometheus/node_exporter;
license = licenses.asl20;
- maintainers = with maintainers; [ benley ];
+ maintainers = with maintainers; [ benley fpletz ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix
index 6a742796f30..ccddb078f47 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix
@@ -1,9 +1,9 @@
-{ stdenv, lib, go, buildGoPackage, go-bindata, fetchFromGitHub }:
+{ stdenv, go, buildGoPackage, go-bindata, fetchFromGitHub }:
buildGoPackage rec {
name = "pushgateway-${version}";
- version = "0.3.0";
- rev = version;
+ version = "0.3.1";
+ rev = "v${version}";
goPackagePath = "github.com/prometheus/pushgateway";
@@ -11,11 +11,9 @@ buildGoPackage rec {
inherit rev;
owner = "prometheus";
repo = "pushgateway";
- sha256 = "1bj0s4s3gbcnlp2z2yx7jf3jx14cdg2v4pr0yciai0g6jwwg63hd";
+ sha256 = "0ax83yy5hbfppcr66l9al7wxibcqfnyps05jdscvpwvgrg4q7ldk";
};
- goDeps = ./pushgateway_deps.nix;
-
buildInputs = [ go-bindata ];
preBuild = ''
@@ -29,9 +27,9 @@ buildGoPackage rec {
-ldflags=
-X main.buildVersion=${version}
-X main.buildRev=${rev}
- -X main.buildBranch=master
+ -X main.buildBranch=${rev}
-X main.buildUser=nix@nixpkgs
- -X main.buildDate=20150101-00:00:00
+ -X main.buildDate=19700101-00:00:00
-X main.goVersion=${stdenv.lib.getVersion go}
'';
@@ -39,7 +37,7 @@ buildGoPackage rec {
description = "Allows ephemeral and batch jobs to expose metrics to Prometheus";
homepage = https://github.com/prometheus/pushgateway;
license = licenses.asl20;
- maintainers = with maintainers; [ benley ];
+ maintainers = with maintainers; [ benley fpletz ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway_deps.nix b/pkgs/servers/monitoring/prometheus/pushgateway_deps.nix
deleted file mode 100644
index 33795927ed9..00000000000
--- a/pkgs/servers/monitoring/prometheus/pushgateway_deps.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-[
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "59b73b37c1e45995477aae817e4a653c89a858db";
- sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_model";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_model";
- rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
- sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
- };
- }
- {
- goPackagePath = "github.com/beorn7/perks";
- fetch = {
- type = "git";
- url = "https://github.com/beorn7/perks";
- rev = "b965b613227fddccbfffe13eae360ed3fa822f8d";
- sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk";
- };
- }
- {
- goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
- fetch = {
- type = "git";
- url = "https://github.com/matttproud/golang_protobuf_extensions";
- rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a";
- sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_golang";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_golang";
- rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864";
- sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna";
- };
- }
- {
- goPackagePath = "github.com/prometheus/procfs";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/procfs";
- rev = "c91d8eefde16bd047416409eb56353ea84a186e4";
- sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r";
- };
- }
- {
- goPackagePath = "bitbucket.org/ww/goautoneg";
- fetch = {
- type = "hg";
- url = "bitbucket.org/ww/goautoneg";
- rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675";
- sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi";
- };
- }
- {
- goPackagePath = "github.com/julienschmidt/httprouter";
- fetch = {
- type = "git";
- url = "https://github.com/julienschmidt/httprouter";
- rev = "6aacfd5ab513e34f7e64ea9627ab9670371b34e7";
- sha256 = "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl";
- };
- }
-]
diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix
index 132275a56e0..5d653474961 100644
--- a/pkgs/servers/monitoring/riemann/default.nix
+++ b/pkgs/servers/monitoring/riemann/default.nix
@@ -12,8 +12,12 @@ stdenv.mkDerivation rec {
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
- mkdir -p $out/share/java
+ sed -i 's#lib/riemann.jar#$out/share/java/riemann.jar#' bin/riemann
+
+ mkdir -p $out/share/java $out/bin $out/etc
mv lib/riemann.jar $out/share/java/
+ mv bin/riemann $out/bin/
+ mv etc/riemann.config $out/etc/
'';
meta = with stdenv.lib; {
diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index 40f580ffddf..996c839acff 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "telegraf-${version}";
- version = "1.0.1";
+ version = "1.1.2";
goPackagePath = "github.com/influxdata/telegraf";
@@ -12,7 +12,7 @@ buildGoPackage rec {
owner = "influxdata";
repo = "telegraf";
rev = "${version}";
- sha256 = "1qn90rybdb2ybdyfk2f2yqpsgrya95bgiglmxnf2x1fapjpm7434";
+ sha256 = "0dgrbdyz261j28wcq636125ha4xmfgh4y9shlg8m1y6jqdqd2zf2";
};
goDeps = ./. + builtins.toPath "/deps-${version}.nix";
diff --git a/pkgs/servers/monitoring/telegraf/deps-1.0.1.nix b/pkgs/servers/monitoring/telegraf/deps-1.1.2.nix
similarity index 88%
rename from pkgs/servers/monitoring/telegraf/deps-1.0.1.nix
rename to pkgs/servers/monitoring/telegraf/deps-1.1.2.nix
index 29652a200f1..b62ae44dbc9 100644
--- a/pkgs/servers/monitoring/telegraf/deps-1.0.1.nix
+++ b/pkgs/servers/monitoring/telegraf/deps-1.1.2.nix
@@ -23,8 +23,8 @@
fetch = {
type = "git";
url = "https://github.com/aerospike/aerospike-client-go";
- rev = "45863b7fd8640dc12f7fdd397104d97e1986f25a";
- sha256 = "0cnsq8waah9m8m6y6cjz2sppac38aq8gsykw6d8zps0w4rjgf1aw";
+ rev = "7f3a312c3b2a60ac083ec6da296091c52c795c63";
+ sha256 = "05ancqplckvni9xp6xd4bv2pgkfa4v23svfcg27m8xinzi4ry219";
};
}
{
@@ -194,8 +194,8 @@
fetch = {
type = "git";
url = "https://github.com/golang/snappy";
- rev = "427fb6fc07997f43afa32f35e850833760e489a7";
- sha256 = "1hgk9zhkfdvxrz13k0glqwlz414803zkrzd01mv6fjhpsjmcx53b";
+ rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380";
+ sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn";
};
}
{
@@ -266,17 +266,8 @@
fetch = {
type = "git";
url = "https://github.com/influxdata/influxdb";
- rev = "e094138084855d444195b252314dfee9eae34cab";
- sha256 = "0vv243lqwl4rwgg1zaxlw42zfjjad4vcafaiisvvkyamnndzlkla";
- };
- }
- {
- goPackagePath = "github.com/influxdata/telegraf";
- fetch = {
- type = "git";
- url = "https://github.com/influxdata/telegraf";
- rev = "215f1b57d06845708e0867b11b9c853a56b00d81";
- sha256 = "1qn90rybdb2ybdyfk2f2yqpsgrya95bgiglmxnf2x1fapjpm7434";
+ rev = "fc57c0f7c635df3873f3d64f0ed2100ddc94d5ae";
+ sha256 = "07cv1gryp4a84a2acgc8k8alr7jw4jwphf12cby8jjy1br35jrbq";
};
}
{
@@ -289,12 +280,12 @@
};
}
{
- goPackagePath = "github.com/jmespath/go-jmespath";
+ goPackagePath = "github.com/influxdata/wlog";
fetch = {
type = "git";
- url = "https://github.com/jmespath/go-jmespath";
- rev = "bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d";
- sha256 = "1kgzwiyqn24ba9kgpjxlq1h746gnyby0psbjj9mp2yx0h1i0kc4z";
+ url = "https://github.com/influxdata/wlog";
+ rev = "7c63b0a71ef8300adc255344d275e10e5c3a71ec";
+ sha256 = "04kw4kivxvr3kkmghj3427b1xyhzbhnfr971qfn3lv2vvhs8kpfl";
};
}
{
@@ -374,8 +365,8 @@
fetch = {
type = "git";
url = "https://github.com/nats-io/nats";
- rev = "b13fc9d12b0b123ebc374e6b808c6228ae4234a3";
- sha256 = "08cj053v0v7i9k7pn7c54hn3pm1c8g53gjhiv969hf4mk2h75q1i";
+ rev = "ea8b4fd12ebb823073c0004b9f09ac8748f4f165";
+ sha256 = "0i5f6n9k0d2vzdy20sqygmss5j45y72irxsi80grjsh7qkxa6vn1";
};
}
{
@@ -383,8 +374,8 @@
fetch = {
type = "git";
url = "https://github.com/nats-io/nuid";
- rev = "4f84f5f3b2786224e336af2e13dba0a0a80b76fa";
- sha256 = "18ckzxmlg6ihjqd3r6ds8blgga58zibk52xp3lz5c7kv0hf6xa8y";
+ rev = "a5152d67cf63cbfb5d992a395458722a45194715";
+ sha256 = "0fphar5bz735wwa7549j31nxnm5a9dyw472gs9zafz0cv7g8np40";
};
}
{
@@ -405,15 +396,6 @@
sha256 = "1rnaqcsww7plr430r4ksv9si4l91l25li0bwa1b03g3sn2shirk1";
};
}
- {
- goPackagePath = "github.com/pmezard/go-difflib";
- fetch = {
- type = "git";
- url = "https://github.com/pmezard/go-difflib";
- rev = "792786c7400a136282c1664665ae0a8db921c6c2";
- sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
- };
- }
{
goPackagePath = "github.com/prometheus/client_golang";
fetch = {
@@ -473,17 +455,8 @@
fetch = {
type = "git";
url = "https://github.com/soniah/gosnmp";
- rev = "eb32571c2410868d85849ad67d1e51d01273eb84";
- sha256 = "0f6r3q2lhnjz506blygml6mfnp22fjy586zwiixrzch0jbwl4yf6";
- };
- }
- {
- goPackagePath = "github.com/sparrc/aerospike-client-go";
- fetch = {
- type = "git";
- url = "https://github.com/sparrc/aerospike-client-go";
- rev = "d4bb42d2c2d39dae68e054116f4538af189e05d5";
- sha256 = "0z2d3k1k6qh60aq81dr9g8y2mb19wwlx5isy0nqg0gzx3jb7v7xz";
+ rev = "3fe3beb30fa9700988893c56a63b1df8e1b68c26";
+ sha256 = "0a0vlxx1plqj9fi863wd8ajbzl705wgma4qk75v949azgn1yx9ib";
};
}
{
@@ -554,8 +527,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
- rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3";
- sha256 = "18c1vpqlj10z1id66hglgnv51d9gwphgsdvxgghc6mcm01f1g5xj";
+ rev = "c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6";
+ sha256 = "1y2bbghi594m8p4pcm9pwrzql06179xj6zvhaghwcc6y0l48rbgp";
};
}
{
@@ -567,15 +540,6 @@
sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc";
};
}
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9";
- sha256 = "04va4pqygfzr89fx873k44bmivk7nybqalybi6q96lnn45h2scbr";
- };
- }
{
goPackagePath = "golang.org/x/text";
fetch = {
diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix
index 10375b9b1c1..6429d3fae53 100644
--- a/pkgs/servers/monitoring/zabbix/2.2.nix
+++ b/pkgs/servers/monitoring/zabbix/2.2.nix
@@ -10,12 +10,12 @@ assert enableJabber -> minmay != null;
let
- version = "2.2.2";
+ version = "2.2.16";
branch = "2.2";
src = fetchurl {
url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
- sha256 = "1gmjbjmajdllzd7akihb5kg4l2gf0ii9c16fq8mlla37sshzj3p0";
+ sha256 = "0hc0y3p8p6pxri7w3n311ry3m5hb440kgwwkiqlihbhsq73xiz1w";
};
preConfigure =
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index bcbda0d5c09..0d5d0a46e4e 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name= "nextcloud-${version}";
- version = "10.0.1";
+ version = "11.0.0";
src = fetchurl {
url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
- sha256 = "09cbjxsr6sdjrq37rmwmg6r1x3625bqcrd37ja6cmmrgy0l2lh9r";
+ sha256 = "0a8lc85jihlw326w0irykw5fbwcbz2mlq0vrcsd0niygqlvcppsv";
};
installPhase = ''
diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix
index 7360cbbceba..13001b1813f 100644
--- a/pkgs/servers/nosql/apache-jena/binary.nix
+++ b/pkgs/servers/nosql/apache-jena/binary.nix
@@ -3,10 +3,10 @@ let
s = # Generated upstream information
rec {
baseName="apache-jena";
- version = "3.1.0";
+ version = "3.1.1";
name="${baseName}-${version}";
url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz";
- sha256 = "1nfb567v9s17j31l75v5gkdalmkrqba7ahz3z8gzz4kpmdzdhajk";
+ sha256 = "0sxhpasc3qkj1axkccvckv8wiwcc5v6f4yri49inc3sl02pvvanp";
};
buildInputs = [
makeWrapper
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 8b8d1ba0ae1..c40b765d345 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchFromGitHub, openssl, zlib, python, gyp, bash, go, readline }:
+{ stdenv, fetchFromGitHub, openssl, zlib, python2Packages, bash, go, readline }:
-stdenv.mkDerivation rec {
+let
+ inherit (python2Packages) python gyp;
+in stdenv.mkDerivation rec {
version = "2.5.3";
name = "arangodb-${version}";
diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index 31ffcd14bbe..5e22cb11882 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, which, m4, python
, protobuf, boost, zlib, curl, openssl, icu, jemalloc, libtool
-, pythonPackages, makeWrapper
+, python2Packages, makeWrapper
}:
stdenv.mkDerivation rec {
@@ -33,13 +33,13 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (!stdenv.isDarwin) jemalloc
++ stdenv.lib.optional stdenv.isDarwin libtool;
- nativeBuildInputs = [ which m4 python ];
+ nativeBuildInputs = [ which m4 python2Packages.python ];
enableParallelBuilding = true;
postInstall = ''
wrapProgram $out/bin/rethinkdb \
- --prefix PATH ":" "${pythonPackages.rethinkdb}/bin"
+ --prefix PATH ":" "${python2Packages.rethinkdb}/bin"
'';
meta = {
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 00000000000..a0df98faf36
--- /dev/null
+++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix
@@ -0,0 +1,69 @@
+{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak
+, Carbon ? null, Cocoa ? null }:
+
+stdenv.mkDerivation rec {
+ name = "riak_cs-2.1.1";
+
+ buildInputs = [
+ which unzip erlang git wget
+ ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]
+ ++ lib.optional stdenv.isLinux [ pam ];
+
+ 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" "x86_64-darwin" ];
+ 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 00000000000..8ea71d611eb
--- /dev/null
+++ b/pkgs/servers/nosql/riak-cs/stanchion.nix
@@ -0,0 +1,65 @@
+{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak
+, Carbon ? null, Cocoa ? null }:
+
+stdenv.mkDerivation rec {
+ name = "stanchion-2.1.1";
+
+ buildInputs = [
+ which unzip erlang git wget
+ ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]
+ ++ lib.optional stdenv.isLinux [ pam ];
+
+ 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" "x86_64-darwin" ];
+ license = licenses.asl20;
+ };
+}
diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix
index 52a7941d093..6383ce12bc1 100644
--- a/pkgs/servers/openafs-client/default.nix
+++ b/pkgs/servers/openafs-client/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "openafs-${version}-${kernel.version}";
- version = "1.6.17";
+ version = "1.6.20";
src = fetchurl {
url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
- sha256 = "16532f4951piv1g2i539233868xfs1damrnxql61gjgxpwnklhcn";
+ sha256 = "0qar94k9x9dkws4clrnlw789q1ha9qjk06356s86hh78qwywc1ki";
};
nativeBuildInputs = [ autoconf automake flex yacc perl which ];
diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 28d6295938a..467f3ffb1d4 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/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix
index ba2e1447ffe..744763c43f1 100644
--- a/pkgs/servers/rpcbind/default.nix
+++ b/pkgs/servers/rpcbind/default.nix
@@ -1,10 +1,10 @@
-{ fetchurl, stdenv, pkgconfig, libtirpc
+{ fetchurl, fetchpatch, stdenv, pkgconfig, libtirpc
, useSystemd ? true, systemd }:
let version = "0.2.3";
in stdenv.mkDerivation rec {
name = "rpcbind-${version}";
-
+
src = fetchurl {
url = "mirror://sourceforge/rpcbind/${version}/${name}.tar.bz2";
sha256 = "0yyjzv4161rqxrgjcijkrawnk55rb96ha0pav48s03l2klx855wq";
@@ -13,6 +13,10 @@ in stdenv.mkDerivation rec {
patches = [
./sunrpc.patch
./0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch
+ (fetchpatch {
+ url = "https://sources.debian.net/data/main/r/rpcbind/0.2.3-0.5/debian/patches/CVE-2015-7236.patch";
+ sha256 = "1wsv5j8f5djzxr11n4027x107cam1avmx9w34g6l5d9s61j763wq";
+ })
];
buildInputs = [ libtirpc ]
diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index babca9af168..8dce24948fe 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
name = "groonga-${version}";
- version = "6.1.0";
+ version = "6.1.1";
src = fetchurl {
url = "http://packages.groonga.org/source/groonga/${name}.tar.gz";
- sha256 = "03wz6zjql211dd8kvzcqyzkc8czd8gayr7rw5v274lajcs8f6rkb";
+ sha256 = "03h65gycy0j2q4n5h62x3sw76ibdywdvmiciys5a7ppxb2mncabz";
};
buildInputs = with stdenv.lib; [ pkgconfig mecab kytea libedit ] ++
diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix
new file mode 100644
index 00000000000..9149f050655
--- /dev/null
+++ b/pkgs/servers/sks/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromBitbucket, ocaml, zlib, db48, perl }:
+
+stdenv.mkDerivation rec {
+ name = "sks-${version}";
+ version = "1.1.6";
+
+ src = fetchFromBitbucket {
+ owner = "skskeyserver";
+ repo = "sks-keyserver";
+ rev = "${version}";
+ sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm";
+ };
+
+ buildInputs = [ ocaml zlib db48 perl ];
+
+ makeFlags = [ "PREFIX=$(out)" "MANDIR=$(out)/share/man" ];
+ preConfigure = ''
+ cp Makefile.local.unused Makefile.local
+ sed -i \
+ -e "s:^LIBDB=.*$:LIBDB=-ldb-4.8:g" \
+ Makefile.local
+ '';
+
+ preBuild = "make dep";
+
+ doCheck = true;
+ checkPhase = "./sks unit_test";
+
+ meta = with stdenv.lib; {
+ description = "An OpenPGP keyserver whose goal is to provide easy to
+ deploy, decentralized, and highly reliable synchronization";
+ longDescription = ''
+ SKS is an OpenPGP keyserver whose goal is to provide easy to deploy,
+ decentralized, and highly reliable synchronization. That means that a key
+ submitted to one SKS server will quickly be distributed to all key
+ servers, and even wildly out-of-date servers, or servers that experience
+ spotty connectivity, can fully synchronize with rest of the system.
+ '';
+ inherit (src.meta) homepage;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ primeos ];
+ };
+}
+
diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix
index a86862a14a5..5deb3ea871b 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.4409";
src = fetchurl {
url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";
- sha256 = "1lrfwwy5bjsmrq6zpx0kadmlacafmj44qhifswbhljlykxwsld7r";
+ sha256 = "1kaj1m4ifby8liks8i7fsbgwbajaqwd96yindqp5maf2n6px2nw2";
};
buildInputs = [
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 422715925b8..f50a97afd20 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -15,11 +15,11 @@ mariadb = everything // {
};
common = rec { # attributes common to both builds
- version = "10.1.18";
+ version = "10.1.19";
src = fetchurl {
url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz";
- sha256 = "0wrvhyck95czhz553834i9im7ljvn8k2byakcinlji7zx43njcyp";
+ sha256 = "108s4mimdbmgmmn5pcr9a405j70cyny9adzv49s75lg22krp74sv";
};
prePatch = ''
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index c0e97dab812..d5ffd5361e4 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -1,8 +1,9 @@
-{ lib, stdenv, fetchurl, zlib, readline, libossp_uuid, openssl }:
+{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, makeWrapper }:
let
- common = { version, sha256, psqlSchema } @ args: stdenv.mkDerivation (rec {
+ common = { version, sha256, psqlSchema } @ args:
+ let atLeast = lib.versionAtLeast version; in stdenv.mkDerivation (rec {
name = "postgresql-${version}";
src = fetchurl {
@@ -14,7 +15,7 @@ let
setOutputFlags = false; # $out retains configureFlags :-/
buildInputs =
- [ zlib readline openssl ]
+ [ zlib readline openssl makeWrapper ]
++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ];
enableParallelBuilding = true;
@@ -30,9 +31,9 @@ let
++ lib.optional (!stdenv.isDarwin) "--with-ossp-uuid";
patches =
- [ (if lib.versionAtLeast version "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch)
- ./less-is-more.patch
- ./hardcode-pgxs-path.patch
+ [ (if atLeast "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch)
+ (if atLeast "9.6" then ./less-is-more-96.patch else ./less-is-more.patch)
+ (if atLeast "9.6" then ./hardcode-pgxs-path-96.patch else ./hardcode-pgxs-path.patch)
./specify_pkglibdir_at_runtime.patch
];
@@ -41,10 +42,11 @@ let
LC_ALL = "C";
postConfigure =
- ''
- # Hardcode the path to pgxs so pg_config returns the path in $out
- substituteInPlace "src/bin/pg_config/pg_config.c" --replace HARDCODED_PGXS_PATH $out/lib
- '';
+ let path = if atLeast "9.6" then "src/common/config_info.c" else "src/bin/pg_config/pg_config.c"; in
+ ''
+ # Hardcode the path to pgxs so pg_config returns the path in $out
+ substituteInPlace "${path}" --replace HARDCODED_PGXS_PATH $out/lib
+ '';
postInstall =
''
@@ -56,6 +58,12 @@ let
substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv.cc}/bin/ld ld
'';
+ postFixup = lib.optionalString (!stdenv.isDarwin)
+ ''
+ # initdb needs access to "locale" command from glibc.
+ wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin
+ '';
+
disallowedReferences = [ stdenv.cc ];
passthru = {
@@ -75,34 +83,39 @@ let
in {
postgresql91 = common {
- version = "9.1.23";
+ version = "9.1.24";
psqlSchema = "9.1";
- sha256 = "1mgnfm65fspkq62skfy48rjkprnxcfhydw0x3ipp4sdkngl72x3z";
+ sha256 = "1lz5ibvgz6cxprxlnd7a8iwv387idr7k53bdsvy4bw9ayglq83fy";
};
postgresql92 = common {
- version = "9.2.18";
+ version = "9.2.19";
psqlSchema = "9.2";
- sha256 = "1x1mxbwqvgj9s4y8pb4vv6fmmr36z5zl3b2ggb84ckdfhvakganp";
+ sha256 = "1bfvx1h1baxp40y4xi88974p43vazz13mwc0h8scq3sr9wxdfa8x";
};
postgresql93 = common {
- version = "9.3.14";
+ version = "9.3.15";
psqlSchema = "9.3";
- sha256 = "1783kl0abf9az90mvs08pdh63d33cv2njc1q515zz89bqkqj4hsw";
+ sha256 = "0kswvs4rzcmjz12hhyi61w5x2wh4dxskar8v7rgajfm98qabmz59";
};
postgresql94 = common {
- version = "9.4.9";
+ version = "9.4.10";
psqlSchema = "9.4";
- sha256 = "1jg1l6vrfwhfyqrx07bgcpqxb5zcp8zwm8qd2vcj0k11j0pac861";
+ sha256 = "1kvfhalf3rs59887b5qa14zp85zcnsc6pislrs0wd08rxn5nfqbh";
};
postgresql95 = common {
- version = "9.5.4";
+ version = "9.5.5";
psqlSchema = "9.5";
- sha256 = "1l3fqxlpxgl6nrcd4h6lpi2hsiv56yg83n3xrn704rmdch8mfpng";
+ sha256 = "157kf6mdazmxfmd11f0akya2xcz6sfgprn7yqc26dpklps855ih2";
};
+ postgresql96 = common {
+ version = "9.6.1";
+ psqlSchema = "9.6";
+ sha256 = "1k8zwnabsl8f7vlp3azm4lrklkb9jkaxmihqf0mc27ql9451w475";
+ };
}
diff --git a/pkgs/servers/sql/postgresql/hardcode-pgxs-path-96.patch b/pkgs/servers/sql/postgresql/hardcode-pgxs-path-96.patch
new file mode 100644
index 00000000000..6cd449769ba
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/hardcode-pgxs-path-96.patch
@@ -0,0 +1,14 @@
+diff -Naur postgresql-9.6.1-orig/src/common/config_info.c postgresql-9.6.1/src/common/config_info.c
+--- postgresql-9.6.1-orig/src/common/config_info.c 2016-11-22 21:39:29.231929261 +0100
++++ postgresql-9.6.1/src/common/config_info.c 2016-11-22 23:36:53.685163543 +0100
+@@ -118,7 +118,10 @@
+ i++;
+
+ configdata[i].name = pstrdup("PGXS");
++ strlcpy(path, "HARDCODED_PGXS_PATH", sizeof(path));
++/* commented out to be able to point to nix $out path
+ get_pkglib_path(my_exec_path, path);
++*/
+ strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path));
+ cleanup_path(path);
+ configdata[i].setting = pstrdup(path);
diff --git a/pkgs/servers/sql/postgresql/less-is-more-96.patch b/pkgs/servers/sql/postgresql/less-is-more-96.patch
new file mode 100644
index 00000000000..f14af9dc220
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/less-is-more-96.patch
@@ -0,0 +1,12 @@
+diff -Naur postgresql-9.6.1-orig/src/include/fe_utils/print.h postgresql-9.6.1/src/include/fe_utils/print.h
+--- postgresql-9.6.1-orig/src/include/fe_utils/print.h 2016-11-22 21:39:29.148932827 +0100
++++ postgresql-9.6.1/src/include/fe_utils/print.h 2016-11-22 21:39:36.283626258 +0100
+@@ -18,7 +18,7 @@
+
+ /* This is not a particularly great place for this ... */
+ #ifndef __CYGWIN__
+-#define DEFAULT_PAGER "more"
++#define DEFAULT_PAGER "less"
+ #else
+ #define DEFAULT_PAGER "less"
+ #endif
diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix
index e12d7e9b97d..b64dfeda667 100644
--- a/pkgs/servers/squid/default.nix
+++ b/pkgs/servers/squid/default.nix
@@ -1,25 +1,36 @@
-{ fetchurl, stdenv, perl, lib, openldap, pam, db, cyrus_sasl, libcap,
-expat, libxml2, libtool, openssl}:
+{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap
+, expat, libxml2, openssl }:
+
stdenv.mkDerivation rec {
- name = "squid-3.5.19";
+ name = "squid-3.5.23";
+
src = fetchurl {
- url = "http://www.squid-cache.org/Versions/v3/3.5/${name}.tar.bz2";
- sha256 = "1iy2r7r12xv0q9414rczbqbbggyyxgdmg21bynpygwkgalaz1dxx";
+ url = "http://www.squid-cache.org/Versions/v3/3.5/${name}.tar.xz";
+ sha256 = "1nqbljph2mbxjy1jzsis5vplfvvc2y6rdlxy609zx4hyyjchqk7s";
};
- buildInputs = [perl openldap pam db cyrus_sasl libcap expat libxml2
- libtool openssl];
+
+ buildInputs = [
+ perl openldap pam db cyrus_sasl libcap expat libxml2 openssl
+ ];
+
configureFlags = [
"--enable-ipv6"
"--disable-strict-error-checking"
"--disable-arch-native"
"--with-openssl"
"--enable-ssl-crtd"
+ "--enable-linux-netfilter"
+ "--enable-storeio=ufs,aufs,diskd,rock"
+ "--enable-removal-policies=lru,heap"
+ "--enable-delay-pools"
+ "--enable-x-accelerator-vary"
];
- meta = {
+ meta = with stdenv.lib; {
description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more";
homepage = "http://www.squid-cache.org";
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ fpletz ];
};
}
diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index ac2130d2917..4994894a038 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -42,11 +42,11 @@ in
stdenv.mkDerivation rec {
name = "uwsgi-${version}";
- version = "2.0.13.1";
+ version = "2.0.14";
src = fetchurl {
url = "http://projects.unbit.it/downloads/${name}.tar.gz";
- sha256 = "0zwdljaljzshrdcqsrr2l2ak2zcmsps4glac2lrg0xmb28phrjif";
+ sha256 = "11r829j4fyk7y068arqmwbc9dj6lc0n3l6bn6pr5z0vdjbpx3cr1";
};
nativeBuildInputs = [ python3 pkgconfig ];
diff --git a/pkgs/servers/web-apps/pump.io/composition.nix b/pkgs/servers/web-apps/pump.io/composition.nix
index 36815198d67..644d9e6e9e5 100644
--- a/pkgs/servers/web-apps/pump.io/composition.nix
+++ b/pkgs/servers/web-apps/pump.io/composition.nix
@@ -6,11 +6,11 @@
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
- inherit (pkgs) stdenv python utillinux runCommand writeTextFile;
+ inherit (pkgs) stdenv utillinux runCommand writeTextFile;
inherit nodejs;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix
index 83c0a6c1034..32eae53420a 100644
--- a/pkgs/servers/web-apps/shaarli/default.nix
+++ b/pkgs/servers/web-apps/shaarli/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "shaarli-${version}";
- version = "0.8.0";
+ version = "0.8.1";
src = fetchurl {
- url = "https://github.com/shaarli/Shaarli/releases/download/v0.8.0/shaarli-v0.8.0-full.tar.gz";
- sha256 = "04151fl62rs8vxsmdyq4qm8fi7fr7i6x0zhrg1zgssv8w8lfx1ww";
+ url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz";
+ sha256 = "17p8bmkgmlan6vbvh955idddckr5kyf00gp8apjfcnm4b2awma8x";
};
outputs = [ "out" "doc" ];
diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix
index 9db45d6a8e1..4eed952f804 100644
--- a/pkgs/servers/web-apps/wallabag/default.nix
+++ b/pkgs/servers/web-apps/wallabag/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "wallabag-${version}";
- version = "2.1.3";
+ version = "2.1.4";
# remember to rm -r var/cache/* after a rebuild or unexpected errors will occur
src = fetchurl {
url = "https://framabag.org/wallabag-release-${version}.tar.gz";
- sha256 = "0pl1sqigrp08r657jmfpf8m3wnw65g2k3mg50zsc8xbrzn6nwbgp";
+ sha256 = "0s4p9jls7jqq9jbcac21ibz9k5yxx0ifv2yhxlkia5kw9md20r7b";
};
outputs = [ "out" "doc" ];
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 640c200e7cf..07243682283 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -790,11 +790,11 @@ let
}) // {inherit fixesproto libX11 xextproto xproto ;};
libXfont = (mkDerivation "libXfont" {
- name = "libXfont-1.5.1";
+ name = "libXfont-1.5.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2;
- sha256 = "1630v3sfvwwlimb2ja10c84ql6v1mw9bdfhvan7pbybkgi99h25p";
+ url = mirror://xorg/individual/lib/libXfont-1.5.2.tar.bz2;
+ sha256 = "0w8d07bkmjiarkx09579bl8zsq903mn8javc7qpi0ix4ink5x502";
};
buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
meta.platforms = stdenv.lib.platforms.unix;
@@ -823,11 +823,11 @@ let
}) // {inherit fontconfig freetype libX11 xproto libXrender ;};
libXi = (mkDerivation "libXi" {
- name = "libXi-1.7.7";
+ name = "libXi-1.7.8";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/lib/libXi-1.7.7.tar.bz2;
- sha256 = "0c70n4aq0ba628wr88ih4740nci9d9f6y3v96sx376vvlm7q6vwr";
+ url = mirror://xorg/individual/lib/libXi-1.7.8.tar.bz2;
+ sha256 = "1fr7mi4nbcxsa88qin9g2ipmzh595ydxy9qnabzl270laf6zmwnq";
};
buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ];
meta.platforms = stdenv.lib.platforms.unix;
@@ -1593,22 +1593,22 @@ let
}) // {inherit inputproto udev xorgserver xproto ;};
xf86inputjoystick = (mkDerivation "xf86inputjoystick" {
- name = "xf86-input-joystick-1.6.2";
+ name = "xf86-input-joystick-1.6.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2;
- sha256 = "038mfqairyyqvz02rk7v3i070sab1wr0k6fkxvyvxdgkfbnqcfzf";
+ url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2;
+ sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly";
};
buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit inputproto kbproto xorgserver xproto ;};
xf86inputkeyboard = (mkDerivation "xf86inputkeyboard" {
- name = "xf86-input-keyboard-1.8.1";
+ name = "xf86-input-keyboard-1.9.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2;
- sha256 = "04d27kwqq03fc26an6051hs3i0bff8albhnngzyd59wxpwwzzj0s";
+ url = mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2;
+ sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp";
};
buildInputs = [pkgconfig inputproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix;
@@ -1626,22 +1626,22 @@ let
}) // {inherit inputproto xorgserver xproto ;};
xf86inputmouse = (mkDerivation "xf86inputmouse" {
- name = "xf86-input-mouse-1.9.1";
+ name = "xf86-input-mouse-1.9.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2;
- sha256 = "1kn5kx3qyn9qqvd6s24a2l1wfgck2pgfvzl90xpl024wfxsx719l";
+ url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2;
+ sha256 = "0bsbgww9421792zan43j60mndqprhfxhc48agsi15d3abjqda9gl";
};
buildInputs = [pkgconfig inputproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit inputproto xorgserver xproto ;};
xf86inputsynaptics = (mkDerivation "xf86inputsynaptics" {
- name = "xf86-input-synaptics-1.8.3";
+ name = "xf86-input-synaptics-1.9.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2;
- sha256 = "009zx199pilcvlaqm6fx4mg94q81d6vvl5rznmw3frzkfh6117yk";
+ url = mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2;
+ sha256 = "0niv0w1czbxh4y3qkqbpdp5gjwhp3379inwhknhif0m4sy4k5fmg";
};
buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ];
meta.platforms = stdenv.lib.platforms.unix;
@@ -1681,11 +1681,11 @@ let
}) // {inherit ;};
xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" {
- name = "xf86-video-amdgpu-1.1.2";
+ name = "xf86-video-amdgpu-1.2.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2;
- sha256 = "0y87d4rhm5r71qpzcmmz4q37f3d3461jzh3sr99j7lbhdpnpzs3f";
+ url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2;
+ sha256 = "13vcwxswhzq611ly890fcl11vkpai7gs303l7nx5azqjbyn1lnr7";
};
buildInputs = [pkgconfig fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix;
@@ -1714,11 +1714,11 @@ let
}) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
xf86videoati = (mkDerivation "xf86videoati" {
- name = "xf86-video-ati-7.7.1";
+ name = "xf86-video-ati-7.8.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2;
- sha256 = "1387cn4b2wwawvzqmy17hrg9d394pl5r5if5jn831vk2vf48b980";
+ url = mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2;
+ sha256 = "1ynnm4v4261xmg94b7jam9hjyym4n2nqba23rv23v3wjfbkms7s0";
};
buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix;
@@ -2067,15 +2067,15 @@ let
}) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
xf86videovmware = (mkDerivation "xf86videovmware" {
- name = "xf86-video-vmware-13.1.0";
+ name = "xf86-video-vmware-13.2.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2;
- sha256 = "1k50whwnkzxam2ihc1sw456dx0pvr76naycm4qhyjxqv9d72879w";
+ url = mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2;
+ sha256 = "0azn3g0vcki47n5jddagk2rmbwdvp845k8p7d2r56zxs3w8ggxz2";
};
- buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ];
+ buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix;
- }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};
+ }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};
xf86videovoodoo = (mkDerivation "xf86videovoodoo" {
name = "xf86-video-voodoo-1.2.5";
@@ -2243,11 +2243,11 @@ let
}) // {inherit inputproto libX11 libXaw xproto libXt ;};
xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
- name = "xkeyboard-config-2.18";
+ name = "xkeyboard-config-2.19";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.18.tar.bz2;
- sha256 = "1l6x2w357ja8vm94ns79s7yj9a5dlr01r9dxrjvzwncadiyr27f4";
+ url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.19.tar.bz2;
+ sha256 = "09sqyi430bbg13pp8j0j60p9p9xn2lpqx38xw1lyv77bp63d3pw3";
};
buildInputs = [pkgconfig libX11 xproto ];
meta.platforms = stdenv.lib.platforms.unix;
@@ -2397,11 +2397,11 @@ let
}) // {inherit libX11 xproto ;};
xproto = (mkDerivation "xproto" {
- name = "xproto-7.0.29";
+ name = "xproto-7.0.31";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/proto/xproto-7.0.29.tar.bz2;
- sha256 = "12lzpa9mrzkyrhrphzpi1014np3328qg7mdq08wj6wyaj9q4f6kc";
+ url = mirror://xorg/individual/proto/xproto-7.0.31.tar.bz2;
+ sha256 = "0ivpxz0rx2a7nahkpkhfgymz7j0pwzaqvyqpdgw9afmxl1yp9yf6";
};
buildInputs = [pkgconfig ];
meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index c87acfee43a..8d681744131 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -459,8 +459,7 @@ in
"--enable-glamor"
];
postInstall = ''
- rm -fr $out/share/X11/xkb/compiled
- ln -s /var/tmp $out/share/X11/xkb/compiled
+ rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it
wrapProgram $out/bin/Xephyr \
--add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb"
wrapProgram $out/bin/Xvfb \
@@ -510,7 +509,6 @@ in
'';
postInstall = ''
rm -fr $out/share/X11/xkb/compiled
- ln -s /var/tmp $out/share/X11/xkb/compiled
cp -rT ${darwinOtherX}/bin $out/bin
rm -f $out/bin/X
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index b2b5f2dc236..c0d2065a9ff 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -68,10 +68,10 @@ mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2
mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2
mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2
mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2
-mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2
+mirror://xorg/individual/lib/libXfont-1.5.2.tar.bz2
mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2
mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
-mirror://xorg/individual/lib/libXi-1.7.7.tar.bz2
+mirror://xorg/individual/lib/libXi-1.7.8.tar.bz2
mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2
mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2
@@ -120,17 +120,17 @@ mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-evdev-2.10.3.tar.bz2
-mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2
-mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2
+mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2
+mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2
-mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2
-mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2
+mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2
+mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2
-mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2
+mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
-mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2
+mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2
mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2
mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2
@@ -162,7 +162,7 @@ mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-trident-1.3.7.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2
-mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2
@@ -175,7 +175,7 @@ mirror://xorg/individual/app/xinput-1.6.2.tar.bz2
mirror://xorg/individual/app/xkbcomp-1.3.1.tar.bz2
mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2
mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2
-mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.18.tar.bz2
+mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.19.tar.bz2
mirror://xorg/individual/app/xkill-1.0.4.tar.bz2
mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2
mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2
@@ -187,7 +187,7 @@ mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
mirror://xorg/individual/app/xprop-1.2.2.tar.bz2
-mirror://xorg/individual/proto/xproto-7.0.29.tar.bz2
+mirror://xorg/individual/proto/xproto-7.0.31.tar.bz2
mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2
mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2
mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2
diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index 729fcc2e344..ee4b5695c7c 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -25,7 +25,6 @@ overrideDerivation xorgserver (oldAttrs: {
postInstall = ''
rm -fr $out/share/X11/xkb/compiled
- ln -s /var/tmp $out/share/X11/xkb/compiled
'';
}) // {
diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix
index 34e67e171f4..445c6c57bbf 100644
--- a/pkgs/servers/xinetd/default.nix
+++ b/pkgs/servers/xinetd/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv }:
+{ fetchurl, fetchpatch, stdenv }:
stdenv.mkDerivation rec {
name = "xinetd-2.3.15";
@@ -8,6 +8,14 @@ stdenv.mkDerivation rec {
sha256 = "1qsv1al506x33gh92bqa8w21k7mxqrbsrwmxvkj0amn72420ckmz";
};
+ patches = [
+ (fetchpatch {
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch?id=426002bfe2789fb6213fba832c8bfee634d68d02";
+ name = "CVE-2013-4342.patch";
+ sha256 = "1iqcrqzgisz4b6vamprzg2y6chai7qpifqcihisrwbjwbc4wzj8v";
+ })
+ ];
+
meta = {
description = "Secure replacement for inetd";
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index 7fc2a5f7143..5f850a09ded 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/nix-zsh-completions/default.nix b/pkgs/shells/nix-zsh-completions/default.nix
index af7b4a746f4..5faca2fa8e8 100644
--- a/pkgs/shells/nix-zsh-completions/default.nix
+++ b/pkgs/shells/nix-zsh-completions/default.nix
@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "spwhitt";
repo = "nix-zsh-completions";
- rev = "0.2";
- sha256 = "0wimjdxnkw1lzhjn28zm4pgbij86ym0z17ayivpzz27g0sacimga";
+ rev = "0.3";
+ sha256 = "1vwkd4nppjrvy6xb0vx4z73awrhaah1433dp6h4ghi3cdrrjn7ri";
};
installPhase = ''
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
description = "ZSH completions for Nix, NixOS, and NixOps";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.all;
- maintainers = [ stdenv.lib.maintainers.spwhitt ];
+ maintainers = [ stdenv.lib.maintainers.spwhitt stdenv.lib.maintainers.olejorgenb ];
};
}
diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix
index 73a3367f9f7..8ae11e7e75c 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-10-25";
+ version = "2016-12-14";
src = fetchgit {
url = "https://github.com/robbyrussell/oh-my-zsh";
- rev = "0ee89d965ecaa4f32cf2d1039e9d84a73eb206cf";
- sha256 = "1c90yl9kc1a7690bry1jbs48vsdlkxvbnvzgarx5wj99fygb8w2f";
+ rev = "67dad45b38b7f0bafcaf7679da6eb4596301843b";
+ sha256 = "1adgj0p4c8aq9rpkv33k8ra69922vfkjw63b666i66v6zr0s8znp";
};
phases = "installPhase";
diff --git a/pkgs/shells/rssh/default.nix b/pkgs/shells/rssh/default.nix
index 8aa6c2608fa..f1fb4d03121 100644
--- a/pkgs/shells/rssh/default.nix
+++ b/pkgs/shells/rssh/default.nix
@@ -79,4 +79,8 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
maintainers = with maintainers; [ arobyn ];
};
+
+ passthru = {
+ shellPath = "/bin/rssh";
+ };
}
diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix
index bbad1f8cdf4..8280897c47a 100644
--- a/pkgs/shells/rush/default.nix
+++ b/pkgs/shells/rush/default.nix
@@ -1,14 +1,14 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
- name = "rush-1.7";
+ name = "rush-1.8";
src = fetchurl {
url = "mirror://gnu/rush/${name}.tar.gz";
- sha256 = "0fh0gbbp0iiq3wbkf503xb40r8ljk42vyj9bnlflbz82d6ipy1rm";
+ sha256 = "1vxdb81ify4xcyygh86250pi50krb16dkj42i5ii4ns3araiwckz";
};
- patches = [ ./gets.patch ];
+ patches = [ ./fix-format-security-error.patch ];
doCheck = true;
diff --git a/pkgs/shells/rush/fix-format-security-error.patch b/pkgs/shells/rush/fix-format-security-error.patch
new file mode 100644
index 00000000000..ed3ad0aa4c1
--- /dev/null
+++ b/pkgs/shells/rush/fix-format-security-error.patch
@@ -0,0 +1,12 @@
+diff -Nur rush-1.8.orig/lib/wordsplit.c rush-1.8/lib/wordsplit.c
+--- rush-1.8.orig/lib/wordsplit.c 2016-08-18 20:11:43.000000000 +0200
++++ rush-1.8/lib/wordsplit.c 2016-11-14 14:37:02.976177414 +0100
+@@ -2330,7 +2330,7 @@
+ break;
+
+ default:
+- wsp->ws_error (wordsplit_strerror (wsp));
++ wsp->ws_error ("%s", wordsplit_strerror (wsp));
+ }
+ }
+
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 261dbf12f8e..537df67d447 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -2,11 +2,11 @@
let
- version = "5.2";
+ version = "5.3";
documentation = fetchurl {
url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz";
- sha256 = "1r9r91gmrrflzl0yq10bib9gxbqyhycb09hcx28m2g3vv9skmccj";
+ sha256 = "0cvkdw7x6i4m2brc9aakw8d3bmp6baziv72amlq9jd65r421bq88";
};
in
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz";
- sha256 = "0dsr450v8nydvpk8ry276fvbznlrjgddgp7zvhcw4cv69i9lr4ps";
+ sha256 = "0vcsgc1ymqhq0acklhlq5skgj27z597x2a7nx5g3j6q4jvx778hx";
};
buildInputs = [ ncurses pcre ];
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 93c5a21d9d5..10e2a766356 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -1,31 +1,35 @@
-{ system, allPackages, platform, crossSystem, config, ... } @ args:
+{ lib, allPackages
+, system, platform, crossSystem, config
+}:
rec {
- argClobber = {
+ vanillaStdenv = (import ../. {
+ inherit lib allPackages system platform;
crossSystem = null;
# Ignore custom stdenvs when cross compiling for compatability
config = builtins.removeAttrs config [ "replaceStdenv" ];
+ }) // {
+ # Needed elsewhere as a hacky way to pass the target
+ cross = crossSystem;
};
- vanillaStdenv = (import ../. (args // argClobber // {
- allPackages = args: allPackages (argClobber // args);
- })).stdenv;
- # Yeah this isn't so cleanly just build-time packages yet. Notice the
- # buildPackages <-> stdenvCross cycle. Yup, it's very weird.
- #
- # This works because the derivation used to build `stdenvCross` are in
- # fact using `forceNativeDrv` to use the `nativeDrv` attribute of the resulting
- # derivation built with `vanillaStdenv` (second argument of `makeStdenvCross`).
- #
- # Eventually, `forceNativeDrv` should be removed and the cycle broken.
+ # For now, this is just used to build the native stdenv. Eventually, it should
+ # be used to build compilers and other such tools targeting the cross
+ # platform. Then, `forceNativeDrv` can be removed.
buildPackages = allPackages {
+ inherit system platform crossSystem config;
# It's OK to change the built-time dependencies
allowCustomOverrides = true;
- bootStdenv = stdenvCross;
- inherit system platform crossSystem config;
+ stdenv = vanillaStdenv;
};
stdenvCross = buildPackages.makeStdenvCross
- vanillaStdenv crossSystem
+ buildPackages.stdenv crossSystem
buildPackages.binutilsCross buildPackages.gccCrossStageFinal;
+
+ stdenvCrossiOS = let
+ inherit (buildPackages.darwin.ios-cross { prefix = crossSystem.config; inherit (crossSystem) arch; simulator = crossSystem.isiPhoneSimulator or false; }) cc binutils;
+ in buildPackages.makeStdenvCross
+ buildPackages.stdenv crossSystem
+ binutils cc;
}
diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix
index 2f2f495b388..188d0027773 100644
--- a/pkgs/stdenv/custom/default.nix
+++ b/pkgs/stdenv/custom/default.nix
@@ -1,16 +1,21 @@
-{ system, allPackages, platform, crossSystem, config, ... } @ args:
+{ lib, allPackages
+, system, platform, crossSystem, config
+}:
+
+assert crossSystem == null;
rec {
- vanillaStdenv = (import ../. (args // {
+ vanillaStdenv = import ../. {
+ inherit lib allPackages system platform crossSystem;
# Remove config.replaceStdenv to ensure termination.
config = builtins.removeAttrs config [ "replaceStdenv" ];
- })).stdenv;
+ };
buildPackages = allPackages {
+ inherit system platform crossSystem config;
# It's OK to change the built-time dependencies
allowCustomOverrides = true;
- bootStdenv = vanillaStdenv;
- inherit system platform crossSystem config;
+ stdenv = vanillaStdenv;
};
stdenvCustom = config.replaceStdenv { pkgs = buildPackages; };
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 1bc983d6312..b9044f25cd7 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -1,7 +1,5 @@
-{ system ? builtins.currentSystem
-, allPackages ? import ../../..
-, platform ? null
-, config ? {}
+{ lib, allPackages
+, system, platform, crossSystem, config
# Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
, bootstrapFiles ? let
@@ -17,12 +15,14 @@
}
}:
+assert crossSystem == null;
+
let
libSystemProfile = ''
(import "${./standard-sandbox.sb}")
'';
in rec {
- allPackages = import ../../..;
+ inherit allPackages;
commonPreHook = ''
export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}"
@@ -100,8 +100,9 @@ in rec {
};
thisPkgs = allPackages {
- inherit system platform;
- bootStdenv = thisStdenv;
+ inherit system platform crossSystem config;
+ allowCustomOverrides = false;
+ stdenv = thisStdenv;
};
in { stdenv = thisStdenv; pkgs = thisPkgs; };
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 10d2b4decdd..c862eb141a8 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -332,10 +332,10 @@ in rec {
};
# The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it
- test-pkgs = let
- stdenv = import (test-pkgspath + "/pkgs/stdenv/darwin") { inherit system bootstrapFiles; };
- in import test-pkgspath {
+ test-pkgs = import test-pkgspath {
inherit system;
- bootStdenv = stdenv.stdenvDarwin;
+ stdenvFunc = args: let
+ args' = args // { inherit bootstrapFiles; };
+ in (import (test-pkgspath + "/pkgs/stdenv/darwin") args').stdenvDarwin;
};
}
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 10086ee6a85..3b49d0de830 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -5,46 +5,51 @@
# Posix utilities, the GNU C compiler, and so on. On other systems,
# we use the native C library.
-{ system, allPackages ? import ../.., platform, config, crossSystem, lib }:
-
-
-rec {
-
+{ # Args just for stdenvs' usage
+ lib, allPackages
+ # Args to pass on to `allPacakges` too
+, system, platform, crossSystem, config
+} @ args:
+let
# The native (i.e., impure) build environment. This one uses the
# tools installed on the system outside of the Nix environment,
# i.e., the stuff in /bin, /usr/bin, etc. This environment should
# be used with care, since many Nix packages will not build properly
# with it (e.g., because they require GNU Make).
- inherit (import ./native { inherit system allPackages config; }) stdenvNative;
+ inherit (import ./native args) stdenvNative;
stdenvNativePkgs = allPackages {
- bootStdenv = stdenvNative;
+ inherit system platform crossSystem config;
+ allowCustomOverrides = false;
+ stdenv = stdenvNative;
noSysDirs = false;
};
# The Nix build environment.
- stdenvNix = import ./nix {
+ stdenvNix = assert crossSystem == null; import ./nix {
inherit config lib;
stdenv = stdenvNative;
pkgs = stdenvNativePkgs;
};
- inherit (import ./freebsd { inherit system allPackages platform config; }) stdenvFreeBSD;
+ inherit (import ./freebsd args) stdenvFreeBSD;
# Linux standard environment.
- inherit (import ./linux { inherit system allPackages platform config lib; }) stdenvLinux;
+ inherit (import ./linux args) stdenvLinux;
- inherit (import ./darwin { inherit system allPackages platform config; }) stdenvDarwin;
+ inherit (import ./darwin args) stdenvDarwin;
- inherit (import ./cross { inherit system allPackages platform crossSystem config lib; }) stdenvCross;
+ inherit (import ./cross args) stdenvCross stdenvCrossiOS;
- inherit (import ./custom { inherit system allPackages platform crossSystem config lib; }) stdenvCustom;
+ inherit (import ./custom args) stdenvCustom;
# Select the appropriate stdenv for the platform `system'.
- stdenv =
- if crossSystem != null then stdenvCross else
+in
+ if crossSystem != null then
+ if crossSystem.useiOSCross or false then stdenvCrossiOS
+ else stdenvCross else
if config ? replaceStdenv then stdenvCustom else
if system == "i686-linux" then stdenvLinux else
if system == "x86_64-linux" then stdenvLinux else
@@ -58,5 +63,4 @@ rec {
if system == "i686-cygwin" then stdenvNative else
if system == "x86_64-cygwin" then stdenvNative else
if system == "x86_64-freebsd" then stdenvFreeBSD else
- stdenvNative;
-}
+ stdenvNative
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index 4c7ebc16239..ea2ebcc7917 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -1,11 +1,11 @@
-{ system ? builtins.currentSystem
-, allPackages ? import ../../..
-, platform ? null
-, config ? {}
+{ lib, allPackages
+, system, platform, crossSystem, config
}:
+assert crossSystem == null;
+
rec {
- allPackages = import ../../..;
+ inherit allPackages;
bootstrapTools = derivation {
inherit system;
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index edd5c2785dc..bd35970e0d1 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -139,7 +139,7 @@ let
{ nixpkgs.config.allow${up reason} = true; }
in configuration.nix to override this.
- b) For `nix-env`, `nix-build` or any other Nix command you can add
+ b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
{ allow${up reason} = true; }
to ~/.nixpkgs/config.nix.
''));
diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel.nix b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
similarity index 100%
rename from pkgs/stdenv/linux/bootstrap/armv5tel.nix
rename to pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
diff --git a/pkgs/stdenv/linux/bootstrap/armv6l.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
similarity index 100%
rename from pkgs/stdenv/linux/bootstrap/armv6l.nix
rename to pkgs/stdenv/linux/bootstrap-files/armv6l.nix
diff --git a/pkgs/stdenv/linux/bootstrap/armv7l.nix b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
similarity index 100%
rename from pkgs/stdenv/linux/bootstrap/armv7l.nix
rename to pkgs/stdenv/linux/bootstrap-files/armv7l.nix
diff --git a/pkgs/stdenv/linux/bootstrap/i686.nix b/pkgs/stdenv/linux/bootstrap-files/i686.nix
similarity index 100%
rename from pkgs/stdenv/linux/bootstrap/i686.nix
rename to pkgs/stdenv/linux/bootstrap-files/i686.nix
diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f.nix b/pkgs/stdenv/linux/bootstrap-files/loongson2f.nix
similarity index 100%
rename from pkgs/stdenv/linux/bootstrap/loongson2f.nix
rename to pkgs/stdenv/linux/bootstrap-files/loongson2f.nix
diff --git a/pkgs/stdenv/linux/bootstrap/x86_64.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64.nix
similarity index 100%
rename from pkgs/stdenv/linux/bootstrap/x86_64.nix
rename to pkgs/stdenv/linux/bootstrap-files/x86_64.nix
diff --git a/pkgs/stdenv/linux/bootstrap-tools/default.nix b/pkgs/stdenv/linux/bootstrap-tools/default.nix
new file mode 100644
index 00000000000..6118585d545
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap-tools/default.nix
@@ -0,0 +1,18 @@
+{ system, bootstrapFiles }:
+
+derivation {
+ name = "bootstrap-tools";
+
+ builder = bootstrapFiles.busybox;
+
+ args = [ "ash" "-e" ./scripts/unpack-bootstrap-tools.sh ];
+
+ tarball = bootstrapFiles.bootstrapTools;
+
+ inherit system;
+
+ # Needed by the GCC wrapper.
+ langC = true;
+ langCC = true;
+ isGNU = true;
+}
diff --git a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh
similarity index 100%
rename from pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh
rename to pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index e3aeafe178d..9900fc6dd3d 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -3,21 +3,21 @@
# external (non-Nix) tools, such as /usr/bin/gcc, and it contains a C
# compiler and linker that do not search in default locations,
# ensuring purity of components produced by it.
+{ lib, allPackages
+, system, platform, crossSystem, config
-# The function defaults are for easy testing.
-{ system ? builtins.currentSystem
-, allPackages ? import ../../..
-, platform ? null, config ? {}, lib ? (import ../../../lib)
, bootstrapFiles ?
- if system == "i686-linux" then import ./bootstrap/i686.nix
- else if system == "x86_64-linux" then import ./bootstrap/x86_64.nix
- else if system == "armv5tel-linux" then import ./bootstrap/armv5tel.nix
- else if system == "armv6l-linux" then import ./bootstrap/armv6l.nix
- else if system == "armv7l-linux" then import ./bootstrap/armv7l.nix
- else if system == "mips64el-linux" then import ./bootstrap/loongson2f.nix
+ if system == "i686-linux" then import ./bootstrap-files/i686.nix
+ else if system == "x86_64-linux" then import ./bootstrap-files/x86_64.nix
+ else if system == "armv5tel-linux" then import ./bootstrap-files/armv5tel.nix
+ else if system == "armv6l-linux" then import ./bootstrap-files/armv6l.nix
+ else if system == "armv7l-linux" then import ./bootstrap-files/armv7l.nix
+ else if system == "mips64el-linux" then import ./bootstrap-files/loongson2f.nix
else abort "unsupported platform for the pure Linux stdenv"
}:
+assert crossSystem == null;
+
rec {
commonPreHook =
@@ -37,22 +37,7 @@ rec {
# Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...).
- bootstrapTools = derivation {
- name = "bootstrap-tools";
-
- builder = bootstrapFiles.busybox;
-
- args = [ "ash" "-e" ./scripts/unpack-bootstrap-tools.sh ];
-
- tarball = bootstrapFiles.bootstrapTools;
-
- inherit system;
-
- # Needed by the GCC wrapper.
- langC = true;
- langCC = true;
- isGNU = true;
- };
+ bootstrapTools = import ./bootstrap-tools { inherit system bootstrapFiles; };
# This function builds the various standard environments used during
@@ -106,8 +91,9 @@ rec {
};
thisPkgs = allPackages {
- inherit system platform;
- bootStdenv = thisStdenv;
+ inherit system platform crossSystem config;
+ allowCustomOverrides = false;
+ stdenv = thisStdenv;
};
in { stdenv = thisStdenv; pkgs = thisPkgs; };
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 1ecb222af3e..e13fb88eff0 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -173,9 +173,7 @@ rec {
bootstrapTools = "${build}/on-server/bootstrap-tools.tar.xz";
};
- bootstrapTools = (import ./default.nix {
- inherit system bootstrapFiles;
- }).bootstrapTools;
+ bootstrapTools = import ./bootstrap-tools { inherit system bootstrapFiles; };
test = derivation {
name = "test-bootstrap-tools";
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index fcd0805275b..8396bd0cb01 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -1,4 +1,8 @@
-{ system, allPackages ? import ../../.., config }:
+{ lib, allPackages
+, system, platform, crossSystem, config
+}:
+
+assert crossSystem == null;
rec {
@@ -126,8 +130,9 @@ rec {
} // {inherit fetchurl;};
stdenvBoot1Pkgs = allPackages {
- inherit system;
- bootStdenv = stdenvBoot1;
+ inherit system platform crossSystem config;
+ allowCustomOverrides = false;
+ stdenv = stdenvBoot1;
};
diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix
index f86e9b60e04..8bbe1b6a52b 100644
--- a/pkgs/tools/X11/arandr/default.nix
+++ b/pkgs/tools/X11/arandr/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchurl, python, xrandr, pythonPackages }:
+{ stdenv, fetchurl, xrandr, python2Packages }:
-pythonPackages.buildPythonApplication rec {
+let
+ inherit (python2Packages) buildPythonApplication docutils pygtk;
+in buildPythonApplication rec {
name = "arandr-0.1.9";
src = fetchurl {
@@ -15,8 +17,8 @@ pythonPackages.buildPythonApplication rec {
# no tests
doCheck = false;
- buildInputs = [ pythonPackages.docutils ];
- propagatedBuildInputs = [ xrandr pythonPackages.pygtk ];
+ buildInputs = [ docutils ];
+ propagatedBuildInputs = [ xrandr pygtk ];
meta = {
homepage = http://christian.amsuess.com/tools/arandr/;
diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/tools/X11/ffcast/default.nix
new file mode 100644
index 00000000000..936805ed17c
--- /dev/null
+++ b/pkgs/tools/X11/ffcast/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchgit, autoconf, automake, perl, libX11 }:
+
+stdenv.mkDerivation rec {
+ name = "ffcast-${version}";
+ version = "2.5.0";
+ rev = "7c3bf681e7ca9b242e55dbf0c07856ed994d94e9";
+
+ src = fetchgit {
+ url = https://github.com/lolilolicon/FFcast;
+ sha256 = "1s1y6rqjq126jvdzc75wz20szisbz8h8fkphlwxcxzl9xll17akj";
+ };
+
+ buildInputs = [ autoconf automake perl libX11 ];
+
+ preConfigure = ''
+ ./bootstrap
+ '';
+
+ configureFlags = [ "--enable-xrectsel" ];
+
+ postBuild = ''
+ make DESTDIR="$out" install
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Run commands on rectangular screen regions";
+ homepage = https://github.com/lolilolicon/FFcast;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.guyonvarch ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix
index 070152427f2..06a7630c7bc 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/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix
index 5707679c03c..c9530a5cdd9 100644
--- a/pkgs/tools/X11/virtualgl/lib.nix
+++ b/pkgs/tools/X11/virtualgl/lib.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "virtualgl-lib-${version}";
- version = "2.5";
+ version = "2.5.1";
src = fetchurl {
url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz";
- sha256 = "1mnpljmx8nxnmpbx4ja430b3y535wkz185qknsxmk27yz4dbmm8l";
+ sha256 = "0n9ngwji9k0hqy81ridndf7z4lwq5dzmqw66r6vxfz15aw0jwd6s";
};
cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" ];
diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix
index 5436edd0ea3..894f082a708 100644
--- a/pkgs/tools/X11/xcape/default.nix
+++ b/pkgs/tools/X11/xcape/default.nix
@@ -1,31 +1,42 @@
-{stdenv, fetchurl, fetchgit, libX11, xproto, libXtst, xextproto, pkgconfig
-, inputproto, libXi}:
+{ stdenv, fetchFromGitHub, pkgconfig, libX11, libXtst, xextproto,
+libXi }:
+
let
- s = rec {
- baseName = "xcape";
- version = "git-2015-03-01";
- name = "${baseName}-${version}";
- };
- buildInputs = [
- libX11 libXtst xproto xextproto pkgconfig inputproto libXi
- ];
+ baseName = "xcape";
+ version = "1.2";
in
-stdenv.mkDerivation {
- inherit (s) name version;
- inherit buildInputs;
- src = fetchgit {
- url = https://github.com/alols/xcape;
- rev = "f3802fc086ce9d961d644a5d29ad5b650db56215";
- sha256 = "0d79riwzmjr621ss3yhxqn2q8chn3f9rvk2nnjckz5yxbifvfg9s";
+
+stdenv.mkDerivation rec {
+ name = "${baseName}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "alols";
+ repo = baseName;
+ rev = "v${version}";
+ sha256 = "09a05cxgrip6nqy1qmwblamp2bhknqnqmxn7i2a1rgxa0nba95dm";
};
- preConfigure = ''
- makeFlags="$makeFlags PREFIX=$out"
- '';
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs = [ libX11 libXtst xextproto libXi ];
+
+ makeFlags = [ "PREFIX=$(out)" "MANDIR=/share/man/man1" ];
+
+ postInstall = "install -D --target-directory $out/share/doc README.md";
+
meta = {
- inherit (s) version;
- description = ''A tool to have Escape and Control on a single key'';
+ description = "Utility to configure modifier keys to act as other keys";
+ longDescription = ''
+ xcape allows you to use a modifier key as another key when
+ pressed and released on its own. Note that it is slightly
+ slower than pressing the original key, because the pressed event
+ does not occur until the key is released. The default behaviour
+ is to generate the Escape key when Left Control is pressed and
+ released on its own.
+ '';
+ homepage = "https://github.com/alols/xcape";
license = stdenv.lib.licenses.gpl3 ;
- maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.raskin ];
};
}
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 871d5a9dbd8..4ae367abf61 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pythonPackages, pkgconfig
+{ stdenv, lib, fetchurl, python2Packages, pkgconfig
, xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk
, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config
, ffmpeg, x264, libvpx, libwebp
@@ -8,7 +8,7 @@
with lib;
let
- inherit (pythonPackages) python cython buildPythonApplication;
+ inherit (python2Packages) python cython buildPythonApplication;
in buildPythonApplication rec {
name = "xpra-0.17.6";
namePrefix = "";
@@ -39,7 +39,7 @@ in buildPythonApplication rec {
makeWrapper
];
- propagatedBuildInputs = with pythonPackages; [
+ propagatedBuildInputs = with python2Packages; [
pillow pygtk pygobject2 rencode pycrypto cryptography pycups lz4 dbus-python
netifaces numpy websockify pygobject3 gst-python
];
diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix
new file mode 100644
index 00000000000..dffef09a5d4
--- /dev/null
+++ b/pkgs/tools/admin/awslogs/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+ name = "awslogs-${version}";
+ version = "0.7";
+
+ src = fetchFromGitHub {
+ owner = "jorgebastida";
+ repo = "awslogs";
+ rev = "${version}";
+ sha256 = "0dqf26h595l1fcnagxi8zsdarsxg3smsihxaqrvnki8fshhfdqsm";
+ };
+
+ doCheck = false;
+
+ propagatedBuildInputs = with pythonPackages; [
+ boto3 termcolor dateutil docutils
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/jorgebastida/awslogs;
+ description = "AWS CloudWatch logs for Humans";
+ maintainers = with maintainers; [ dbrock ];
+ license = licenses.bsd3;
+ };
+}
diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix
index 80805666a3a..8ff147faacc 100644
--- a/pkgs/tools/admin/certbot/default.nix
+++ b/pkgs/tools/admin/certbot/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, pythonPackages, fetchFromGitHub, dialog }:
+{ stdenv, python2Packages, fetchFromGitHub, dialog }:
-pythonPackages.buildPythonApplication rec {
+# Latest version of certbot supports python3 and python3 version of pythondialog
+
+python2Packages.buildPythonApplication rec {
name = "certbot-${version}";
- version = "0.6.0";
+ version = "0.9.3";
src = fetchFromGitHub {
owner = "certbot";
repo = "certbot";
rev = "v${version}";
- sha256 = "1x0prlldkgg0hxmya4m5h3k3c872wr0jylmzpr3m04mk339yiw0c";
+ sha256 = "03yfr8vlq62l0h14qk03flrkbvbv9mc5cf6rmh37naj8jwpl8cic";
};
- propagatedBuildInputs = with pythonPackages; [
+ propagatedBuildInputs = with python2Packages; [
ConfigArgParse
acme
configobj
@@ -26,11 +28,11 @@ pythonPackages.buildPythonApplication rec {
zope_component
zope_interface
];
- buildInputs = [ dialog ] ++ (with pythonPackages; [ nose mock gnureadline ]);
+ buildInputs = [ dialog ] ++ (with python2Packages; [ nose mock gnureadline ]);
patchPhase = ''
substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/var/setuid-wrappers/sendmail"
- substituteInPlace certbot/le_util.py --replace "sw_vers" "/usr/bin/sw_vers"
+ substituteInPlace certbot/util.py --replace "sw_vers" "/usr/bin/sw_vers"
'';
postInstall = ''
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 27ca19178a0..dd8aada62fe 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -2,20 +2,23 @@
with python27Packages;
+# other systems not supported yet
+assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
+
stdenv.mkDerivation rec {
name = "google-cloud-sdk-${version}";
- version = "122.0.0";
+ version = "138.0.0";
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz";
- sha256 = "0nx348yx1avbb34bpj316fb7jzyzkylscyx8kv183rg4s1q2f798";
+ sha256 = "1z2v4bg743qkdlmyyy0z2j5s0g10vbc1643gxrhyz491sk6sp616";
}
else
fetchurl {
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz";
- sha256 = "0jhw8yv2kv0fs64rzvddx3szzpn74nqnd3rbd9wx2vi6nmffkrwv";
+ sha256 = "1y64bx9vj6rrapffr7zwxbxxbqlddx91n82kr99mwv19n11hydyw";
};
buildInputs = [python27 makeWrapper];
diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix
index 24bfe043b9d..aef077e21a0 100644
--- a/pkgs/tools/admin/simp_le/default.nix
+++ b/pkgs/tools/admin/simp_le/default.nix
@@ -1,23 +1,17 @@
{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages }:
pythonPackages.buildPythonApplication rec {
- name = "simp_le-2016-04-17";
+ name = "simp_le-2016-12-16";
+ # kuba/simp_le seems unmaintained
src = fetchFromGitHub {
- owner = "kuba";
+ owner = "zenhack";
repo = "simp_le";
- rev = "3a103b76f933f9aef782a47401dd2eff5057a6f7";
- sha256 = "0x8gqazn09m30bn1l7xnf8snhbb7yz7sb09imciqmm4jqdvn797z";
+ rev = "63a43b8547cd9fbc87db6bcd9497c6e37f73abef";
+ sha256 = "04dr8lvcpi797722lsy06nxhlihrxdqgdy187pg3hl1ki2iq3ixx";
};
- patches = [
- (fetchpatch {
- url = "https://github.com/kuba/simp_le/commit/4bc788fdd611c4118c3f86b5f546779723aca5a7.patch";
- sha256 = "0036p11qn3plydv5s5z6i28r6ihy1ipjl0y8la0izpkiq273byfc";
- })
- ];
-
- propagatedBuildInputs = with pythonPackages; [ acme_0_5_0 ];
+ propagatedBuildInputs = with pythonPackages; [ acme ];
meta = with stdenv.lib; {
inherit (src.meta) homepage;
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index eeefd4d99b5..901ec06ea65 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;
@@ -39,9 +39,20 @@ stdenv.mkDerivation rec {
tar xf ${xorg.xorgserver.src}
cp -R xorg*/* unix/xserver
pushd unix/xserver
+ version=$(echo ${xorg.xorgserver.name} | sed 's/.*-\([0-9]\+\).\([0-9]\+\).*/\1\2/g')
+ patch -p1 < ${src}/unix/xserver$version.patch
autoreconf -vfi
- ./configure $configureFlags --disable-devel-docs --disable-docs --disable-xinerama --disable-xvfb --disable-xnest \
- --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx \
+ ./configure $configureFlags --disable-devel-docs --disable-docs \
+ --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
+ --disable-xwin --disable-xephyr --disable-kdrive --with-pic \
+ --disable-xorgcfg --disable-xprint --disable-static \
+ --disable-composite --disable-xtrap --enable-xcsecurity \
+ --disable-{a,c,m}fb \
+ --disable-xwayland \
+ --disable-config-dbus --disable-config-udev --disable-config-hal \
+ --disable-xevie \
+ --disable-dri --disable-dri2 --disable-dri3 --enable-glx \
+ --enable-install-libxf86config \
--prefix="$out" --disable-unit-tests \
--with-xkb-path=${xkeyboard_config}/share/X11/xkb \
--with-xkb-bin-directory=${xorg.xkbcomp}/bin \
@@ -49,9 +60,9 @@ stdenv.mkDerivation rec {
make TIGERVNC_SRCDIR=`pwd`/../..
popd
'';
-
+
postInstall = ''
- pushd unix/xserver
+ pushd unix/xserver/hw/vnc
make TIGERVNC_SRCDIR=`pwd`/../.. install
popd
rm -f $out/lib/xorg/protocol.txt
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 80c84236b8d..447ef1f623f 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "097hx7sbzp8qirl4m930lw84kn0wmxhmq7v1qpra3mrg0b8cyba0";
};
- patches = [ ./CVE-2016-6321.patch ]; # FIXME: remove on another stdenv rebuild
+ patches = [ ./CVE-2016-6321.patch ];
# avoid retaining reference to CF during stdenv bootstrap
configureFlags = stdenv.lib.optionals stdenv.isDarwin [
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix
index 7c952a8f729..2b61b5b2679 100644
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
stdenv.mkDerivation rec {
name = "p7zip-${version}";
@@ -9,6 +9,13 @@ stdenv.mkDerivation rec {
sha256 = "5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f";
};
+ patches = [
+ (fetchpatch {
+ url = "https://sources.debian.net/data/main/p/p7zip/16.02+dfsg-2/debian/patches/12-CVE-2016-9296.patch";
+ sha256 = "1i7099h27gmb9dv0lb7jnqfm504gs1c3129r6kvi94yb2gzrzk41";
+ })
+ ];
+
preConfigure = ''
makeFlagsArray=(DEST_HOME=$out)
buildFlags=all3
@@ -18,6 +25,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ setupHook = ./setup-hook.sh;
+
meta = {
homepage = http://p7zip.sourceforge.net/;
description = "A port of the 7-zip archiver";
diff --git a/pkgs/tools/archivers/p7zip/setup-hook.sh b/pkgs/tools/archivers/p7zip/setup-hook.sh
new file mode 100644
index 00000000000..4dc88f07c0b
--- /dev/null
+++ b/pkgs/tools/archivers/p7zip/setup-hook.sh
@@ -0,0 +1,5 @@
+unpackCmdHooks+=(_try7zip)
+_try7zip() {
+ if ! [[ "$curSrc" =~ \.7z$ ]]; then return 1; fi
+ 7z x "$curSrc"
+}
diff --git a/pkgs/tools/archivers/unzip/CVE-2014-9913.patch b/pkgs/tools/archivers/unzip/CVE-2014-9913.patch
new file mode 100644
index 00000000000..a5675f4fb7c
--- /dev/null
+++ b/pkgs/tools/archivers/unzip/CVE-2014-9913.patch
@@ -0,0 +1,29 @@
+From: "Steven M. Schweda"
+Subject: Fix CVE-2014-9913, buffer overflow in unzip
+Bug: https://sourceforge.net/p/infozip/bugs/27/
+Bug-Debian: https://bugs.debian.org/847485
+Bug-Ubuntu: https://launchpad.net/bugs/387350
+X-Debian-version: 6.0-21
+
+--- a/list.c
++++ b/list.c
+@@ -339,7 +339,18 @@
+ G.crec.compression_method == ENHDEFLATED) {
+ methbuf[5] = dtype[(G.crec.general_purpose_bit_flag>>1) & 3];
+ } else if (methnum >= NUM_METHODS) {
+- sprintf(&methbuf[4], "%03u", G.crec.compression_method);
++ /* 2013-02-26 SMS.
++ * http://sourceforge.net/p/infozip/bugs/27/ CVE-2014-9913.
++ * Unexpectedly large compression methods overflow
++ * &methbuf[]. Use the old, three-digit decimal format
++ * for values which fit. Otherwise, sacrifice the
++ * colon, and use four-digit hexadecimal.
++ */
++ if (G.crec.compression_method <= 999) {
++ sprintf( &methbuf[ 4], "%03u", G.crec.compression_method);
++ } else {
++ sprintf( &methbuf[ 3], "%04X", G.crec.compression_method);
++ }
+ }
+
+ #if 0 /* GRR/Euro: add this? */
diff --git a/pkgs/tools/archivers/unzip/CVE-2016-9844.patch b/pkgs/tools/archivers/unzip/CVE-2016-9844.patch
new file mode 100644
index 00000000000..52d07987b33
--- /dev/null
+++ b/pkgs/tools/archivers/unzip/CVE-2016-9844.patch
@@ -0,0 +1,28 @@
+From: "Steven M. Schweda"
+Subject: Fix CVE-2016-9844, buffer overflow in zipinfo
+Bug-Debian: https://bugs.debian.org/847486
+Bug-Ubuntu: https://launchpad.net/bugs/1643750
+X-Debian-version: 6.0-21
+
+--- a/zipinfo.c
++++ b/zipinfo.c
+@@ -1921,7 +1921,18 @@
+ ush dnum=(ush)((G.crec.general_purpose_bit_flag>>1) & 3);
+ methbuf[3] = dtype[dnum];
+ } else if (methnum >= NUM_METHODS) { /* unknown */
+- sprintf(&methbuf[1], "%03u", G.crec.compression_method);
++ /* 2016-12-05 SMS.
++ * https://launchpad.net/bugs/1643750
++ * Unexpectedly large compression methods overflow
++ * &methbuf[]. Use the old, three-digit decimal format
++ * for values which fit. Otherwise, sacrifice the "u",
++ * and use four-digit hexadecimal.
++ */
++ if (G.crec.compression_method <= 999) {
++ sprintf( &methbuf[ 1], "%03u", G.crec.compression_method);
++ } else {
++ sprintf( &methbuf[ 0], "%04X", G.crec.compression_method);
++ }
+ }
+
+ for (k = 0; k < 15; ++k)
diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix
index da0983fc097..b9fa760c019 100644
--- a/pkgs/tools/archivers/unzip/default.nix
+++ b/pkgs/tools/archivers/unzip/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation {
./CVE-2014-9636.diff
./CVE-2015-7696.diff
./CVE-2015-7697.diff
+ ./CVE-2014-9913.patch
+ ./CVE-2016-9844.patch
] ++ stdenv.lib.optional enableNLS
(fetchurl {
url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1";
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index c7b1d695041..60cfe4a2814 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -74,16 +74,17 @@ let
in pythonPackages.buildPythonApplication rec {
name = "beets-${version}";
- version = "1.3.19";
+ version = "1.4.1";
src = fetchFromGitHub {
- owner = "sampsyo";
+ owner = "beetbox";
repo = "beets";
rev = "v${version}";
- sha256 = "0f2v1924ryx5xijpv1jycanl4471vcd7c5lld58lm0viyvh5k28x";
+ sha256 = "1yj2m7l157lldhxanwifp3yv1c6k649iwhn061mcf26q4n8qmspk";
};
propagatedBuildInputs = [
+ pythonPackages.six
pythonPackages.enum34
pythonPackages.jellyfish
pythonPackages.munkres
diff --git a/pkgs/tools/audio/beets/keyfinder-default-bin.patch b/pkgs/tools/audio/beets/keyfinder-default-bin.patch
index b0b573bbf31..1ea195a678e 100644
--- a/pkgs/tools/audio/beets/keyfinder-default-bin.patch
+++ b/pkgs/tools/audio/beets/keyfinder-default-bin.patch
@@ -1,5 +1,5 @@
diff --git a/beetsplug/keyfinder.py b/beetsplug/keyfinder.py
-index b6131a4..b493792 100644
+index 34a4abc..59e8539 100644
--- a/beetsplug/keyfinder.py
+++ b/beetsplug/keyfinder.py
@@ -30,7 +30,7 @@ class KeyFinderPlugin(BeetsPlugin):
@@ -11,25 +11,26 @@ index b6131a4..b493792 100644
u'auto': True,
u'overwrite': False,
})
-@@ -59,7 +59,7 @@ class KeyFinderPlugin(BeetsPlugin):
+@@ -59,8 +59,7 @@ class KeyFinderPlugin(BeetsPlugin):
continue
try:
-- output = util.command_output([bin, b'-f',
-+ output = util.command_output([bin,
- util.syspath(item.path)])
+- output = util.command_output([bin, '-f',
+- util.syspath(item.path)])
++ output = util.command_output([bin, util.syspath(item.path)])
except (subprocess.CalledProcessError, OSError) as exc:
self._log.error(u'execution failed: {0}', exc)
+ continue
diff --git a/test/test_keyfinder.py b/test/test_keyfinder.py
-index 00952fe..01ff8d4 100644
+index 57e2bcd..c1ee916 100644
--- a/test/test_keyfinder.py
+++ b/test/test_keyfinder.py
-@@ -46,7 +46,7 @@ class KeyFinderTest(unittest.TestCase, TestHelper):
+@@ -44,7 +44,7 @@ class KeyFinderTest(unittest.TestCase, TestHelper):
item.load()
self.assertEqual(item['initial_key'], 'C#m')
- self.command_output.assert_called_with(
+ command_output.assert_called_with(
- ['KeyFinder', '-f', util.syspath(item.path)])
+ ['keyfinder-cli', util.syspath(item.path)])
- def test_add_key_on_import(self):
- self.command_output.return_value = 'dbm'
+ def test_add_key_on_import(self, command_output):
+ command_output.return_value = 'dbm'
diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix
index ffa119b3c53..c3256713832 100644
--- a/pkgs/tools/backup/bareos/default.nix
+++ b/pkgs/tools/backup/bareos/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool, flex
-, readline ? null, openssl ? null, python ? null, ncurses ? null, rocksdb
+, readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb
, sqlite ? null, postgresql ? null, libmysql ? null, zlib ? null, lzo ? null
, jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null
}:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- nettools gettext readline openssl python flex ncurses sqlite postgresql
+ nettools gettext readline openssl python2 flex ncurses sqlite postgresql
libmysql zlib lzo jansson acl glusterfs libceph libcap rocksdb
];
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
"--enable-sql-pooling"
"--enable-scsi-crypto"
] ++ optionals (readline != null) [ "--disable-conio" "--enable-readline" "--with-readline=${readline.dev}" ]
- ++ optional (python != null) "--with-python=${python}"
+ ++ optional (python2 != null) "--with-python=${python2}"
++ optional (openssl != null) "--with-openssl=${openssl.dev}"
++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}"
++ optional (postgresql != null) "--with-postgresql=${postgresql}"
diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix
index 5faeb926c06..ff542e781a6 100644
--- a/pkgs/tools/backup/btrbk/default.nix
+++ b/pkgs/tools/backup/btrbk/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, fetchurl, coreutils, bash, btrfs-progs, perl, perlPackages, makeWrapper }:
+{ stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages, makeWrapper }:
stdenv.mkDerivation rec {
name = "btrbk-${version}";
- version = "0.22.2";
+ version = "0.24.0";
src = fetchurl {
url = "http://digint.ch/download/btrbk/releases/${name}.tar.xz";
- sha256 = "1gbgi0dp62wlw7y72pgxjs6byxkrk73g35kqxzw0gjf32r5i4sb8";
+ sha256 = "01jrlswly28h4q4r3qfrzadz0pf0ms6wynmqhwddj1ahj31729h3";
};
patches = [
# https://github.com/digint/btrbk/pull/74
./btrbk-Prefix-PATH-instead-of-resetting-it.patch
- # https://github.com/digint/btrbk/pull/73
- ./btrbk-mail-Use-btrbk-instead-of-unbound-variable-btr.patch
];
buildInputs = with perlPackages; [ makeWrapper perl DateCalc ];
@@ -38,7 +36,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/sbin/btrbk \
--set PERL5LIB $PERL5LIB \
- --prefix PATH ':' "${stdenv.lib.makeBinPath [ btrfs-progs bash ]}"
+ --prefix PATH ':' "${stdenv.lib.makeBinPath [ btrfs-progs bash openssh ]}"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index 075f1653adf..4e035ab67ac 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchurl, makeWrapper
-, perl, pandoc, pythonPackages, git
+, perl, pandoc, python2Packages, git
, par2cmdline ? null, par2Support ? false
}:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
sha256 = "1hsxzrjvqa3pd74vmz8agiiwynrzynp1i726h0fzdsakc4adya4l";
};
- buildInputs = [ git pythonPackages.python ];
+ buildInputs = [ git python2Packages.python ];
nativeBuildInputs = [ pandoc perl makeWrapper ];
postPatch = ''
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/bup \
--prefix PATH : ${git}/bin \
--prefix PYTHONPATH : ${concatStringsSep ":" (map (x: "$(toPythonPath ${x})")
- (with pythonPackages;
+ (with python2Packages;
[ setuptools tornado ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ]))}
'';
diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix
index 1c313beae9f..f3910893b7b 100644
--- a/pkgs/tools/backup/rdiff-backup/default.nix
+++ b/pkgs/tools/backup/rdiff-backup/default.nix
@@ -1,6 +1,6 @@
-{stdenv, fetchurl, python, librsync, gnused }:
+{stdenv, fetchurl, python2Packages, librsync, gnused }:
-stdenv.mkDerivation {
+python2Packages.buildPythonApplication {
name = "rdiff-backup-1.3.3";
src = fetchurl {
@@ -10,15 +10,9 @@ stdenv.mkDerivation {
patches = [ ./fix-librsync-rs_default_strong_len.patch ];
- installPhase = ''
- python ./setup.py install --prefix=$out
- sed -i $out/bin/rdiff-backup -e \
- "/import sys/ asys.path += [ \"$out/lib/python2.7/site-packages/\" ]"
- sed -i $out/bin/rdiff-backup-statistics -e \
- "/import .*sys/ asys.path += [ \"$out/lib/python2.7/site-packages/\" ]"
- '';
+ buildInputs = [ librsync gnused ];
- buildInputs = [ python librsync gnused ];
+ doCheck = false;
meta = {
description = "Backup system trying to combine best a mirror and an incremental backup system";
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 2efd4660bbc..1c1085ff814 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py
'';
- pythonPath = with pythonPackages; [ dbus-python pygobject3 ];
+ pythonPath = with pythonPackages; [ dbus-python pygobject3 pycairo ];
propagatedUserEnvPkgs = [ obex_data_server dconf ];
diff --git a/pkgs/tools/cd-dvd/nrg2iso/default.nix b/pkgs/tools/cd-dvd/nrg2iso/default.nix
new file mode 100644
index 00000000000..35414f6e776
--- /dev/null
+++ b/pkgs/tools/cd-dvd/nrg2iso/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+ name = "nrg2iso-${version}";
+ version = "0.4";
+
+ src = fetchurl {
+ url = "gregory.kokanosky.free.fr/v4/linux/${name}.tar.gz";
+ sha256 = "18sam7yy50rbfhjixwd7wx7kmfn1x1y5j80vwfxi5v408s39s115";
+ };
+
+ installPhase = ''
+ mkdir -pv $out/bin/
+ cp -v nrg2iso $out/bin/nrg2iso
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A linux utils for converting CD (or DVD) image generated by Nero Burning Rom to ISO format";
+ homepage = http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/compression/bzip2/CVE-2016-3189.patch b/pkgs/tools/compression/bzip2/CVE-2016-3189.patch
new file mode 100644
index 00000000000..eff324b3250
--- /dev/null
+++ b/pkgs/tools/compression/bzip2/CVE-2016-3189.patch
@@ -0,0 +1,12 @@
+diff --git a/bzip2recover.c b/bzip2recover.c
+index f9de049..252c1b7 100644
+--- a/bzip2recover.c
++++ b/bzip2recover.c
+@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv )
+ bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 );
+ bsPutUInt32 ( bsWr, blockCRC );
+ bsClose ( bsWr );
++ outFile = NULL;
+ }
+ if (wrBlock >= rbCtr) break;
+ wrBlock++;
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index cabd412fe65..51f47811065 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, fetchpatch
, linkStatic ? (stdenv.system == "i686-cygwin")
}:
@@ -20,10 +20,16 @@ stdenv.mkDerivation rec {
sha256 = "0b5b5p8c7bslc6fslcr1nj9136412v3qcvbg6yxi9argq9g72v8c";
};
+ patches = [
+ ./CVE-2016-3189.patch
+ ];
+
+
postPatch = ''
sed -i -e '//s|\\|/|' bzip2.c
'';
+
outputs = [ "bin" "dev" "out" "man" ];
configureFlags =
diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix
index d412a4e433e..4e3f7d3d0db 100644
--- a/pkgs/tools/compression/dtrx/default.nix
+++ b/pkgs/tools/compression/dtrx/default.nix
@@ -1,6 +1,17 @@
-{stdenv, fetchurl, pythonPackages}:
+{stdenv, lib, fetchurl, pythonPackages
+, gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, p7zip, cabextract, unrar, unshield
+, bzip2, xz, lzip
+# unzip is handled by p7zip
+, unzipSupport ? false
+, unrarSupport ? false }:
-pythonPackages.buildPythonApplication rec {
+let
+ archivers = lib.makeBinPath ([ gnutar lhasa rpm binutils cpio gzip p7zip cabextract unshield ]
+ ++ lib.optional (unzipSupport) unzip
+ ++ lib.optional (unrarSupport) unrar
+ ++ [ bzip2 xz lzip ]);
+
+in pythonPackages.buildPythonApplication rec {
name = "dtrx-${version}";
version = "7.1";
@@ -9,6 +20,10 @@ pythonPackages.buildPythonApplication rec {
sha1 = "05cfe705a04a8b84571b0a5647cd2648720791a4";
};
+ postInstall = ''
+ wrapProgram "$out/bin/dtrx" --prefix PATH : "${archivers}"
+ '';
+
meta = with stdenv.lib; {
description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives";
homepage = "http://brettcsmith.org/2007/dtrx/";
diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix
index cf616a21e0a..cc6453e801e 100644
--- a/pkgs/tools/compression/lbzip2/default.nix
+++ b/pkgs/tools/compression/lbzip2/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
- homepage = http://lbzip2.org/;
+ homepage = "http://lbzip2.org/";
description = "Parallel bzip2 compression utility";
license = licenses.gpl3;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix
new file mode 100644
index 00000000000..fe713556577
--- /dev/null
+++ b/pkgs/tools/filesystems/convoy/default.nix
@@ -0,0 +1,26 @@
+# This file was generated by go2nix.
+{ stdenv, buildGoPackage, fetchFromGitHub, devicemapper }:
+
+buildGoPackage rec {
+ name = "convoy-${version}";
+ version = "0.5.0";
+
+ goPackagePath = "github.com/rancher/convoy";
+
+ src = fetchFromGitHub {
+ rev = "v${version}";
+ owner = "rancher";
+ repo = "convoy";
+ sha256 = "0ihy0cfq7sa2wml904ajwr165hx2mas3jb1bqk3i0m4fg1lx1xw1";
+ };
+
+ buildInputs = [devicemapper];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/rancher/convoy;
+ description = "A Docker volume plugin, managing persistent container volumes.";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ offline ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index f00a80603f9..8ff10039449 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libuuid }:
stdenv.mkDerivation rec {
- name = "e2fsprogs-1.42.13";
+ name = "e2fsprogs-1.43.3";
src = fetchurl {
url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
- sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar";
+ sha256 = "09wrn60rlqdgjkmm09yv32zxdjba2pd4ya3704bhywyln2xz33nf";
};
outputs = [ "bin" "dev" "out" "man" ];
diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix
index e7f20b1e6b3..4af076e8f2c 100644
--- a/pkgs/tools/filesystems/f3/default.nix
+++ b/pkgs/tools/filesystems/f3/default.nix
@@ -1,21 +1,35 @@
-{ stdenv, fetchFromGitHub }:
-
+{ stdenv, fetchFromGitHub
+, parted, udev
+}:
+let
+ version = "6.0-2016.11.16-unstable";
+in
stdenv.mkDerivation rec {
name = "f3-${version}";
- version = "6.0";
enableParallelBuilding = true;
src = fetchFromGitHub {
owner = "AltraMayor";
repo = "f3";
- rev = "v${version}";
- sha256 = "1azi10ba0h9z7m0gmfnyymmfqb8380k9za8hn1rrw1s442hzgnz2";
+ rev = "eabf001f69a788e64912bc9e812c118a324077d5";
+ sha256 = "0ypqyqwqiy3ynssdd9gamk1jxywg6avb45ndlzhv3wxh2qcframm";
};
- makeFlags = [ "PREFIX=$(out)" ];
+ buildInputs = [ parted udev ];
+
patchPhase = "sed -i 's/-oroot -groot//' Makefile";
+ buildFlags = [ "CFLAGS=-fgnu89-inline" # HACK for weird gcc incompatibility with -O2
+ "all" # f3read, f3write
+ "extra" # f3brew, f3fix, f3probe
+ ];
+
+ installFlags = [ "PREFIX=$(out)"
+ "install"
+ "install-extra"
+ ];
+
meta = {
description = "Fight Flash Fraud";
homepage = http://oss.digirati.com.br/f3/;
diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix
new file mode 100644
index 00000000000..b808573aa5b
--- /dev/null
+++ b/pkgs/tools/filesystems/genimage/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, libconfuse }:
+
+stdenv.mkDerivation rec {
+ name = "genimage-${version}";
+ version = "9";
+
+ src = fetchurl {
+ url = "http://public.pengutronix.de/software/genimage/genimage-${version}.tar.xz";
+ sha256 = "0y4h8x8lqxam8m90rdfq8cg5137kvilxr3d1qzddpx7nxpvmmwv9";
+ };
+
+ buildInputs = [ pkgconfig libconfuse ];
+
+ postInstall = ''
+ # As there is no manpage or built-in --help, add the README file for
+ # documentation.
+ docdir="$out/share/doc/genimage"
+ mkdir -p "$docdir"
+ cp -v README "$docdir"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://git.pengutronix.de/cgit/genimage;
+ description = "Generate filesystem images from directory trees";
+ license = licenses.gpl2Plus;
+ platforms = platforms.all;
+ maintainers = [ maintainers.bjornfor ];
+ };
+}
diff --git a/pkgs/tools/filesystems/gocrypfs/default.nix b/pkgs/tools/filesystems/gocrypfs/default.nix
new file mode 100644
index 00000000000..c156cd13244
--- /dev/null
+++ b/pkgs/tools/filesystems/gocrypfs/default.nix
@@ -0,0 +1,43 @@
+# This file was generated by go2nix.
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, pkgconfig, openssl }:
+
+with lib;
+
+let
+ goFuseVersion = substring 0 7 (head (filter (
+ d: d.goPackagePath == "github.com/hanwen/go-fuse"
+ ) (import ./deps.nix))).fetch.rev;
+in buildGoPackage rec {
+ name = "gocryptfs-${version}";
+ version = "1.1.1";
+ rev = "v${version}";
+
+ goPackagePath = "github.com/rfjakob/gocryptfs";
+
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "rfjakob";
+ repo = "gocryptfs";
+ sha256 = "0p173x2s0km7a43h6ihir5p19fdlkkb9lc9120k9hccr33iws25z";
+ };
+
+ buildInputs = [pkgconfig openssl];
+
+ goDeps = ./deps.nix;
+
+ postPatch = "rm -r tests";
+
+ buildFlagsArray = ''
+ -ldflags=
+ -X main.GitVersion=${rev}
+ -X main.GitVersionFuse=${goFuseVersion}
+ '';
+
+ meta = {
+ description = "Encrypted overlay filesystem written in Go";
+ license = licenses.mit;
+ homepage = https://nuetzlich.net/gocryptfs/;
+ maintainers = with maintainers; [offline];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/tools/filesystems/gocrypfs/deps.nix b/pkgs/tools/filesystems/gocrypfs/deps.nix
new file mode 100644
index 00000000000..08a4afb5265
--- /dev/null
+++ b/pkgs/tools/filesystems/gocrypfs/deps.nix
@@ -0,0 +1,39 @@
+# This file was generated by go2nix.
+[
+ {
+ goPackagePath = "github.com/hanwen/go-fuse";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hanwen/go-fuse";
+ rev = "6c2b7d8f22c99776f8bfe17cd26d5f744a5b4cdc";
+ sha256 = "1mb73vyqfy92830qif83zdlng0zycmm5fgmm9bwihqh92y8inw3h";
+ };
+ }
+ {
+ goPackagePath = "github.com/jacobsa/crypto";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jacobsa/crypto";
+ rev = "293ce0c192fb4f59cd879b46544922b9ed09a13a";
+ sha256 = "12nm5h5dqqk8yrzlkmcqm0aam8l6l1s6rah48mrmz1z5bgm9h5rs";
+ };
+ }
+ {
+ goPackagePath = "github.com/rfjakob/eme";
+ fetch = {
+ type = "git";
+ url = "https://github.com/rfjakob/eme";
+ rev = "601d0e278ceda9aa2085a61c9265f6e690ef5255";
+ sha256 = "1ryh5f2a42psrqcpjh73shk3p0mva2vcyyfav4nhxmfqall77k5z";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "88d0005bf4c3ec17306ecaca4281a8d8efd73e91";
+ sha256 = "1d3x0rwfd4cml06ka8gy74wxrw94m2z7qgz6ky0rgmxcr7p5iikz";
+ };
+ }
+]
diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix
index d71b6332321..c5cc4f053a2 100644
--- a/pkgs/tools/filesystems/nilfs-utils/default.nix
+++ b/pkgs/tools/filesystems/nilfs-utils/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, libuuid, libselinux }:
let
sourceInfo = rec {
- version = "2.2.5";
+ version = "2.2.6";
url = "http://nilfs.sourceforge.net/download/nilfs-utils-${version}.tar.bz2";
- sha256 = "0a5iavbjj8c255mfl968ljmj3cb217k7803cc1sdaskacwnykdq2";
+ sha256 = "1rjj6pv7yx5wm7b3w6hv88v6r53jqaam5nrnkw2and4ifhsprf3y";
baseName = "nilfs-utils";
name = "${baseName}-${version}";
};
diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
index edb2978001b..b207eeeb9c3 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
@@ -28,7 +28,6 @@ buildPythonApplication rec {
}' blivet/formats/__init__.py
sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
sed -i -r -e 's|"(u?mount)"|"${utillinux.bin}/bin/\1"|' blivet/util.py
- sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py
'' + stdenv.lib.optionalString useNixUdev ''
sed -i -e '/find_library/,/find_library/ {
c libudev = "${systemd.lib}/lib/libudev.so.1"
diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix
index 3946d6fcef8..bbaad516ebe 100644
--- a/pkgs/tools/filesystems/snapraid/default.nix
+++ b/pkgs/tools/filesystems/snapraid/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "snapraid-${version}";
- version = "10.0";
+ version = "11.0";
src = fetchurl {
url = "https://github.com/amadvance/snapraid/releases/download/v${version}/snapraid-${version}.tar.gz";
- sha256 = "1mhs0gl285a5y2bw6k04lrnyg1pp2am7dfcsvg0w4vr5h2ag3p7p";
+ sha256 = "0wapbi8ph7qcyh1jwyrn2r5slzsznlxvg137r4l02xgaaf42p9rh";
};
doCheck = true;
diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix
index 1658a428920..77302f3d4a2 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -6,18 +6,18 @@ let
p = if stdenv.is64bit then {
arch = "x86_64";
gcclib = "${stdenv.cc.cc.lib}/lib64";
- sha256 = "0k05ybvnv0zx4vfx55jyhia38qqysaj68mapq0gwgf74k3a943g2";
+ sha256 = "1skbzmrcjbw00a3jnbl2llqwz3ahsgvq74mjav68s2hw1wjidvk6";
}
else {
arch = "i386";
gcclib = "${stdenv.cc.cc.lib}/lib";
- sha256 = "09z9idmp7idcq0alwkla9kal9h82dx11jqh678lc4rviqggxzxhp";
+ sha256 = "09h71i3k9d24ki81jdwhnav63fqbc44glbx228s9g3cr4ap41jcx";
};
in
stdenv.mkDerivation rec {
name = "yandex-disk-${version}";
- version = "0.1.5.948";
+ version = "0.1.5.978";
src = fetchurl {
url = "http://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm";
diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index 606e049703d..ccee4f21314 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, fftw, zlib, libjpeg, libtiff, libpng }:
+{ stdenv, fetchurl, fftw, zlib, libjpeg, libtiff, libpng, pkgconfig }:
stdenv.mkDerivation rec {
name = "gmic-${version}";
- version = "1.7.7";
+ version = "1.7.8";
src = fetchurl {
url = "http://gmic.eu/files/source/gmic_${version}.tar.gz";
- sha256 = "0shcxgq8nc391c0y0zh3l87g3p7fvsmgshi1x1jvvwwq1b9nf6vp";
+ sha256 = "1921s0n2frj8q95l8lm8was64cypnychgcgcavx9q8qljzbk4brs";
};
+ nativeBuildInputs = [ pkgconfig ];
+
buildInputs = [ fftw zlib libjpeg libtiff libpng ];
sourceRoot = "${name}/src";
diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix
index 255ec2d536f..32cc283bc3c 100644
--- a/pkgs/tools/graphics/graphviz/2.0.nix
+++ b/pkgs/tools/graphics/graphviz/2.0.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
"--with-jpeglibdir=${libjpeg.out}/lib"
"--with-expatincludedir=${expat.dev}/include"
"--with-expatlibdir=${expat.out}/lib"
+ "--with-ltdl-include=${libtool}/include"
+ "--with-ltdl-lib=${libtool.lib}/lib"
]
++ stdenv.lib.optional (xlibsWrapper == null) "--without-x";
diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix
index 9c125433c3a..a09d60f788c 100644
--- a/pkgs/tools/graphics/graphviz/2.32.nix
+++ b/pkgs/tools/graphics/graphviz/2.32.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
"--with-jpeglibdir=${libjpeg.out}/lib"
"--with-expatincludedir=${expat.dev}/include"
"--with-expatlibdir=${expat.out}/lib"
+ "--with-ltdl-include=${libtool}/include"
+ "--with-ltdl-lib=${libtool.lib}/lib"
"--with-cgraph=no"
"--with-sparse=no"
]
diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix
new file mode 100644
index 00000000000..376d1bc134d
--- /dev/null
+++ b/pkgs/tools/graphics/gromit-mpx/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig
+, gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp
+, libxkbcommon, epoxy, at_spi2_core, dbus, libdbusmenu-glib
+}:
+
+stdenv.mkDerivation rec {
+ name = "gromit-mpx-${version}";
+ version = "1.2";
+
+ src = fetchFromGitHub {
+ owner = "bk138";
+ repo = "gromit-mpx";
+ rev = "${version}";
+ sha256 = "1dkmp5rhzp56sz9cfxill2pkdz2anwb8kkxkypvk2xhqi64cvkrs";
+ };
+
+ buildInputs = [
+ autoconf automake autoreconfHook pkgconfig
+ gtk glib pcre libappindicator libpthreadstubs
+ libXdmcp libxkbcommon epoxy at_spi2_core
+ dbus libdbusmenu-glib
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Desktop annotation tool";
+
+ longDescription = ''
+ Gromit-MPX (GRaphics Over MIscellaneous Things) is a small tool
+ to make annotations on the screen.
+ '';
+
+ homepage = https://github.com/bk138/gromit-mpx;
+ maintainers = with maintainers; [ pjones ];
+ platforms = platforms.linux;
+ license = licenses.gpl2;
+ };
+}
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 3c724ccc2b8..d0381e91251 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
substituteInPlace "config.mk" \
--replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff.out}/lib/libtiff.so" \
--replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff.dev}/include"
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk
+ echo "NETPBMLIBTYPE = dylib" >> config.mk
+ echo "NETPBMLIBSUFFIX = dylib" >> config.mk
'';
preBuild = ''
@@ -56,6 +60,6 @@ stdenv.mkDerivation rec {
homepage = http://netpbm.sourceforge.net/;
description = "Toolkit for manipulation of graphic images";
license = "GPL,free";
- platforms = stdenv.lib.platforms.linux;
+ platforms = with stdenv.lib.platforms; linux ++ darwin;
};
}
diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix
new file mode 100644
index 00000000000..ccb13f2e42c
--- /dev/null
+++ b/pkgs/tools/misc/aptly/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, gnupg1compat, bzip2, xz, graphviz }:
+
+let
+
+ version = "0.9.7";
+ rev = "v${version}";
+
+ aptlySrc = fetchFromGitHub {
+ inherit rev;
+ owner = "smira";
+ repo = "aptly";
+ sha256 = "0j1bmqdah4i83r2cf8zcq87aif1qg90yasgf82yygk3hj0gw1h00";
+ };
+
+ aptlyCompletionSrc = fetchFromGitHub {
+ rev = version;
+ owner = "aptly-dev";
+ repo = "aptly-bash-completion";
+ sha256 = "1yz3pr2jfczqv81as2q3cizwywj5ksw76vi15xlbx5njkjp4rbm4";
+ };
+
+in
+
+buildGoPackage {
+ name = "aptly-${version}";
+
+ src = aptlySrc;
+
+ goPackagePath = "github.com/smira/aptly";
+ goDeps = ./deps.nix;
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ postInstall = ''
+ rm $bin/bin/man
+ mkdir -p $bin/share/bash-completion/completions
+ ln -s ${aptlyCompletionSrc}/aptly $bin/share/bash-completion/completions
+ 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 00000000000..f0163f34ae8
--- /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 0bdcfa76fec..577c0a33b3e 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 ea486dd5154..817510bfb76 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/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index 1fab8a493bb..da9a599714c 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -1,48 +1,41 @@
{ fetchgit
, stdenv
-, enableXRandr ? true, xrandr ? null
-, enableDisper ? true, disper ? null
-, python
-, xdpyinfo }:
-
-assert enableXRandr -> xrandr != null;
-assert enableDisper -> disper != null;
+, python3Packages
+, fetchFromGitHub }:
let
- # Revision and date taken from the legacy tree, which still
- # supports disper:
- # https://github.com/phillipberndt/autorandr/tree/legacy
- rev = "59f6aec0bb72e26751ce285d079e085b7178e45d";
- date = "20150127";
+ python = python3Packages.python;
+ wrapPython = python3Packages.wrapPython;
+ date = "2016-11-23";
in
stdenv.mkDerivation {
- name = "autorandr-${date}";
+ name = "autorandr-unstable-${date}";
- src = fetchgit {
- inherit rev;
- url = "https://github.com/phillipberndt/autorandr.git";
- sha256 = "0mnggsp42477kbzwwn65gi8y0rydk10my9iahikvs6n43lphfa1f";
- };
+ buildInputs = [ python wrapPython ];
- patchPhase = ''
- substituteInPlace "autorandr" \
- --replace "/usr/bin/xrandr" "${if enableXRandr then xrandr else "/nowhere"}/bin/xrandr" \
- --replace "/usr/bin/disper" "${if enableDisper then disper else "/nowhere"}/bin/disper" \
- --replace "/usr/bin/xdpyinfo" "${xdpyinfo}/bin/xdpyinfo" \
- --replace "which xxd" "false" \
- --replace "python" "${python}/bin/python"
- '';
+ phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
- mkdir -p "$out/etc/bash_completion.d"
- cp -v bash_completion/autorandr "$out/etc/bash_completion.d"
- mkdir -p "$out/bin"
- cp -v autorandr auto-disper $out/bin
+ # install bash completions
+ mkdir -p $out/bin $out/libexec $out/etc/bash_completion.d
+ cp -v contrib/bash_completion/autorandr $out/etc/bash_completion.d
+
+ # install autorandr bin
+ cp autorandr.py $out/bin/autorandr
+ wrapPythonProgramsIn $out/bin/autorandr $out
'';
+ src = fetchFromGitHub {
+ owner = "phillipberndt";
+ repo = "autorandr";
+ rev = "53d29f99275aebf14240ea95f2d7022b305738d5";
+ sha256 = "0pza4wfkzv7mmg2m4pf3n8wk0p7cy6bfqknn8ywz51r8ja16cqfj";
+ };
+
meta = {
- description = "Automatic display configuration selector based on connected devices";
- homepage = https://github.com/wertarbyte/autorandr;
+ homepage = "http://github.com/phillipberndt/autorandr/";
+ description = "Auto-detect the connect display hardware and load the appropiate X11 setup using xrandr";
+ license = stdenv.lib.licenses.gpl3Plus;
maintainers = [ stdenv.lib.maintainers.coroa ];
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix
new file mode 100644
index 00000000000..fcdd9a81d72
--- /dev/null
+++ b/pkgs/tools/misc/azure-vhd-utils/default.nix
@@ -0,0 +1,27 @@
+# This file was generated by go2nix.
+{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+ name = "azure-vhd-utils-${version}";
+ version = "20160614-${stdenv.lib.strings.substring 0 7 rev}";
+ rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8";
+
+ goPackagePath = "github.com/Microsoft/azure-vhd-utils";
+
+ src = fetchgit {
+ inherit rev;
+ url = "https://github.com/Microsoft/azure-vhd-utils";
+ sha256 = "0b9kbavlb92rhnb1swwq8bdn4l9a994rmf1ywyfq4yc0kd3gnhgh";
+ };
+
+ goDeps = ./deps.nix;
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/Microsoft/azure-vhd-utils;
+ description = "Read, inspect and upload VHD files for Azure";
+ longDescription = "Go package to read Virtual Hard Disk (VHD) file, a CLI interface to upload local VHD to Azure storage and to inspect a local VHD";
+ license = licenses.mit;
+ platforms = platforms.unix;
+ };
+}
+
diff --git a/pkgs/tools/misc/azure-vhd-utils/deps.nix b/pkgs/tools/misc/azure-vhd-utils/deps.nix
new file mode 100644
index 00000000000..d07af99d5e5
--- /dev/null
+++ b/pkgs/tools/misc/azure-vhd-utils/deps.nix
@@ -0,0 +1,29 @@
+[
+ {
+ goPackagePath = "github.com/Azure/azure-sdk-for-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Azure/azure-sdk-for-go";
+ rev = "0884ebb4c8e7c980527348a4d134a65286042afc";
+ sha256 = "0ixsq409akq1ff12352kp5gkbh370rpbw0m0pbwjr42cqvnzs9k0";
+ };
+ }
+ {
+ goPackagePath = "github.com/Microsoft/azure-vhd-utils-for-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Microsoft/azure-vhd-utils-for-go";
+ rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8";
+ sha256 = "0b9kbavlb92rhnb1swwq8bdn4l9a994rmf1ywyfq4yc0kd3gnhgh";
+ };
+ }
+ {
+ goPackagePath = "github.com/codegangsta/cli";
+ fetch = {
+ type = "git";
+ url = "https://github.com/codegangsta/cli";
+ rev = "f614c177b70c0f0e92c368d623c8770bf337c5d6";
+ sha256 = "1l70f07v0dsp2k2pm0lmr42fp4y72j1g0czf4fkxwhvgbly3al98";
+ };
+ }
+]
diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix
index 068d3e3866e..74894da5418 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/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix
index 1bbabcf5523..30412016e50 100644
--- a/pkgs/tools/misc/bmon/default.nix
+++ b/pkgs/tools/misc/bmon/default.nix
@@ -3,16 +3,18 @@
stdenv.mkDerivation rec {
name = "bmon-${version}";
- version = "3.8";
+ version = "3.9";
src = fetchFromGitHub {
owner = "tgraf";
repo = "bmon";
rev = "v${version}";
- sha256 = "19jv14r9j9n54bqhidw3z11z3wys1v2cagqpsxn0kjga1gkg87xs";
+ sha256 = "1a4sj8pf02392zghr9wa1dc8x38fj093d4hg1fcakzrdjvrg1p2h";
};
- buildInputs = [ autoconf automake pkgconfig ncurses confuse libnl ];
+ nativeBuildInputs = [ autoconf automake pkgconfig ];
+
+ buildInputs = [ ncurses confuse libnl ];
preConfigure = "sh ./autogen.sh";
diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
deleted file mode 100644
index 9356eb36549..00000000000
--- a/pkgs/tools/misc/calamares/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv, fetchurl, cmake, polkit-qt, libyamlcpp, python, boost, parted
-, extra-cmake-modules, kconfig, ki18n, kcoreaddons, solid, utillinux, libatasmart
-, ckbcomp, glibc, tzdata, xkeyboard_config, qtbase, qtsvg, qttools }:
-
-stdenv.mkDerivation rec {
- name = "${pname}-${version}";
- pname = "calamares";
- version = "1.1.4.2";
-
- # release including submodule
- src = fetchurl {
- url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz";
- sha256 = "1mh0nmzc3i1aqcj79q2s3vpccn0mirlfbj26sfyb0v6gcrvf707d";
- };
-
- buildInputs = [
- cmake qtbase qtsvg qttools libyamlcpp python boost polkit-qt parted
- extra-cmake-modules kconfig ki18n kcoreaddons solid utillinux libatasmart
- ];
-
- cmakeFlags = [
- "-DPYTHON_LIBRARY=${python}/lib/libpython${python.majorVersion}m.so"
- "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m"
- "-DWITH_PARTITIONMANAGER=1"
- ];
-
- patchPhase = ''
- sed -e "s,/usr/bin/calamares,$out/bin/calamares," \
- -i calamares.desktop \
- -i com.github.calamares.calamares.policy
-
- sed -e 's,/usr/share/zoneinfo,${tzdata}/share/zoneinfo,' \
- -i src/modules/locale/timezonewidget/localeconst.h \
- -i src/modules/locale/SetTimezoneJob.cpp
-
- sed -e 's,/usr/share/i18n/locales,${glibc.out}/share/i18n/locales,' \
- -i src/modules/locale/timezonewidget/localeconst.h
-
- sed -e 's,/usr/share/X11/xkb/rules/base.lst,${xkeyboard_config}/share/X11/xkb/rules/base.lst,' \
- -i src/modules/keyboard/keyboardwidget/keyboardglobal.h
-
- sed -e 's,"ckbcomp","${ckbcomp}/bin/ckbcomp",' \
- -i src/modules/keyboard/keyboardwidget/keyboardpreview.cpp
- '';
-
- preInstall = ''
- substituteInPlace cmake_install.cmake --replace "${polkit-qt}" "$out"
- '';
-
- meta = with stdenv.lib; {
- description = "Distribution-independent installer framework";
- license = licenses.gpl3;
- maintainers = with stdenv.lib.maintainers; [ tstrobel ];
- platforms = platforms.linux;
- broken = true;
- };
-}
diff --git a/pkgs/tools/misc/clingo/default.nix b/pkgs/tools/misc/clingo/default.nix
deleted file mode 100644
index 6ab0a68920f..00000000000
--- 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/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix
new file mode 100644
index 00000000000..27df38c566b
--- /dev/null
+++ b/pkgs/tools/misc/clipster/default.nix
@@ -0,0 +1,50 @@
+{fetchFromGitHub , stdenv, makeWrapper, python, gtk3, libwnck3 }:
+
+stdenv.mkDerivation rec {
+ name = "clipster-unstable-${version}";
+ version = "2016-09-12";
+
+ src = fetchFromGitHub {
+ owner = "mrichar1";
+ repo = "clipster";
+ rev = "6526a849a0af4c392f4e8e5b18aacdda9c1a8e80";
+ sha256 = "0illdajp5z50h7lvglv0p72cpv4c592xmpamrg8kkjpg693bp873";
+ };
+
+ pythonEnv = python.withPackages(ps: with ps; [ dbus-python pygtk pygobject3 ]);
+
+ buildInputs = [ pythonEnv gtk3 libwnck3 makeWrapper ];
+
+ installPhase = ''
+ mkdir -p $out/bin/
+ cp clipster $out/bin/
+ wrapProgram "$out/bin/clipster" \
+ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "lightweight python clipboard manager";
+ longDescription = ''
+ Clipster was designed to try to add a good selection of useful features, while avoiding bad design decisions or becoming excessively large.
+ Its feature list includes:
+ - Event driven, rather than polling. More efficient, helps with power management.
+ - Control over when it write to disk, for similar reasons.
+ - Command-line options/config for everything.
+ - No global keybindings - that's the job of a Window Manager
+ - Sensible handling of unusual clipboard events. Some apps (Chrome, Emacs) trigger a clipboard 'update event' for every character you select, rather than just one event when you stop selecting.
+ - Preserves the last item in clipboard after an application closes. (Many apps clear the clipboard on exit).
+ - Minimal dependencies, no complicated build/install requirements.
+ - utf-8 support
+ - Proper handling of embedded newlines and control codes.
+ - Smart matching of urls, emails, regexes. (extract_*)
+ - Option to synchronise the SELECTION and CLIPBOARD clipboards. (sync_selections)
+ - Option to track one or both clipboards. (active_selections)
+ - Option to ignore clipboard updates form certain applications. (filter_classes)
+ - Ability to delete items in clipboard history.
+ '';
+ license = licenses.agpl3;
+ homepage = https://github.com/mrichar1/clipster;
+ platforms = platforms.linux;
+ maintainers = [maintainers.magnetophon];
+ };
+}
diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix
index 8bba00b564d..af518e7efa9 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/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix
index 2bfe0eb4266..d146cd93343 100644
--- a/pkgs/tools/misc/contacts/default.nix
+++ b/pkgs/tools/misc/contacts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, xcbuild, Foundation, AddressBook }:
stdenv.mkDerivation rec {
version = "1.1a-3";
@@ -9,15 +9,16 @@ stdenv.mkDerivation rec {
sha256 = "0wdqc1ndgrdhqapvvgx5xihc750szv08lp91x4l6n0gh59cpxpg3";
};
- preBuild = ''
- substituteInPlace Makefile --replace "xcodebuild" "/usr/bin/xcodebuild"
- '';
+ buildInputs = [ xcbuild Foundation AddressBook ];
installPhase = ''
mkdir -p $out/bin
- cp ./build/Deployment/contacts $out/bin
+ cp ./contacts-*/Build/Products/Default/contacts $out/bin
'';
+ ## FIXME: the framework setup hook isn't adding these correctly
+ NIX_LDFLAGS = " -F${Foundation}/Library/Frameworks/ -F${AddressBook}/Library/Frameworks/";
+
meta = with stdenv.lib; {
description = "Access contacts from the Mac address book from command-line";
homepage = http://www.gnufoo.org/contacts/contacts.html;
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index e1d9bb921fd..8f09a677b8e 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -39,7 +39,8 @@ let
configureFlags =
optional (singleBinary != false)
("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}")
- ++ optional stdenv.isSunOS "ac_cv_func_inotify_init=no";
+ ++ optional stdenv.isSunOS "ac_cv_func_inotify_init=no"
+ ++ optional withPrefix "--program-prefix=g";
buildInputs = [ gmp ]
++ optional aclSupport acl
@@ -89,14 +90,7 @@ let
makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0";
- # e.g. ls -> gls; grep -> ggrep
- postFixup = optionalString withPrefix
- ''
- (
- cd "$out/bin"
- find * -type f -executable -exec mv {} g{} \;
- )
- '';
+ postFixup = ""; # FIXME: remove on next mass rebuild
meta = {
homepage = http://www.gnu.org/software/coreutils/;
diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix
index d5b84e6dd46..98b91964e64 100644
--- a/pkgs/tools/misc/cpulimit/default.nix
+++ b/pkgs/tools/misc/cpulimit/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "cpulimit-${version}";
- version = "2.3";
+ version = "2.4";
src = fetchurl {
url = "mirror://sourceforge/limitcpu/${name}.tar.gz";
- sha256 = "192r2ghxyn8dm1la65f685nzsbj3dhdrxx3cv3i6cafygs3dyfa0";
+ sha256 = "1fr4rgi5vdbjxsn04j99g1qyr7n5169hrv6lp3lli030alvkfbm2";
};
buildFlags = with stdenv;
diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index ece9c5ed382..2fe9ec2fbe7 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -8,12 +8,12 @@
let
inherit (python3Packages) python setuptools;
in stdenv.mkDerivation rec {
- version = "2.16.6";
+ version = "2.16.8";
name = "debian-devscripts-${version}";
src = fetchurl {
url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz";
- sha256 = "0lkhilwb1gsnk8q14wkrl78s0w3l8aghsaz00vprmkmcc3j1x14h";
+ sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1";
};
buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile
diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index d60b47ca011..e70efe6c4f1 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -1,38 +1,16 @@
{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils, fakeroot }:
-let
# USAGE like this: debootstrap sid /tmp/target-chroot-directory
# There is also cdebootstrap now. Is that easier to maintain?
- makedev = stdenv.mkDerivation {
- name = "makedev-for-debootstrap";
- src = fetchurl {
- url = mirror://debian/pool/main/m/makedev/makedev_2.3.1.orig.tar.gz;
- sha256 = "1yhxlj2mhn1nqkx1f0sn0bl898nf28arxxa4lgp7hdrb5cpp36c5";
- };
- patches = [
- (fetchurl {
- url = "mirror://debian/pool/main/m/makedev/makedev_2.3.1-93.diff.gz";
- sha256 = "08328779mc0b20xkj76ilpf9c8bw6zkz5xiw5l2kwm690dxp9nvw";
- })
- ];
- # TODO install man
- installPhase = ''
- mkdir -p $out/sbin
- ls -l
- t=$out/sbin/MAKEDEV
- cp MAKEDEV $t
- chmod +x $t
- '';
- };
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
name = "debootstrap-${version}";
- version = "1.0.80";
+ version = "1.0.87";
src = fetchurl {
# git clone git://git.debian.org/d-i/debootstrap.git
# I'd like to use the source. However it's lacking the lanny script ? (still true?)
url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
- sha256 = "06gigscd2327wsvc7n7w2m8xmaixvp4kyqhayn00qrgd9i9w34x6";
+ sha256 = "1amk3wghx4f7zfp7d8r0hgqn5gvph50qa6nvh32q2j8aihdr7374";
};
buildInputs = [ dpkg gettext gawk perl ];
@@ -72,8 +50,6 @@ in stdenv.mkDerivation rec {
d=$out/share/debootstrap
mkdir -p $out/{share/debootstrap,bin}
- ${fakeroot}/bin/fakeroot -- make devices.tar.gz MAKEDEV=${makedev}/sbin/MAKEDEV
-
cp -r . $d
cat >> $out/bin/debootstrap << EOF
@@ -90,10 +66,6 @@ in stdenv.mkDerivation rec {
mv debootstrap.8 $out/man/man8
'';
- passthru = {
- inherit makedev;
- };
-
meta = {
description = "Tool to create a Debian system in a chroot";
homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 4d5eabfebc9..22c9ea4872b 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -1,24 +1,30 @@
{ lib, stdenv, fetchgit, fetchpatch, pythonPackages, docutils
, acl, binutils, bzip2, cbfstool, cdrkit, colord, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc
-, gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, rpm, sng, sqlite, squashfsTools, unzip, vim, xz
+, gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, sng, sqlite, squashfsTools, unzip, vim, xz
+, colordiff
, enableBloat ? false
}:
pythonPackages.buildPythonApplication rec {
name = "diffoscope-${version}";
- version = "52";
+ version = "63";
namePrefix = "";
src = fetchgit {
url = "git://anonscm.debian.org/reproducible/diffoscope.git";
rev = "refs/tags/${version}";
- sha256 = "18nqsd51rc0rldyxnjmzn86154asianhv415llhbxpr1a6zwqis6";
+ sha256 = "018c0xcgf6pgq493dib29pfyqpj7vb93a6qfmdh790fpxa2j1zyd";
};
patches =
[ # Ignore different link counts.
./ignore_links.patch
+
+ # Our Glibc doesn't have the C.UTF-8 locale yet
+ # (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8), so use
+ # en_US.UTF-8 instead.
+ ./locale.patch
];
postPatch = ''
@@ -29,9 +35,9 @@ pythonPackages.buildPythonApplication rec {
# Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf
# Also these libraries: python3-guestfs
# FIXME: move xxd into a separate package so we don't have to pull in all of vim.
- propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh ]) ++
+ propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh rpm ]) ++
map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext
- gzip libcaca poppler_utils rpm sng sqlite squashfsTools unzip vim xz
+ gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff
] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]);
doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
diff --git a/pkgs/tools/misc/diffoscope/ignore_links.patch b/pkgs/tools/misc/diffoscope/ignore_links.patch
index 4e5046390fa..ceea0dc94d4 100644
--- a/pkgs/tools/misc/diffoscope/ignore_links.patch
+++ b/pkgs/tools/misc/diffoscope/ignore_links.patch
@@ -1,21 +1,15 @@
-From: Eelco Dolstra
-
-Nix deduplicates by hard-linking identical files, so it's normal for
-the the number of links to a file to differ.
----
-diff --git a/diffoscope/comparators/directory.py b/diffoscope/comparators/directory.py
-index 7d1cd75..bd91eb0 100644
---- a/diffoscope/comparators/directory.py
-+++ b/diffoscope/comparators/directory.py
-@@ -47,6 +47,7 @@ class Stat(Command):
+diff -ru -x '*~' diffoscope-orig/diffoscope/comparators/directory.py diffoscope/diffoscope/comparators/directory.py
+--- diffoscope-orig/diffoscope/comparators/directory.py 1970-01-01 01:00:01.000000000 +0100
++++ diffoscope/diffoscope/comparators/directory.py 2016-12-08 17:37:55.000315157 +0100
+@@ -49,6 +49,7 @@
FILE_RE = re.compile(r'^\s*File:.*$')
- DEVICE_RE = re.compile(r'Device: [0-9a-f]+h/[0-9]+d')
- INODE_RE = re.compile(r'Inode: [0-9]+')
-+ LINKS_RE = re.compile(r'Links: [0-9]+')
+ DEVICE_RE = re.compile(r'Device: [0-9a-f]+h/[0-9]+d\s+')
+ INODE_RE = re.compile(r'Inode: [0-9]+\s+')
++ LINKS_RE = re.compile(r'Links: [0-9]+\s+')
ACCESS_TIME_RE = re.compile(r'^Access: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$')
CHANGE_TIME_RE = re.compile(r'^Change: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$')
-
-@@ -55,6 +56,7 @@ class Stat(Command):
+
+@@ -57,6 +58,7 @@
line = Stat.FILE_RE.sub('', line)
line = Stat.DEVICE_RE.sub('', line)
line = Stat.INODE_RE.sub('', line)
diff --git a/pkgs/tools/misc/diffoscope/locale.patch b/pkgs/tools/misc/diffoscope/locale.patch
new file mode 100644
index 00000000000..408d3ba2ce0
--- /dev/null
+++ b/pkgs/tools/misc/diffoscope/locale.patch
@@ -0,0 +1,14 @@
+diff -ru -x '*~' diffoscope-orig/diffoscope/__init__.py diffoscope/diffoscope/__init__.py
+--- diffoscope-orig/diffoscope/__init__.py 1970-01-01 01:00:01.000000000 +0100
++++ diffoscope/diffoscope/__init__.py 2016-12-08 17:48:51.732122110 +0100
+@@ -81,8 +81,8 @@
+ for var in ['LANG', 'LC_NUMERIC', 'LC_TIME', 'LC_COLLATE', 'LC_MONETARY',
+ 'LC_MESSAGES', 'LC_PAPER', 'LC_NAME', 'LC_ADDRESS',
+ 'LC_TELEPHONE', 'LC_MEASUREMENT', 'LC_IDENTIFICATION']:
+- os.environ[var] = 'C'
+- os.environ['LC_CTYPE'] = 'C.UTF-8'
++ os.environ[var] = 'en_US'
++ os.environ['LC_CTYPE'] = 'en_US.UTF-8'
+ os.environ['TZ'] = 'UTC'
+
+
diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index d8b5a1e9591..596df416743 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "direnv-${version}";
- version = "2.9.0";
+ version = "2.10.0";
src = fetchFromGitHub {
owner = "direnv";
repo = "direnv";
rev = "v${version}";
- sha256 = "1zi4i2ds8xkbhfcpi52hca4lcwan9gf93bdmd2vwdsry16kn3f6k";
+ sha256 = "04b098i8dlr6frks67ik0kbc281c6j8lkb6v0y33iwqv45n233q3";
};
buildInputs = [ go ];
diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix
index 0e3922d2928..d26eb8f45ae 100644
--- a/pkgs/tools/misc/exa/default.nix
+++ b/pkgs/tools/misc/exa/default.nix
@@ -36,5 +36,6 @@ buildRustPackage rec {
homepage = http://bsago.me/exa;
license = licenses.mit;
maintainer = [ maintainers.ehegnes ];
+ broken = true;
};
}
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 3cb5c568038..24c10c241f2 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "fzf-${version}";
- version = "0.15.1";
+ version = "0.15.9";
rev = "${version}";
goPackagePath = "github.com/junegunn/fzf";
@@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev;
owner = "junegunn";
repo = "fzf";
- sha256 = "0wj5nhrrgx4nkiqwjp5wpfzdyikrjv4qr5x39s5094yc4p2k30b1";
+ sha256 = "0r099mk9r6f52qqhx0ifb1xa8f2isqvyza80z9mcpi5zkd96174l";
};
buildInputs = [ ncurses ];
diff --git a/pkgs/tools/misc/fzf/deps.nix b/pkgs/tools/misc/fzf/deps.nix
index 98530853832..651c76e361f 100644
--- a/pkgs/tools/misc/fzf/deps.nix
+++ b/pkgs/tools/misc/fzf/deps.nix
@@ -1,4 +1,14 @@
+# This file was generated by go2nix.
[
+ {
+ goPackagePath = "github.com/junegunn/go-isatty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/junegunn/go-isatty";
+ rev = "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8";
+ sha256 = "17lf13ndnai9a6dlmykqkdyzf1z04q7kffs0l7kvd78wpv3l6rm5";
+ };
+ }
{
goPackagePath = "github.com/junegunn/go-runewidth";
fetch = {
diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix
index 4b352f51208..424a84637a5 100644
--- a/pkgs/tools/misc/goaccess/default.nix
+++ b/pkgs/tools/misc/goaccess/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, geoipWithDatabase, ncurses, glib }:
stdenv.mkDerivation rec {
- version = "1.0";
+ version = "1.1.1";
name = "goaccess-${version}";
src = fetchurl {
url = "http://tar.goaccess.io/goaccess-${version}.tar.gz";
- sha256 = "1zma9p0gwxwl9kgq47i487fy1q8567fqnpik0zacjhgmpnzry3h0";
+ sha256 = "1lxnhvh4xhkgzdv0l2fiza2099phn9zs04p9cqfhhl5k6xq18wsc";
};
configureFlags = [
diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix
new file mode 100644
index 00000000000..00879d9505b
--- /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 00000000000..7b5510e2344
--- /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 00000000000..b81eab4cd67
--- /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/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix
index 7e9b82a6a3f..fabefb81031 100644
--- a/pkgs/tools/misc/grub4dos/default.nix
+++ b/pkgs/tools/misc/grub4dos/default.nix
@@ -6,13 +6,13 @@ let arch =
else abort "Unknown architecture";
in stdenv.mkDerivation rec {
name = "grub4dos-${version}";
- version = "0.4.6a-2016-08-06";
+ version = "0.4.6a-2016-11-09";
src = fetchFromGitHub {
owner = "chenall";
repo = "grub4dos";
- rev = "99d6ddbe7611f942d2708d77a620d6aa94a284d1";
- sha256 = "0gnllk0qkx6d0azf7v9cr0b23gp577avksz0f4dl3v3ldgi0dksq";
+ rev = "4cdcd3c1aa4907e7775aa8816ca9cf0175b78bcd";
+ sha256 = "17y5wsiqcb2qk1vr8n1wlhcsj668735hj8l759n8aiydw408bl55";
};
nativeBuildInputs = [ nasm ];
diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix
index 3705dd832e9..726c7a115ee 100644
--- a/pkgs/tools/misc/gti/default.nix
+++ b/pkgs/tools/misc/gti/default.nix
@@ -2,19 +2,15 @@
stdenv.mkDerivation rec {
name = "gti-${version}";
- version = "2015-05-21";
+ version = "2016-12-07";
src = fetchFromGitHub {
owner = "rwos";
repo = "gti";
- rev = "edaac795b0b0ff01f2347789f96c740c764bf376";
- sha256 = "1wki7d61kcmv9s3xayky9cz84qa773x3y1z88y768hq8ifwadcbn";
+ rev = "d78001bd5b4b6f6ad853b4ec810e9a1ecde1ee32";
+ sha256 = "0449h9m16x542fy6gmhqqkvkg7z7brxw5vmb85nkk1gdlr9pl1mr";
};
- prePatch = ''
- substituteInPlace Makefile --replace gcc cc
- '';
-
installPhase = ''
mkdir -p $out/bin $out/share/man/man6
cp gti $out/bin
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index 0fd33fc3e39..7215cccbfed 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -15,11 +15,11 @@ assert !cpp || mpi == null;
with { inherit (stdenv.lib) optional optionals; };
stdenv.mkDerivation rec {
- version = "1.8.16";
+ version = "1.8.18";
name = "hdf5-${version}";
src = fetchurl {
- url = "http://www.hdfgroup.org/ftp/HDF5/releases/${name}/src/${name}.tar.bz2";
- sha256 = "1ilq8pn9lxbf2wj2rdzwqabxismznjj1d23iw6g78w0bl5dsxahk";
+ url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/${name}/src/${name}.tar.bz2";
+ sha256 = "13542vrnl1p35n8vbq0wzk40vddmm33q5nh04j98c7r1yjnxxih1";
};
passthru = {
diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix
index ddc030bcf8d..734d8fb78e2 100644
--- a/pkgs/tools/misc/kargo/default.nix
+++ b/pkgs/tools/misc/kargo/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, python2Packages }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
version = "0.4.6";
name = "kargo-${version}";
@@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
doCheck = false;
- propagatedBuildInputs = with pythonPackages; [
+ propagatedBuildInputs = with python2Packages; [
ansible2
boto
cffi
diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/pkgs/tools/misc/kdecoration-viewer/default.nix
new file mode 100644
index 00000000000..c32a814f232
--- /dev/null
+++ b/pkgs/tools/misc/kdecoration-viewer/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub
+, cmake, ecm, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }:
+
+stdenv.mkDerivation rec {
+ name = "kdecoration-viewer-2015-08-20";
+
+ src = fetchFromGitHub {
+ owner = "KDE";
+ repo = "kdecoration-viewer";
+ rev = "d7174acee01475fbdb71cfd48ca49d487a141701";
+ sha256 = "1cc4xxv72a82p1w9r76090xba7g069r41bi4zx32k4gz3vyl1am6";
+ };
+
+ buildInputs = [ cmake ecm qtquickcontrols kconfigwidgets kdeclarative kdecoration ];
+
+ meta = with stdenv.lib; {
+ description = "Allows to preview a KDecoration plugin";
+ longDescription = ''
+ kdecoration-viewer allows to preview a KDecoration plugin. Put your plugins under
+ $QT_PLUGIN_PATH/org.kde.kdecoration2 to preview.
+ '';
+ homepage = https://blog.martin-graesslin.com/blog/2014/07/kdecoration2-the-road-ahead/;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.gnidorah ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix
index 910b4963f01..9693556862b 100644
--- a/pkgs/tools/misc/less/default.nix
+++ b/pkgs/tools/misc/less/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses, lessSecure ? false }:
stdenv.mkDerivation rec {
- name = "less-483";
+ name = "less-481";
src = fetchurl {
url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz";
- sha256 = "07z43kwbmba2wh3q1gps09l72p8izfagygmqq1izi50s2h51mfvy";
+ sha256 = "19fxj0h10y5bhr3a1xa7kqvnwl44db3sdypz8jxl1q79yln8z8rz";
};
configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc.
diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix
index 8f258a38f7f..e26533d4642 100644
--- a/pkgs/tools/misc/libcpuid/default.nix
+++ b/pkgs/tools/misc/libcpuid/default.nix
@@ -3,7 +3,7 @@
, libtool
, automake
, autoconf
-, python
+, python2 # Needed for tests
}:
stdenv.mkDerivation rec {
name = "libcpuid-${version}";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
postInstall = ''
pushd Install
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/lib ${python.interpreter} ../tests/run_tests.py ./bin/cpuid_tool ../tests/
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/lib ${python2.interpreter} ../tests/run_tests.py ./bin/cpuid_tool ../tests/
popd
function fixRunPath {
diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix
index a4a081aeade..a3b40edb46c 100644
--- a/pkgs/tools/misc/lnav/default.nix
+++ b/pkgs/tools/misc/lnav/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pcre, sqlite, ncurses,
+{ stdenv, fetchFromGitHub, pcre-cpp, sqlite, ncurses,
readline, zlib, bzip2, autoconf, automake }:
stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
zlib
bzip2
ncurses
- pcre
+ pcre-cpp
readline
sqlite
];
diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/tools/misc/ltunify/default.nix
index cf28fa05132..8066cdd9bc5 100644
--- a/pkgs/tools/misc/ltunify/default.nix
+++ b/pkgs/tools/misc/ltunify/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Tool for working with Logitech Unifying receivers and devices";
- homepage = https://lekensteyn.nl/logitech-unifying.html;
+ homepage = "https://lekensteyn.nl/logitech-unifying.html";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.abbradar ];
diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index e840aa15ec2..0c9ac20fcc3 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/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix
index 66e91ed1424..aff329e04b6 100644
--- a/pkgs/tools/misc/mimeo/default.nix
+++ b/pkgs/tools/misc/mimeo/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
name = "mimeo-${version}";
- version = "2016.2";
+ version = "2016.11";
src = fetchurl {
url = "http://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz";
- sha256 = "1y3a60983ind2cakjwxq3cgc76xhcdqz5lcpnyii34s6wviybkn1";
+ sha256 = "1yygdxqnkh506fknxsp9xa3rnxn0901dzqc7c7qjjj80lk6xnfxb";
};
buildInputs = [ file desktop_file_utils ];
diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix
index 6ea9d71bddc..c309c822974 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 023498de371..4bc346d41f8 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-20161122";
src = fetchurl {
url = "mirror://gnu/parallel/${name}.tar.bz2";
- sha256 = "e391ebd081e8ba13e870be68106d1beb5def2b001fa5881f46df0ab95304f521";
+ sha256 = "0z5c4r35d926ac04ilaivx67cmflr1rsvmjb2ci7hmab948m0ng2";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix
index cfce018a236..68240210e74 100644
--- a/pkgs/tools/misc/parted/default.nix
+++ b/pkgs/tools/misc/parted/default.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper"
++ stdenv.lib.optional enableStatic "--enable-static";
+ # Tests were previously failing due to Hydra running builds as uid 0.
+ # That should hopefully be fixed now.
doCheck = true;
preCheck =
diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix
index a55485953a8..4ee33df716b 100644
--- a/pkgs/tools/misc/profile-cleaner/default.nix
+++ b/pkgs/tools/misc/profile-cleaner/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite }:
+{ stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc }:
stdenv.mkDerivation rec {
- version = "2.35";
+ version = "2.36";
name = "profile-cleaner-${version}";
src = fetchFromGitHub {
owner = "graysky2";
repo = "profile-cleaner";
rev = "v${version}";
- sha256 = "0gashrzhpgcy98zsyc6b3awfp15j1x0nq82h60kvfjbs6xxzvszh";
+ sha256 = "0vm4ca99dyr6i0sfjsr0w06i0rbmqf40kp37h04bk4c8yassq1zq";
};
buildInputs = [ makeWrapper ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
installPhase = ''
PREFIX=\"\" DESTDIR=$out make install
wrapProgram $out/bin/profile-cleaner \
- --prefix PATH : "${stdenv.lib.makeBinPath [ parallel sqlite ]}"
+ --prefix PATH : "${stdenv.lib.makeBinPath [ parallel sqlite bc ]}"
'';
meta = {
diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix
index ab72dc69fa4..0b48a5a66c6 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 811e57c0a08..ac4f4524b99 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 7eba2d2f939..c5f017564af 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/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
index 1e39ddf481b..9a2f9b65e8c 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -1,45 +1,54 @@
-{ stdenv, lib, fetchFromGitHub, perl, makeWrapper, systemd, iw, rfkill, hdparm, ethtool, inetutils
-, kmod, pciutils, smartmontools, x86_energy_perf_policy, gawk, gnugrep, coreutils
+{ stdenv, lib, fetchFromGitHub, perl, makeWrapper, file, systemd, iw, rfkill
+, hdparm, ethtool, inetutils , kmod, pciutils, smartmontools
+, x86_energy_perf_policy, gawk, gnugrep, coreutils, utillinux
, enableRDW ? false, networkmanager
}:
let
paths = lib.makeBinPath
([ iw rfkill hdparm ethtool inetutils systemd kmod pciutils smartmontools
- x86_energy_perf_policy gawk gnugrep coreutils
+ x86_energy_perf_policy gawk gnugrep coreutils utillinux
]
++ lib.optional enableRDW networkmanager
);
in stdenv.mkDerivation rec {
name = "tlp-${version}";
- version = "0.8";
+ version = "0.9";
src = fetchFromGitHub {
owner = "linrunner";
repo = "TLP";
rev = "${version}";
- sha256 = "19fvk0xz6i2ryf41akk4jg1c4sb4rcyxdl9fr0w4lja7g76d5zww";
+ sha256 = "1gwi0h9klhdvqfqvmn297l1vyhj4g9dqvf50lcbswry02mvnd2vn";
};
makeFlags = [ "DESTDIR=$(out)"
- "TLP_LIBDIR=/lib"
- "TLP_SBIN=/bin"
- "TLP_BIN=/bin"
+ "TLP_SBIN=$(out)/bin"
+ "TLP_BIN=$(out)/bin"
+ "TLP_TLIB=$(out)/share/tlp-pm"
+ "TLP_PLIB=$(out)/lib/pm-utils"
+ "TLP_ULIB=$(out)/lib/udev"
+ "TLP_NMDSP=$(out)/etc/NetworkManager/dispatcher.d"
+ "TLP_SHCPL=$(out)/share/bash-completion/completions"
+ "TLP_MAN=$(out)/share/man"
+
"TLP_NO_INIT=1"
"TLP_NO_PMUTILS=1"
];
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper file ];
buildInputs = [ perl ];
- installTargets = [ "install-tlp" ] ++ stdenv.lib.optional enableRDW "install-rdw";
+ installTargets = [ "install-tlp" "install-man" ] ++ stdenv.lib.optional enableRDW "install-rdw";
postInstall = ''
- for i in $out/bin/* $out/lib/udev/tlp-*; do
- sed -i "s,/usr/lib/,$out/lib/,g" "$i"
- if [[ "$(basename "$i")" = tlp-*list ]]; then
+ cp -r $out/$out/* $out
+ rm -rf $out/$(echo "$NIX_STORE" | cut -d "/" -f2)
+
+ for i in $out/bin/* $out/lib/udev/tlp-* ${lib.optionalString enableRDW "$out/etc/NetworkManager/dispatcher.d/*"}; do
+ if file "$i" | grep -q Perl; then
# Perl script; use wrapProgram
wrapProgram "$i" \
--prefix PATH : "${paths}"
@@ -48,21 +57,6 @@ in stdenv.mkDerivation rec {
sed -i '2iexport PATH=${paths}:$PATH' "$i"
fi
done
-
- for i in $out/lib/udev/rules.d/*; do
- sed -i "s,RUN+=\",\\0$out,g; s,/usr/sbin,/bin,g" "$i"
- done
-
- for i in man/*; do
- install -D $i $out/share/man/man''${i##*.}/$(basename $i)
- done
- '' + lib.optionalString enableRDW ''
- for i in $out/etc/NetworkManager/dispatcher.d/*; do
- sed -i \
- -e "s,/usr/lib/,$out/lib/,g" \
- -e '2iexport PATH=${paths}:$PATH' \
- "$i"
- done
'';
meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index 9052c5ce6d5..95d1a7275d9 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -3,10 +3,10 @@
let
bashCompletion = fetchFromGitHub {
- owner = "przepompownia";
+ owner = "imomaliev";
repo = "tmux-bash-completion";
- rev = "678a27616b70c649c6701cae9cd8c92b58cc051b";
- sha256 = "1d2myrh4xiay9brsxafb02pi922760sdkyyy5xjm4sfh4iimc4zf";
+ rev = "fcda450d452f07d36d2f9f27e7e863ba5241200d";
+ sha256 = "092jpkhggjqspmknw7h3icm0154rg21mkhbc71j5bxfmfjdxmya8";
};
in
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index d1ba3ced99b..808ba21ab66 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.04";
+ version = "2016.12.15";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
- sha256 = "9622b29b81587278a00e39e4206e7c52555d240cbbb44242f237660169e8d531";
+ sha256 = "85d937a6edb8c14f8eac1b17d2e5d45574c7ec3f2cb792781ac1d8fb6a6ca39e";
};
buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;
diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix
index b0939a4698b..108071edb64 100644
--- a/pkgs/tools/misc/zsh-navigation-tools/default.nix
+++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "zsh-navigation-tools-${version}";
- version = "2.1.16";
+ version = "2.2.7";
src = fetchFromGitHub {
owner = "psprint";
repo = "zsh-navigation-tools";
rev = "v${version}";
- sha256 = "1ccb4f5md8wn60mymk91y2p4fq9f666bc5zc9xwx1q2wra8j4yf5";
+ sha256 = "0c4kb19aprb868xnlyq8h1nd2d32r0zkrqblsrzvg7m9gx8vqps8";
};
dontBuild = true;
diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index eec84e10386..ab82851f178 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "aria2-${version}";
- version = "1.28.0";
+ version = "1.29.0";
src = fetchFromGitHub {
owner = "aria2";
repo = "aria2";
rev = "release-${version}";
- sha256 = "196prs98sxwwxiszw2m1kbcra7n7fxf758y5dcj2jkddrr37hdkw";
+ sha256 = "1ivxz2ld4cl9z29kdicban9dir6s0si2jqn4g11gz587x7pagbim";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://aria2.github.io;
description = "A lightweight, multi-protocol, multi-source, command-line download utility";
- maintainers = with maintainers; [ koral jgeerds ];
license = licenses.gpl2Plus;
platforms = platforms.unix;
+ maintainers = with maintainers; [ koral jgeerds ];
};
}
diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix
index 4f05220232f..af5d8309507 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/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index d405d08e0ab..1e2b48207f5 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -5,11 +5,11 @@ assert stdenv.isLinux -> libcap != null;
stdenv.mkDerivation rec {
name = "chrony-${version}";
- version = "2.4";
+ version = "2.4.1";
src = fetchurl {
url = "http://download.tuxfamily.org/chrony/${name}.tar.gz";
- sha256 = "07rrys5axrz4grfy7fj3ds0r9ny1qcwiswsb2318jciklb6yf14d";
+ sha256 = "1q5nxl19fdppwpxancff5dc9crgma8f24zww7ag4bd15yq79xm8g";
};
buildInputs = [ readline texinfo nss nspr ] ++ stdenv.lib.optional stdenv.isLinux libcap;
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 56c0d26a999..5dd523d6fa6 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -42,6 +42,8 @@ stdenv.mkDerivation rec {
optional sslSupport openssl ++
optional scpSupport libssh2;
+ patches = stdenv.lib.optional http2Support ./fix-http2-window-size.patch;
+
# for the second line see http://curl.haxx.se/mail/tracker-2014-03/0087.html
preConfigure = ''
sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
diff --git a/pkgs/tools/networking/curl/disable-ca-install.patch b/pkgs/tools/networking/curl/disable-ca-install.patch
deleted file mode 100644
index aedf8ef5c3e..00000000000
--- a/pkgs/tools/networking/curl/disable-ca-install.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
-@@ -106,10 +106,7 @@ else
- endif
-
- install-data-hook:
-- @if test -n "@CURL_CA_BUNDLE@"; then \
-- $(mkinstalldirs) `dirname $(DESTDIR)@CURL_CA_BUNDLE@`; \
-- @INSTALL_DATA@ $(srcdir)/ca-bundle.crt $(DESTDIR)@CURL_CA_BUNDLE@; \
-- fi
-+ echo "install-data-hook disabled"
-
- # this hook is mainly for non-unix systems to build even if configure
- # isn't run
diff --git a/pkgs/tools/networking/curl/fix-http2-window-size.patch b/pkgs/tools/networking/curl/fix-http2-window-size.patch
new file mode 100644
index 00000000000..6fac3e1b42a
--- /dev/null
+++ b/pkgs/tools/networking/curl/fix-http2-window-size.patch
@@ -0,0 +1,88 @@
+From a4d888857ede39a8e2aa5f961048c6362d3a5377 Mon Sep 17 00:00:00 2001
+From: Jay Satiro
+Date: Wed, 16 Nov 2016 02:55:30 -0500
+Subject: [PATCH] http2: Use huge HTTP/2 windows
+
+- Improve performance by using a huge HTTP/2 window size.
+
+Bug: https://github.com/curl/curl/issues/1102
+Reported-by: afrind@users.noreply.github.com
+Assisted-by: Tatsuhiro Tsujikawa
+---
+ docs/TODO | 8 --------
+ lib/http2.c | 15 +++++++++++++--
+ 2 files changed, 13 insertions(+), 10 deletions(-)
+
+diff --git a/docs/TODO b/docs/TODO
+index c3bc4eb..99c610f 100644
+--- a/docs/TODO
++++ b/docs/TODO
+@@ -63,7 +63,6 @@
+ 5.1 Better persistency for HTTP 1.0
+ 5.2 support FF3 sqlite cookie files
+ 5.3 Rearrange request header order
+- 5.4 Use huge HTTP/2 windows
+ 5.5 auth= in URLs
+ 5.6 Refuse "downgrade" redirects
+ 5.7 Brotli compression
+@@ -528,13 +527,6 @@ This is not detailed in any FTP specification.
+ headers use a default value so only headers that need to be moved have to be
+ specified.
+
+-5.4 Use huge HTTP/2 windows
+-
+- We're currently using nghttp2's default window size which is terribly small
+- (64K). This becomes a bottle neck over high bandwidth networks. We should
+- instead make the window size to be very big (512MB?) as we really don't do
+- much flow control anyway.
+-
+ 5.5 auth= in URLs
+
+ Add the ability to specify the preferred authentication mechanism to use by
+diff --git a/lib/http2.c b/lib/http2.c
+index 6720984..202ab1b 100644
+--- a/lib/http2.c
++++ b/lib/http2.c
+@@ -59,6 +59,8 @@
+ #define nghttp2_session_callbacks_set_error_callback(x,y)
+ #endif
+
++#define HTTP2_HUGE_WINDOW_SIZE (1 << 30)
++
+ /*
+ * Curl_http2_init_state() is called when the easy handle is created and
+ * allows for HTTP/2 specific init of state.
+@@ -965,7 +967,7 @@ static ssize_t data_source_read_callback(nghttp2_session *session,
+ */
+ static nghttp2_settings_entry settings[] = {
+ { NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100 },
+- { NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE, NGHTTP2_INITIAL_WINDOW_SIZE },
++ { NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE, HTTP2_HUGE_WINDOW_SIZE },
+ };
+
+ #define H2_BUFSIZE 32768
+@@ -2031,7 +2033,8 @@ CURLcode Curl_http2_switched(struct connectdata *conn,
+ else {
+ /* stream ID is unknown at this point */
+ stream->stream_id = -1;
+- rv = nghttp2_submit_settings(httpc->h2, NGHTTP2_FLAG_NONE, NULL, 0);
++ rv = nghttp2_submit_settings(httpc->h2, NGHTTP2_FLAG_NONE, settings,
++ sizeof(settings) / sizeof(settings[0]));
+ if(rv != 0) {
+ failf(data, "nghttp2_submit_settings() failed: %s(%d)",
+ nghttp2_strerror(rv), rv);
+@@ -2039,6 +2042,14 @@ CURLcode Curl_http2_switched(struct connectdata *conn,
+ }
+ }
+
++ rv = nghttp2_session_set_local_window_size(httpc->h2, NGHTTP2_FLAG_NONE, 0,
++ HTTP2_HUGE_WINDOW_SIZE);
++ if(rv != 0) {
++ failf(data, "nghttp2_session_set_local_window_size() failed: %s(%d)",
++ nghttp2_strerror(rv), rv);
++ return CURLE_HTTP2;
++ }
++
+ /* we are going to copy mem to httpc->inbuf. This is required since
+ mem is part of buffer pointed by stream->mem, and callbacks
+ called by nghttp2_session_mem_recv() will write stream specific
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index 766e7505f27..beffb0c05e8 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, udev }:
stdenv.mkDerivation rec {
- name = "dhcpcd-6.11.3";
+ name = "dhcpcd-6.11.5";
src = fetchurl {
url = "mirror://roy/dhcpcd/${name}.tar.xz";
- sha256 = "01lv4a7ls55iv9f9gkh6vswqmbpqkdzj4d8ayq4dcir9vz215gas";
+ sha256 = "17nnhxmbdcc7k2mh6sgvxisqcqbic5540xbig363ds97gvf795kg";
};
buildInputs = [ pkgconfig udev ];
diff --git a/pkgs/tools/networking/fakeroute/default.nix b/pkgs/tools/networking/fakeroute/default.nix
new file mode 100644
index 00000000000..1cb614e88c0
--- /dev/null
+++ b/pkgs/tools/networking/fakeroute/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "fakeroute-${version}";
+ version = "0.3";
+
+ src = fetchurl {
+ url = "https://moxie.org/software/fakeroute/${name}.tar.gz";
+ sha256 = "1sp342rxgm1gz4mvi5vvz1knz7kn9px9s39ii3jdjp4ks7lr5c8f";
+ };
+
+ meta = with stdenv.lib; {
+ description = ''
+ Makes your machine appear to be anywhere on the internet
+ to any host running a (UDP) unix traceroute
+ '';
+ homepage = https://moxie.org/software/fakeroute/;
+ license = licenses.bsd3;
+ platform = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index 64bad55d88b..c3fe609f4cd 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, python2Packages }:
python2Packages.buildPythonApplication rec {
- version = "4.51.0";
+ version = "4.52.0";
name = "getmail-${version}";
namePrefix = "";
src = fetchurl {
url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz";
- sha256 = "1nzdjm62lrg7qbh8xz2irj9wxf2861s3ld6zd5fbcgpjy3v588mw";
+ sha256 = "0pzplrlxwbxydvfw4kkwn60l40hk1h5sxawaa6pi0k75c220k4ni";
};
doCheck = false;
diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix
index a5c7353905b..fe30fd94967 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/pkgs/tools/networking/httpie/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonApplication rec {
- name = "httpie-0.9.6";
+ name = "httpie-0.9.8";
namePrefix = "";
src = fetchurl {
url = "mirror://pypi/h/httpie/${name}.tar.gz";
- sha256 = "1cch5y0hr9qpfn9m4nw5796c2x7v3m1ni4psjm26ajsl8pw90jx6";
+ sha256 = "1qgn1mpkk8wxxhvgxw3fnscqg3klh42ijr11zrb0ylriaaqp0n2i";
};
propagatedBuildInputs = with pythonPackages; [ pygments requests2 ];
@@ -17,6 +17,6 @@ pythonPackages.buildPythonApplication rec {
description = "A command line HTTP client whose goal is to make CLI human-friendly";
homepage = http://httpie.org/;
license = stdenv.lib.licenses.bsd3;
- maintainers = with stdenv.lib.maintainers; [ antono relrod ];
+ maintainers = with stdenv.lib.maintainers; [ antono relrod schneefux ];
};
}
diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix
index 7b441c72cbf..74dd9131680 100644
--- a/pkgs/tools/networking/logmein-hamachi/default.nix
+++ b/pkgs/tools/networking/logmein-hamachi/default.nix
@@ -10,14 +10,14 @@ let
else if stdenv.system == "i686-linux" then "x86"
else abort "Unsupported architecture";
sha256 =
- if stdenv.system == "x86_64-linux" then "0l8y8z8fqvxrypx3dp83mm3qr9shgpcn5h7x2k2z13gp4aq0yw6g"
- else if stdenv.system == "i686-linux" then "00nl442k4pij9fm8inlk4qrcvbnz55fbwf3sm3dgbzvd5jcgsa0f"
+ if stdenv.system == "x86_64-linux" then "011xg1frhjavv6zj1y3da0yh7rl6v1ax6xy2g8fk3sry9bi2p4j3"
+ else if stdenv.system == "i686-linux" then "03ml9xv19km99f0z7fpr21b1zkxvw7q39kjzd8wpb2pds51wnc62"
else abort "Unsupported architecture";
libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
in stdenv.mkDerivation rec {
name = "logmein-hamachi-${version}";
- version = "2.1.0.165";
+ version = "2.1.0.174";
src = fetchurl {
url = "https://www.vpn.net/installers/${name}-${arch}.tgz";
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index fa1740e9d12..0cd3e15e762 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -3,12 +3,12 @@
, gtk3, webkitgtk24x, libsoup, icu }:
stdenv.mkDerivation rec {
- version = "0.9.16";
+ version = "0.9.18";
name = "mu-${version}";
src = fetchurl {
- url = "https://github.com/djcb/mu/archive/v${version}.tar.gz";
- sha256 = "0p7hqri1r1x6750x138cc29mh81kdav2dcim26y58s8an206h25g";
+ url = "https://github.com/djcb/mu/archive/${version}.tar.gz";
+ sha256 = "0gfwi4dwqhsz138plryd0j935vx2i44p63jpfx85ki3l4ysmmlwd";
};
buildInputs = [
diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 742e6a93b65..5ca3079a084 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
name = "netsniff-ng-${version}";
- version = "0.6.1";
+ version = "0.6.2";
# Upstream recommends and supports git
src = fetchFromGitHub rec {
repo = "netsniff-ng";
owner = repo;
rev = "v${version}";
- sha256 = "0nl0xq7dwhryrd8i5iav8fj4x9jrna0afhfim5nrx2kwp5yylnvi";
+ sha256 = "1lz4hwgwdq3znlqjmvl7cw3g3ilbayn608h0hwqdf7v2jq6n67kg";
};
buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index d96bc08495f..0bd79890dc0 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/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix
index 5e09bb7229f..591994ddccf 100644
--- a/pkgs/tools/networking/network-manager/l2tp.nix
+++ b/pkgs/tools/networking/network-manager/l2tp.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "L2TP plugin for NetworkManager";
inherit (networkmanager.meta) platforms;
- homepage = https://github.com/seriyps/NetworkManager-l2tp;
+ homepage = "https://github.com/seriyps/NetworkManager-l2tp";
license = licenses.gpl2;
maintainers = with maintainers; [ abbradar obadz ];
};
diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index 4c42771be17..64f4b9008b1 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -1,23 +1,30 @@
-{ stdenv, fetchurl, autoreconfHook, libcap ? null, openssl ? null }:
+{ stdenv, lib, fetchurl, openssl, perl, libcap ? null, libseccomp ? null }:
assert stdenv.isLinux -> libcap != null;
+assert stdenv.isLinux -> libseccomp != null;
+
+let
+ withSeccomp = stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64);
+in
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.optional stdenv.isLinux "--enable-linuxcaps"
+ ++ stdenv.lib.optional withSeccomp "--enable-libseccomp";
- nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ libcap openssl ];
+ buildInputs = [ libcap openssl perl ] ++ lib.optional withSeccomp libseccomp;
hardeningEnable = [ "pie" ];
diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix
index 4ba293dc12c..18995553d0a 100644
--- a/pkgs/tools/networking/nzbget/default.nix
+++ b/pkgs/tools/networking/nzbget/default.nix
@@ -3,12 +3,11 @@
stdenv.mkDerivation rec {
name = "nzbget-${version}";
- version = "17.0-r1686";
- filename = "nzbget-17.0-testing-r1686";
+ version = "17.1";
src = fetchurl {
- url = "http://github.com/nzbget/nzbget/releases/download/v${version}/${filename}-src.tar.gz";
- sha256 = "0hk0hiccdk3bivdnc2635kqqdwgwf73wvis1wl9k0snds25dwfiw";
+ url = "http://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz";
+ sha256 = "0fcw43bigjmgxcz1jvqpd01sz4vciqsm311cbfv9lvmvv40gag2b";
};
buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 93541bd0603..a11b34ef991 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 202cb4c6ba6..47d1dbbcbe6 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/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix
index f59e70ed318..186d5109b94 100644
--- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix
+++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix
@@ -1,16 +1,16 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper, openresolv, coreutils, which, systemd }:
+{ stdenv, lib, fetchFromGitHub, makeWrapper, openresolv, coreutils, systemd }:
let
- binPath = lib.makeBinPath [ coreutils openresolv which systemd ];
+ binPath = lib.makeBinPath [ coreutils openresolv systemd ];
in stdenv.mkDerivation rec {
- name = "update-resolv-conf-2016-04-24";
+ name = "update-resolv-conf-2016-09-30";
src = fetchFromGitHub {
owner = "masterkorp";
repo = "openvpn-update-resolv-conf";
- rev = "994574f36b9147cc78674a5f13874d503a625c98";
- sha256 = "1rvzlaj53k8s09phg4clsyzlmf44dmwwyvg0nbg966sxp3xsqlxc";
+ rev = "09cb5ab5a50dfd6e77e852749d80bef52d7a6b34";
+ sha256 = "0s5cilph0p0wiixj7nlc7f3hqmr1mhvbfyapd0060n3y6xgps9y9";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/networking/polysh/default.nix b/pkgs/tools/networking/polysh/default.nix
new file mode 100644
index 00000000000..b94ec8e429f
--- /dev/null
+++ b/pkgs/tools/networking/polysh/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, python2Packages }:
+
+let
+ inherit (python2Packages) buildPythonApplication;
+in
+buildPythonApplication rec {
+ name = "polysh-${version}";
+ version = "0.4";
+ src = fetchurl {
+ url = "http://guichaz.free.fr/polysh/files/${name}.tar.bz2";
+ sha256 = "0kxhp38c8a8hc8l86y53l2z5zpzxc4b8lx5zyzmq1badcrfc4mh4";
+ };
+
+ meta = {
+ description = "A tool to aggregate several remote shells into one";
+ longDescription = ''
+ Polysh is a tool to aggregate several remote shells into one. It
+ is used to launch an interactive remote shell on many machines
+ at once.
+ '';
+ maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+ homepage = http://guichaz.free.fr/polysh/;
+ };
+}
diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix
index a6dcd1fc0c3..12744456cc4 100644
--- a/pkgs/tools/networking/privoxy/default.nix
+++ b/pkgs/tools/networking/privoxy/default.nix
@@ -2,17 +2,25 @@
stdenv.mkDerivation rec{
- name = "privoxy-3.0.24";
+ name = "privoxy-${version}";
+ version = "3.0.26";
src = fetchurl {
- url = "mirror://sourceforge/ijbswa/Sources/3.0.22%20%28stable%29/${name}-stable-src.tar.gz";
- sha256 = "a381f6dc78f08de0d4a2342d47a5949a6608073ada34b933137184f3ca9fb012";
+ url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${name}-stable-src.tar.gz";
+ sha256 = "1n4wpxmahl8m2y3d1azxa8lrdbpaad007k458skxrpz57ss1br2p";
};
- buildInputs = [ autoreconfHook zlib pcre w3m man ];
+ hardeningEnable = [ "pie" ];
+
+ nativeBuildInputs = [ autoreconfHook w3m man ];
+ buildInputs = [ zlib pcre ];
+
+ postInstall = ''
+ rm -rf $out/var
+ '';
meta = with stdenv.lib; {
- homepage = http://www.privoxy.org/;
+ homepage = https://www.privoxy.org/;
description = "Non-caching web proxy with advanced filtering capabilities";
license = licenses.gpl2;
platforms = platforms.all;
diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix
index ed19f9d1674..36d0150a49b 100644
--- a/pkgs/tools/networking/proxychains/default.nix
+++ b/pkgs/tools/networking/proxychains/default.nix
@@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "015skh3z1jmm8kxbm3nkqv1w56kcvabdmcbmpwzywxr4xnh3x3pc";
};
+ postPatch = ''
+ # Temporary work-around; most likely fixed by next upstream release
+ sed -i Makefile -e '/-lpthread/a LDFLAGS+=-ldl'
+ '';
+
meta = {
description = "Proxifier for SOCKS proxies";
homepage = http://proxychains.sourceforge.net;
diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/tools/networking/pssh/default.nix
new file mode 100644
index 00000000000..7ae41a3e176
--- /dev/null
+++ b/pkgs/tools/networking/pssh/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+ name = "pssh-${version}";
+ version = "2.3.1";
+
+ src = fetchFromGitHub {
+ owner = "lilydjwg";
+ repo = "pssh";
+ rev = "v${version}";
+ sha256 = "0nawarxczfwajclnlsimhqkpzyqb1byvz9nsl54mi1bp80z5i4jq";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Parallel SSH Tools";
+ longDescription = ''
+ PSSH provides parallel versions of OpenSSH and related tools,
+ including pssh, pscp, prsync, pnuke and pslurp.
+ '';
+ inherit (src.meta) homepage;
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ chris-martin ];
+ };
+}
diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix
index ec464438553..887cd09b6eb 100644
--- a/pkgs/tools/networking/s3cmd/default.nix
+++ b/pkgs/tools/networking/s3cmd/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, pythonPackages }:
+{ stdenv, fetchFromGitHub, python2Packages }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "s3cmd-${version}";
version = "1.6.1";
@@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0aan6v1qj0pdkddhhkbaky44d54irm1pa8mkn52i2j86nb2rkcf9";
};
- propagatedBuildInputs = with pythonPackages; [ python_magic dateutil ];
+ propagatedBuildInputs = with python2Packages; [ python_magic dateutil ];
meta = with stdenv.lib; {
homepage = http://s3tools.org/;
diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix
index 3eade48a614..8f9636041ff 100644
--- a/pkgs/tools/networking/stun/default.nix
+++ b/pkgs/tools/networking/stun/default.nix
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
preBuild = ''
tar Jxvf ${srcManpages} debian/manpages
- gzip -9 debian/manpages/stun.1
- gzip -9 debian/manpages/stund.8
+ gzip -9n debian/manpages/stun.1
+ gzip -9n debian/manpages/stund.8
'';
installPhase = ''
diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index a01c39743fe..e9c82a798ed 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.38";
src = fetchurl {
url = "http://www.stunnel.org/downloads/${name}.tar.gz";
- sha256 = "1smmwkzr0i6w4jwrjxazbyf82jq1qlg8x9zil5b51pzwzpy552gb";
+ sha256 = "1mag0gd52f5q1jj3ds1pcn3s09si63cbxmri3zyv2fk8l6ds5b89";
};
buildInputs = [ openssl ];
diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix
index 3634b852fad..c1b19f745a3 100644
--- a/pkgs/tools/networking/urlwatch/default.nix
+++ b/pkgs/tools/networking/urlwatch/default.nix
@@ -1,17 +1,16 @@
-{ stdenv, fetchurl, python3Packages }:
+{ stdenv, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec {
- name = "urlwatch-2.2";
+ name = "urlwatch-${version}";
+ version = "2.5";
- src = fetchurl {
- url = "http://thp.io/2008/urlwatch/${name}.tar.gz";
- sha256 = "0s9056mm1hkj5gpzsb5bz6fwxk0nm73i0dhnqwa1bfddjnvpl9d3";
+ src = fetchFromGitHub {
+ owner = "thp";
+ repo = "urlwatch";
+ rev = version;
+ sha256 = "0irz54nvyq3cxa3fvjc5k2836a5nmly4wiiy4s5cwib1rnwg6r94";
};
- patches = [
- ./setup.patch
- ];
-
propagatedBuildInputs = with python3Packages; [
keyring
minidb
@@ -19,14 +18,10 @@ python3Packages.buildPythonApplication rec {
requests2
];
- postFixup = ''
- wrapProgram "$out/bin/urlwatch" --prefix "PYTHONPATH" : "$PYTHONPATH"
- '';
-
- meta = {
+ meta = with stdenv.lib; {
description = "A tool for monitoring webpages for updates";
homepage = https://thp.io/2008/urlwatch/;
- license = stdenv.lib.licenses.bsd3;
- maintainers = [ stdenv.lib.maintainers.tv ];
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ tv ];
};
}
diff --git a/pkgs/tools/networking/urlwatch/setup.patch b/pkgs/tools/networking/urlwatch/setup.patch
deleted file mode 100644
index 66626dbf025..00000000000
--- a/pkgs/tools/networking/urlwatch/setup.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ebe7b90100a3d960f53fdc9409d2d89eaa61bf11 Mon Sep 17 00:00:00 2001
-From: Thomas Perl